diff -Nru geany-plugins-1.23+dfsg/aclocal.m4 geany-plugins-1.24+dfsg/aclocal.m4 --- geany-plugins-1.23+dfsg/aclocal.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/aclocal.m4 2014-04-13 17:12:38.000000000 +0000 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.6 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 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,33 +11,31 @@ # 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'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 2002-2013 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.14' 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.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -54,24 +51,22 @@ # 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.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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 @@ -90,7 +85,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, @@ -116,22 +111,19 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 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 @@ -150,16 +142,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-2013 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 @@ -169,7 +159,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 @@ -182,12 +172,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], @@ -195,8 +186,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 @@ -236,16 +227,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 @@ -254,8 +245,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 @@ -263,7 +254,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} @@ -311,7 +302,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 @@ -321,9 +312,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='\' @@ -338,20 +333,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-2013 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 @@ -364,7 +357,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. @@ -376,21 +369,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"])` @@ -408,7 +399,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], @@ -418,18 +409,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-2013 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]) # ----------------------------------------------- @@ -442,7 +436,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 @@ -471,31 +465,40 @@ # 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 +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. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -506,34 +509,78 @@ [_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_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 ]) -_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. +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 -]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +# 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 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. @@ -555,15 +602,12 @@ 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-2013 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. @@ -577,16 +621,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-2013 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], @@ -602,14 +644,12 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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. @@ -627,7 +667,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 @@ -654,15 +694,12 @@ # 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-2013 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], @@ -670,11 +707,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 @@ -687,54 +723,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-2013 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], @@ -744,7 +748,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) # ------------------------ @@ -758,13 +762,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-2013 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-2013 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) # ------------------- @@ -779,22 +828,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-2013 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=' @@ -805,32 +848,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 @@ -840,31 +891,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-2013 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} @@ -882,7 +952,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 @@ -899,44 +969,40 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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-2013 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. @@ -950,18 +1016,16 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 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 @@ -971,118 +1035,167 @@ # 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 # Autoconf support for the Vala compiler -# Copyright (C) 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 2008-2013 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 - -# Check whether the Vala compiler exists in `PATH'. If it is found, the -# variable VALAC is set. Optionally a minimum release number of the -# compiler can be requested. +# Check whether the Vala compiler exists in $PATH. If it is found, the +# variable VALAC is set pointing to its absolute path. Otherwise, it is +# simply set to 'valac'. +# Optionally a minimum release number of the compiler can be requested. +# If the ACTION-IF-FOUND parameter is given, it will be run if a proper +# Vala compiler is found. +# Similarly, if the ACTION-IF-FOUND is given, it will be run if no proper +# Vala compiler is found. It defaults to simply print a warning about the +# situation, but otherwise proceeding with the configuration. # -# AM_PROG_VALAC([MINIMUM-VERSION]) -# -------------------------------- +# AM_PROG_VALAC([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# -------------------------------------------------------------------------- AC_DEFUN([AM_PROG_VALAC], -[AC_PATH_PROG([VALAC], [valac], []) - AS_IF([test -z "$VALAC"], - [AC_MSG_WARN([No Vala compiler found. You will not be able to compile .vala source files.])], - [AS_IF([test -n "$1"], - [AC_MSG_CHECKING([$VALAC is at least version $1]) + [AC_PATH_PROG([VALAC], [valac], [valac]) + AS_IF([test "$VALAC" != valac && test -n "$1"], + [AC_MSG_CHECKING([whether $VALAC is at least version $1]) am__vala_version=`$VALAC --version | sed 's/Vala *//'` AS_VERSION_COMPARE([$1], ["$am__vala_version"], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) - AC_MSG_ERROR([Vala $1 not found.])])])]) -]) + VALAC=valac])]) + if test "$VALAC" = valac; then + m4_default([$3], + [AC_MSG_WARN([no proper vala compiler found]) + AC_MSG_WARN([you will not be able to compile vala source files])]) + else + m4_default([$2], [:]) + fi]) +m4_include([geanypy/m4/ax_python_library.m4]) m4_include([build/bundled/gpgme.m4]) m4_include([build/addons.m4]) +m4_include([build/autoclose.m4]) m4_include([build/cflags.m4]) m4_include([build/codenav.m4]) m4_include([build/commander.m4]) m4_include([build/common.m4]) m4_include([build/cppcheck.m4]) m4_include([build/debugger.m4]) +m4_include([build/defineformat.m4]) m4_include([build/devhelp.m4]) m4_include([build/expansions.m4]) m4_include([build/geany.m4]) @@ -1098,13 +1211,17 @@ m4_include([build/geanynumberedbookmarks.m4]) m4_include([build/geanypg.m4]) m4_include([build/geanyprj.m4]) +m4_include([build/geanypy.m4]) m4_include([build/geanysendmail.m4]) m4_include([build/geanyvc.m4]) m4_include([build/geniuspaste.m4]) m4_include([build/gproject.m4]) +m4_include([build/gtk.m4]) m4_include([build/i18n.m4]) m4_include([build/markdown.m4]) m4_include([build/multiterm.m4]) +m4_include([build/pairtaghighlighter.m4]) +m4_include([build/pohelper.m4]) m4_include([build/pretty-printer.m4]) m4_include([build/scope.m4]) m4_include([build/shiftcolumn.m4]) @@ -1116,6 +1233,7 @@ m4_include([build/updatechecker.m4]) m4_include([build/webhelper.m4]) m4_include([build/xmlsnippets.m4]) +m4_include([build/cache/ax_python_devel.m4]) m4_include([build/cache/glib-gettext.m4]) m4_include([build/cache/intltool.m4]) m4_include([build/cache/libtool.m4]) diff -Nru geany-plugins-1.23+dfsg/addons/Makefile.in geany-plugins-1.24+dfsg/addons/Makefile.in --- geany-plugins-1.23+dfsg/addons/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/addons/Makefile.in 2014-04-13 17:12:41.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - INSTALL NEWS +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog INSTALL NEWS README subdir = addons ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -467,22 +545,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -497,57 +578,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 \ @@ -563,12 +599,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; \ @@ -580,15 +611,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 @@ -597,6 +624,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 @@ -760,22 +802,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/addons/src/addons.c geany-plugins-1.24+dfsg/addons/src/addons.c --- geany-plugins-1.23+dfsg/addons/src/addons.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/addons/src/addons.c 2014-04-12 14:28:39.000000000 +0000 @@ -504,7 +504,7 @@ _("Whether to show the tasks of all open documents in the list or only those of the current document.")); entry_tasks_tokens = gtk_entry_new(); - if (NZV(ao_info->tasks_token_list)) + if (!EMPTY(ao_info->tasks_token_list)) gtk_entry_set_text(GTK_ENTRY(entry_tasks_tokens), ao_info->tasks_token_list); ui_entry_add_clear_icon(GTK_ENTRY(entry_tasks_tokens)); ui_widget_set_tooltip_text(entry_tasks_tokens, diff -Nru geany-plugins-1.23+dfsg/addons/src/ao_bookmarklist.c geany-plugins-1.24+dfsg/addons/src/ao_bookmarklist.c --- geany-plugins-1.23+dfsg/addons/src/ao_bookmarklist.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/addons/src/ao_bookmarklist.c 2014-04-12 14:28:39.000000000 +0000 @@ -178,7 +178,7 @@ AoBookmarkListPrivate *priv = AO_BOOKMARK_LIST_GET_PRIVATE(bm); line = g_strstrip(sci_get_line(sci, line_nr)); - if (! NZV(line)) + if (EMPTY(line)) line = g_strdup(_("(Empty Line)")); tooltip = g_markup_escape_text(line, -1); diff -Nru geany-plugins-1.23+dfsg/addons/src/ao_openuri.c geany-plugins-1.24+dfsg/addons/src/ao_openuri.c --- geany-plugins-1.23+dfsg/addons/src/ao_openuri.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/addons/src/ao_openuri.c 2014-04-12 14:28:39.000000000 +0000 @@ -129,7 +129,7 @@ { AoOpenUriPrivate *priv = AO_OPEN_URI_GET_PRIVATE(self); - if (NZV(priv->uri)) + if (!EMPTY(priv->uri)) utils_open_browser(priv->uri); } @@ -139,7 +139,7 @@ { AoOpenUriPrivate *priv = AO_OPEN_URI_GET_PRIVATE(self); - if (NZV(priv->uri)) + if (!EMPTY(priv->uri)) gtk_clipboard_set_text(gtk_clipboard_get(gdk_atom_intern("CLIPBOARD", FALSE)), priv->uri, -1); } diff -Nru geany-plugins-1.23+dfsg/addons/src/ao_tasks.c geany-plugins-1.24+dfsg/addons/src/ao_tasks.c --- geany-plugins-1.23+dfsg/addons/src/ao_tasks.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/addons/src/ao_tasks.c 2014-04-12 14:28:39.000000000 +0000 @@ -127,7 +127,7 @@ case PROP_TOKENS: { const gchar *t = g_value_get_string(value); - if (! NZV(t)) + if (EMPTY(t)) t = "TODO;FIXME"; /* fallback */ g_strfreev(priv->tokens); priv->tokens = g_strsplit(t, ";", -1); @@ -573,14 +573,14 @@ token = priv->tokens; while (*token != NULL) { - if (NZV(*token) && (task_start = strstr(line_buf, *token)) != NULL) + if (!EMPTY(*token) && (task_start = strstr(line_buf, *token)) != NULL) { /* skip the token and additional whitespace */ task_start += strlen(*token); while (*task_start == ' ' || *task_start == ':') task_start++; /* reset task_start in case there is no text following */ - if (! NZV(task_start)) + if (EMPTY(task_start)) task_start = line_buf; /* create the task */ create_task(t, doc, line, *token, line_buf, task_start, display_name); diff -Nru geany-plugins-1.23+dfsg/addons/src/ao_xmltagging.c geany-plugins-1.24+dfsg/addons/src/ao_xmltagging.c --- geany-plugins-1.23+dfsg/addons/src/ao_xmltagging.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/addons/src/ao_xmltagging.c 2014-04-12 14:28:39.000000000 +0000 @@ -44,8 +44,6 @@ if (sci_has_selection(doc->editor->sci) == TRUE) { - gchar *selection = NULL; - gchar *replacement = NULL; GtkWidget *dialog = NULL; GtkWidget *vbox = NULL; GtkWidget *hbox = NULL; @@ -84,45 +82,49 @@ if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { - const gchar *tag = NULL; + GString *tag = NULL; + gchar *selection = NULL; + gchar *replacement = NULL; + /* Getting the selection and setting the undo flag */ selection = sci_get_selection_contents(doc->editor->sci); sci_start_undo_action(doc->editor->sci); - tag = g_strdup(gtk_entry_get_text(GTK_ENTRY(textbox))); - if (NZV(tag)) + /* Getting the tag */ + tag = g_string_new(gtk_entry_get_text(GTK_ENTRY(textbox))); + + if (tag->len > 0) { gsize end = 0; - GString *tmp = NULL; - const gchar *end_tag; + gchar *end_tag; /* First we check for %s and replace it with selection*/ - tmp = g_string_new(tag); - utils_string_replace_all(tmp, "%s", selection); - tag = g_string_free(tmp, FALSE); + utils_string_replace_all(tag, "%s", selection); /* We try to find a space inside the inserted tag as we * only need to close the tag with part until first space. * */ - while (!g_ascii_isspace(tag[end]) && tag[end] != '\0') + while (end < tag->len && !g_ascii_isspace(tag->str[end]) ) end++; if (end > 0) { - end_tag = g_strndup(tag, end); + end_tag = g_strndup(tag->str, end); } else { - end_tag = tag; + end_tag = tag->str; } - replacement = g_strconcat("<", tag, ">", + replacement = g_strconcat("<", tag->str, ">", selection, "", NULL); + g_free(end_tag); } sci_replace_sel(doc->editor->sci, replacement); sci_end_undo_action(doc->editor->sci); g_free(selection); g_free(replacement); + g_string_free(tag, TRUE); } gtk_widget_destroy(dialog); } diff -Nru geany-plugins-1.23+dfsg/addons/src/Makefile.in geany-plugins-1.24+dfsg/addons/src/Makefile.in --- geany-plugins-1.23+dfsg/addons/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/addons/src/Makefile.in 2014-04-13 17:12:41.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,17 +78,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp subdir = addons/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -74,12 +104,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -91,6 +124,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -145,6 +179,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 @@ -157,20 +204,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 = $(addons_la_SOURCES) DIST_SOURCES = $(addons_la_SOURCES) am__can_run_installinfo = \ @@ -178,6 +221,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -186,6 +246,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -204,6 +266,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -239,6 +303,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -305,6 +372,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -451,6 +528,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -477,12 +555,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + addons.la: $(addons_la_OBJECTS) $(addons_la_DEPENDENCIES) $(EXTRA_addons_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) -rpath $(geanypluginsdir) $(addons_la_OBJECTS) $(addons_la_LIBADD) $(LIBS) @@ -508,14 +589,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 $@ $< @@ -530,26 +611,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; \ @@ -561,15 +631,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 @@ -578,6 +644,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 @@ -724,24 +805,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/autoclose/AUTHORS geany-plugins-1.24+dfsg/autoclose/AUTHORS --- geany-plugins-1.23+dfsg/autoclose/AUTHORS 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/autoclose/AUTHORS 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1 @@ +Pavel Roschin diff -Nru geany-plugins-1.23+dfsg/autoclose/ChangeLog geany-plugins-1.24+dfsg/autoclose/ChangeLog --- geany-plugins-1.23+dfsg/autoclose/ChangeLog 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/autoclose/ChangeLog 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,10 @@ +2013-10-05 Pavel Roschin - version 0.2 + * add removing pairing brace by Shift+BackSpace + * do not add semicolon in #define-s + * add semicolon after class and struct + * now works with GTK3+ (thanks Matthew Brush for patch http://pastebin.geany.org/r2VKS/) + * added scrollbar for settings + * improve semicolon completion + * added help + * added Tab jump to enclosed char (thanks Thomas Martitz: + https://github.com/kugel-/geany-plugins/commit/7f19c3035abf6f8a7fa66c7b4c1efe0851cb2f83) diff -Nru geany-plugins-1.23+dfsg/autoclose/COPYING geany-plugins-1.24+dfsg/autoclose/COPYING --- geany-plugins-1.23+dfsg/autoclose/COPYING 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/autoclose/COPYING 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff -Nru geany-plugins-1.23+dfsg/autoclose/Makefile.am geany-plugins-1.24+dfsg/autoclose/Makefile.am --- geany-plugins-1.23+dfsg/autoclose/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/autoclose/Makefile.am 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,4 @@ +include $(top_srcdir)/build/vars.auxfiles.mk + +SUBDIRS = src +plugin = autoclose diff -Nru geany-plugins-1.23+dfsg/autoclose/Makefile.in geany-plugins-1.24+dfsg/autoclose/Makefile.in --- geany-plugins-1.23+dfsg/autoclose/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/autoclose/Makefile.in 2014-04-13 17:12:41.000000000 +0000 @@ -0,0 +1,825 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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 \ + *\\[\ \ ]*) \ + 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; \ + 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@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog NEWS README +subdir = autoclose +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ + $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ + $(top_srcdir)/build/cppcheck.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ + $(top_srcdir)/build/geanydoc.m4 \ + $(top_srcdir)/build/geanyextrasel.m4 \ + $(top_srcdir)/build/geanygendoc.m4 \ + $(top_srcdir)/build/geanyinsertnum.m4 \ + $(top_srcdir)/build/geanylatex.m4 \ + $(top_srcdir)/build/geanylipsum.m4 \ + $(top_srcdir)/build/geanylua.m4 \ + $(top_srcdir)/build/geanymacro.m4 \ + $(top_srcdir)/build/geanyminiscript.m4 \ + $(top_srcdir)/build/geanynumberedbookmarks.m4 \ + $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ + $(top_srcdir)/build/geanysendmail.m4 \ + $(top_srcdir)/build/geanyvc.m4 \ + $(top_srcdir)/build/geniuspaste.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ + $(top_srcdir)/build/pretty-printer.m4 \ + $(top_srcdir)/build/scope.m4 \ + $(top_srcdir)/build/shiftcolumn.m4 \ + $(top_srcdir)/build/spellcheck.m4 \ + $(top_srcdir)/build/status.m4 \ + $(top_srcdir)/build/tableconvert.m4 \ + $(top_srcdir)/build/treebrowser.m4 \ + $(top_srcdir)/build/unittests.m4 \ + $(top_srcdir)/build/updatechecker.m4 \ + $(top_srcdir)/build/webhelper.m4 \ + $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ + $(top_srcdir)/build/cache/glib-gettext.m4 \ + $(top_srcdir)/build/cache/intltool.m4 \ + $(top_srcdir)/build/cache/libtool.m4 \ + $(top_srcdir)/build/cache/ltoptions.m4 \ + $(top_srcdir)/build/cache/ltsugar.m4 \ + $(top_srcdir)/build/cache/ltversion.m4 \ + $(top_srcdir)/build/cache/lt~obsolete.m4 \ + $(top_srcdir)/build/cache/nls.m4 \ + $(top_srcdir)/build/cache/pkg.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +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_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 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__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__installdirs = "$(DESTDIR)$(plugindocdir)" +DATA = $(dist_plugindoc_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +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) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ +COMMANDER_CFLAGS = @COMMANDER_CFLAGS@ +COMMANDER_LIBS = @COMMANDER_LIBS@ +CPP = @CPP@ +CPPCHECK = @CPPCHECK@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ +DEVHELP_LIBS = @DEVHELP_LIBS@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENCHANT_CFLAGS = @ENCHANT_CFLAGS@ +ENCHANT_LIBS = @ENCHANT_LIBS@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GEANYGENDOC_CFLAGS = @GEANYGENDOC_CFLAGS@ +GEANYGENDOC_LIBS = @GEANYGENDOC_LIBS@ +GEANY_CFLAGS = @GEANY_CFLAGS@ +GEANY_LIBS = @GEANY_LIBS@ +GEANY_VERSION = @GEANY_VERSION@ +GENIUSPASTE_CFLAGS = @GENIUSPASTE_CFLAGS@ +GENIUSPASTE_LIBS = @GENIUSPASTE_LIBS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GPGME_CFLAGS = @GPGME_CFLAGS@ +GPGME_CONFIG = @GPGME_CONFIG@ +GPGME_LIBS = @GPGME_LIBS@ +GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ +GREP = @GREP@ +GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ +GTKSPELL_LIBS = @GTKSPELL_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBMARKDOWN_CFLAGS = @LIBMARKDOWN_CFLAGS@ +LIBMARKDOWN_LIBS = @LIBMARKDOWN_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCALEDIR = @LOCALEDIR@ +LTLIBOBJS = @LTLIBOBJS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_LIBS = @LUA_LIBS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MARKDOWN_CFLAGS = @MARKDOWN_CFLAGS@ +MARKDOWN_LIBS = @MARKDOWN_LIBS@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +MULTITERM_CFLAGS = @MULTITERM_CFLAGS@ +MULTITERM_LIBS = @MULTITERM_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +RST2HTML = @RST2HTML@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +UPDATECHECKER_CFLAGS = @UPDATECHECKER_CFLAGS@ +UPDATECHECKER_LIBS = @UPDATECHECKER_LIBS@ +USE_NLS = @USE_NLS@ +VALAC = @VALAC@ +VERSION = @VERSION@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ +WEBHELPER_CFLAGS = @WEBHELPER_CFLAGS@ +WEBHELPER_LIBS = @WEBHELPER_LIBS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +geanypluginsdir = @geanypluginsdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugindocdir = $(docdir)/$(plugin) +htmldocdir = $(plugindocdir) +plugindatadir = $(pkgdatadir)/$(plugin) +pluginlibdir = $(pkglibdir)/$(plugin) +examplesdir = $(plugindatadir) +dist_plugindoc_DATA = \ + README \ + ChangeLog \ + NEWS \ + COPYING \ + AUTHORS \ + $(AUXFILES) + +EXTRA_DIST = \ + wscript_build \ + wscript_configure + +SUBDIRS = src +plugin = autoclose +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/vars.auxfiles.mk $(top_srcdir)/build/vars.docs.mk $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign autoclose/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign autoclose/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + 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/vars.auxfiles.mk $(top_srcdir)/build/vars.docs.mk: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-dist_plugindocDATA: $(dist_plugindoc_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_plugindoc_DATA)'; test -n "$(plugindocdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindocdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindocdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindocdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindocdir)" || exit $$?; \ + done + +uninstall-dist_plugindocDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_plugindoc_DATA)'; test -n "$(plugindocdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(plugindocdir)'; $(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. +$(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//`; \ + 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; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +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 + +GTAGS: + 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 + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile $(DATA) +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(plugindocdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: install-dist_plugindocDATA + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-dist_plugindocDATA + +.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-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-dist_plugindocDATA 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 \ + uninstall-dist_plugindocDATA + + +# 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. +.NOEXPORT: diff -Nru geany-plugins-1.23+dfsg/autoclose/README geany-plugins-1.24+dfsg/autoclose/README --- geany-plugins-1.23+dfsg/autoclose/README 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/autoclose/README 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,56 @@ +Auto-close brackets +=================== + +.. image:: http://dl.dropboxusercontent.com/u/59878867/geany-autoclose.gif + :width: 778 + :alt: autoclose plugin + :align: right + +.. contents:: + +About +----- + +This plugin enables auto-closing features. Auto-closing works while you typing +and intellectually helps you to write code. + +Features +-------- + +* auto-close for: { }, [ ], ( ), " ", ' ', < >, ` ` +* customizeable auto-closing inside strings and comments +* delete pairing character if you pressed BackSpace +* suppress inserting one char twice (if you type "{}" you will get "{}", not + "{}}") +* enclose selected text into brackets instead of removing selection (select + text and type "(" or ")" to enclose selection into "()") +* keep selection when enclosing +* for C-like languages enclosing selection into "{}" makes auto-indentation + (select text and type "{" or "}" - text will be enclosed and indented) +* enclosing in {} moves cursor to beginning (before "{" character) +* for C-like languages to insert {}-block you do not need to select text + precisely: plugin detects boundaries automatically, just ensure that selection + covers lines you need to indent (works like TAB indentation) +* fix auto-indent inside {} (makes full indent for this block) +* auto-close curly bracket by pressing Enter +* auto-close functions (``"sin(|" -> "sin(|);"``) with doubling suppression + (for C/C++ languages only) +* remove paring brace when pressing Shift+BackSpace, unindent {}-blocks +* add semicolon after ``struct {|};`` and ``class {|};`` +* move cursor to closed char by pressing Tab + +Usage +----- + +After installed successfully, load the plugin in Geany's plugin manager. You may +change module preferences. + +Requirements +------------ + +* GTK >= 2.8.0 + +Contact developers +------------------ + +Pavel Roschin diff -Nru geany-plugins-1.23+dfsg/autoclose/src/autoclose.c geany-plugins-1.24+dfsg/autoclose/src/autoclose.c --- geany-plugins-1.23+dfsg/autoclose/src/autoclose.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/autoclose/src/autoclose.c 2014-04-13 13:33:33.000000000 +0000 @@ -0,0 +1,1140 @@ +/* + * autoclose.c + * + * Copyright 2013 Pavel Roschin + * + * 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., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +#ifdef HAVE_CONFIG_H + #include "config.h" /* for the gettext domain */ +#endif + +#include +#ifdef HAVE_LOCALE_H + #include +#endif + +#include + +#include +#include + +#include "Scintilla.h" +#include "SciLexer.h" + +#define AC_STOP_ACTION TRUE +#define AC_CONTINUE_ACTION FALSE +#define SSM(s, m, w, l) scintilla_send_message(s, m, w, l) + +GeanyPlugin *geany_plugin; +GeanyData *geany_data; +GeanyFunctions *geany_functions; + +PLUGIN_VERSION_CHECK(216) +PLUGIN_SET_TRANSLATABLE_INFO( + LOCALEDIR, + GETTEXT_PACKAGE, + _("Auto-close"), + _("Auto-close braces and brackets with lot of features"), + "0.2", + "Pavel Roschin ") + +/* avoid aggresive warnings */ +#undef DOC_VALID +#define DOC_VALID(doc_ptr) (((doc_ptr) && (doc_ptr)->is_valid)) + +typedef struct { + /* close chars */ + gboolean parenthesis; + gboolean abracket; + gboolean abracket_htmlonly; + gboolean cbracket; + gboolean sbracket; + gboolean dquote; + gboolean squote; + gboolean backquote; + gboolean backquote_bashonly; + /* settings */ + gboolean delete_pairing_brace; + gboolean suppress_doubling; + gboolean enclose_selections; + gboolean comments_ac_enable; + gboolean comments_enclose; + gboolean keep_selection; + gboolean make_indent_for_cbracket; + gboolean move_cursor_to_beginning; + gboolean improved_cbracket_indent; + gboolean close_functions; + gboolean bcksp_remove_pair; + gboolean jump_on_tab; + /* others */ + gchar *config_file; +} AutocloseInfo; + +static AutocloseInfo *ac_info = NULL; + +typedef struct { + gulong notify_handler[2]; + /* used to place the caret after autoclosed items on tab (similar to eclipse) */ + gint jump_on_tab; + /* used to reset jump_on_tab when needed */ + gint last_caret; + /* used to reset jump_on_tab when needed */ + gint last_line; + struct GeanyDocument *doc; +} AutocloseUserData; + +static gint +get_indent(ScintillaObject *sci, gint line) +{ + return (gint) SSM(sci, SCI_GETLINEINDENTPOSITION, (uptr_t) line, 0); +} + +static gchar +char_at(ScintillaObject *sci, gint pos) +{ + return sci_get_char_at(sci, pos); +} + +static const gchar * +get_char_range(ScintillaObject *sci, gint start, gint length) +{ + return (const gchar *) SSM(sci, SCI_GETRANGEPOINTER, start, length); +} + +static gboolean +blank_line(ScintillaObject *sci, gint line) +{ + return get_indent(sci, line) == + sci_get_line_end_position(sci, line); +} + +static void +unindent_line(ScintillaObject *sci, gint line, gint indent_width) +{ + gint indent = sci_get_line_indentation(sci, line); + sci_set_line_indentation(sci, line, indent > 0 ? indent - indent_width : 0); +} + +static void +delete_line(ScintillaObject *sci, gint line) +{ + gint start = sci_get_position_from_line(sci, line); + gint len = sci_get_line_length(sci, line); + SSM(sci, SCI_DELETERANGE, start, len); +} + +static gint +get_lines_selected(ScintillaObject *sci) +{ + gint start = (gint) SSM(sci, SCI_GETSELECTIONSTART, 0, 0); + gint end = (gint) SSM(sci, SCI_GETSELECTIONEND, 0, 0); + gint line_start; + gint line_end; + + if (start == end) + return 0; /* no selection */ + + line_start = (gint) SSM(sci, SCI_LINEFROMPOSITION, (uptr_t) start, 0); + line_end = (gint) SSM(sci, SCI_LINEFROMPOSITION, (uptr_t) end, 0); + + return line_end - line_start + 1; +} + +static void +insert_text(ScintillaObject *sci, gint pos, const gchar *text) +{ + SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) text); +} + +static gint +get_selections(ScintillaObject *sci) +{ + return (gint) SSM(sci, SCI_GETSELECTIONS, 0, 0); +} + +static gint +get_caret_pos(ScintillaObject *sci, gint selection) +{ + return (gint) SSM(sci, SCI_GETSELECTIONNCARET, selection, 0); +} + +static gint +get_ancor_pos(ScintillaObject *sci, gint selection) +{ + return (gint) SSM(sci, SCI_GETSELECTIONNANCHOR, selection, 0); +} + +static gboolean +char_is_quote(gchar ch) +{ + return '\'' == ch || '"' == ch; +} + +static gboolean +char_is_curly_bracket(gchar ch) +{ + return '{' == ch || '}' == ch; +} + +static gboolean +isspace_no_newline(gchar ch) +{ + return g_ascii_isspace(ch) && ch != '\n' && ch != '\r'; +} + +/** + * This function is based on Geany's source but has different meaning: check + * ability to enclose selection. Calls only for selected text so using + * sci_get_selection_start/end is ok here. + * */ +static gboolean +lexer_has_braces(ScintillaObject *sci, gint lexer) +{ + gint sel_start; + switch (lexer) + { + case SCLEX_CPP: + case SCLEX_D: + case SCLEX_PASCAL: + case SCLEX_TCL: + case SCLEX_CSS: + return TRUE; + case SCLEX_HTML: /* for PHP & JS */ + case SCLEX_PERL: + case SCLEX_BASH: + /* PHP, Perl, bash has vars like ${var} */ + if (get_lines_selected(sci) > 1) + return TRUE; + sel_start = sci_get_selection_start(sci); + if ('$' == char_at(sci, sel_start - 1)) + return FALSE; + return TRUE; + default: + return FALSE; + } +} + +static gboolean +lexer_cpp_like(gint lexer, gint style) +{ + if (lexer == SCLEX_CPP && style == SCE_C_IDENTIFIER) + return TRUE; + return FALSE; +} + +static gboolean +filetype_c_or_cpp(gint type) +{ + return type == GEANY_FILETYPES_C || type == GEANY_FILETYPES_CPP; +} + +static gboolean +filetype_cpp(gint type) +{ + return type == GEANY_FILETYPES_CPP; +} + +static gint +get_end_pos(ScintillaObject *sci, gint line) +{ + gint end; + gchar ch; + end = sci_get_line_end_position(sci, line); + ch = char_at(sci, end - 1); + /* ignore spaces and "}" */ + while(isspace_no_newline(ch) || '}' == ch) + { + end--; + ch = char_at(sci, end - 1); + } + return end; +} + +static gboolean +check_chars( + ScintillaObject *sci, + gint ch, + gchar *chars_left, + gchar *chars_right) +{ + switch (ch) + { + case '(': + case ')': + if (!ac_info->parenthesis) + return FALSE; + *chars_left = '('; + *chars_right = ')'; + break; + case ';': + if (!ac_info->close_functions) + return FALSE; + break; + case '{': + case '}': + if (!ac_info->cbracket) + return FALSE; + *chars_left = '{'; + *chars_right = '}'; + break; + case '[': + case ']': + if (!ac_info->sbracket) + return FALSE; + *chars_left = '['; + *chars_right = ']'; + break; + case '<': + case '>': + if (!ac_info->abracket) + return FALSE; + if (ac_info->abracket_htmlonly && + sci_get_lexer(sci) != SCLEX_HTML) + return FALSE; + *chars_left = '<'; + *chars_right = '>'; + break; + case '\'': + if (!ac_info->squote) + return FALSE; + *chars_left = *chars_right = ch; + break; + case '"': + if (!ac_info->dquote) + return FALSE; + *chars_left = *chars_right = ch; + break; + case '`': + if (!ac_info->backquote) + return FALSE; + if (ac_info->backquote_bashonly && + sci_get_lexer(sci) != SCLEX_BASH) + return FALSE; + *chars_left = *chars_right = ch; + break; + default: + return FALSE; + } + return TRUE; +} + +static gboolean +improve_indent( + ScintillaObject *sci, + GeanyEditor *editor, + gint pos) +{ + gint ch, ch_next; + gint line; + gint indent, indent_width; + gint end_pos; + if (!ac_info->improved_cbracket_indent) + return AC_CONTINUE_ACTION; + ch = char_at(sci, pos - 1); + if (ch != '{') + return AC_CONTINUE_ACTION; + /* if curly bracket completion is enabled - just make indents + * but ensure that second "}" exists. If disabled - make indent + * and complete second curly bracket */ + ch_next = char_at(sci, pos); + if (ac_info->cbracket && ch_next != '}') + return AC_CONTINUE_ACTION; + line = sci_get_line_from_position(sci, pos); + indent = sci_get_line_indentation(sci, line); + indent_width = editor_get_indent_prefs(editor)->width; + sci_start_undo_action(sci); + if (ac_info->cbracket) + SSM(sci, SCI_ADDTEXT, 2, (sptr_t)"\n\n"); + else + SSM(sci, SCI_ADDTEXT, 3, (sptr_t)"\n\n}"); + sci_set_line_indentation(sci, line + 1, indent + indent_width); + sci_set_line_indentation(sci, line + 2, indent); + /* move to the end of added line */ + end_pos = sci_get_line_end_position(sci, line + 1); + sci_set_current_position(sci, end_pos, TRUE); + sci_end_undo_action(sci); + /* do not alow internal auto-indenter to do the work */ + return AC_STOP_ACTION; +} + +static gboolean +handle_backspace( + AutocloseUserData *data, + ScintillaObject *sci, + gchar ch, + gchar *ch_left, + gchar *ch_right, + GdkEventKey *event, + gint indent_width) +{ + gint pos = sci_get_current_position(sci); + gint end_pos; + gint line_start, line_end, line; + gint i; + if (!ac_info->delete_pairing_brace) + return AC_CONTINUE_ACTION; + ch = char_at(sci, pos - 1); + + if (!check_chars(sci, ch, ch_left, ch_right)) + return AC_CONTINUE_ACTION; + + if (event->state & GDK_SHIFT_MASK) + { + if ((ch_left[0] == ch || ch_right[0] == ch) && + ac_info->bcksp_remove_pair) + { + end_pos = sci_find_matching_brace(sci, pos - 1); + if (-1 == end_pos) + return AC_CONTINUE_ACTION; + sci_start_undo_action(sci); + line_start = sci_get_line_from_position(sci, pos); + line_end = sci_get_line_from_position(sci, end_pos); + SSM(sci, SCI_DELETERANGE, end_pos, 1); + if (end_pos < pos) + pos--; + SSM(sci, SCI_DELETERANGE, pos - 1, 1); + /* remove indentation magick */ + if (char_is_curly_bracket(ch)) + { + if (line_start == line_end) + goto final; + if (line_start > line_end) + { + line = line_end; + line_end = line_start; + line_start = line; + } + if (blank_line(sci, line_start)) + { + delete_line(sci, line_start); + line_end--; + } + else + line_start++; + if (blank_line(sci, line_end)) + delete_line(sci, line_end); + line_end--; + /* unindent */ + for (i = line_start; i <= line_end; i++) + { + unindent_line(sci, i, indent_width); + } + } +final: + sci_end_undo_action(sci); + return AC_STOP_ACTION; + } + } + + /* handle \'|' situation */ + if (char_is_quote(ch) && char_at(sci, pos - 2) == '\\') + return AC_CONTINUE_ACTION; + + if (ch_left[0] == ch && ch_right[0] == char_at(sci, pos)) + { + SSM(sci, SCI_DELETERANGE, pos, 1); + data->jump_on_tab = 0; + return AC_CONTINUE_ACTION; + } + return AC_CONTINUE_ACTION; +} + + +static gboolean +enclose_selection( + AutocloseUserData *data, + ScintillaObject *sci, + gchar ch, + gint lexer, + gint style, + gchar *chars_left, + gchar *chars_right, + GeanyEditor *editor) +{ + gint i; + gint start, end; + gboolean in_comment; + gint start_line, start_pos, end_line, text_end_pos; + gint start_indent, indent_width, current_indent; + + start = sci_get_selection_start(sci); + end = sci_get_selection_end(sci); + + /* case if selection covers mixed style */ + if (highlighting_is_code_style(lexer, sci_get_style_at(sci, start)) != + highlighting_is_code_style(lexer, sci_get_style_at(sci, end))) + in_comment = FALSE; + else + in_comment = !highlighting_is_code_style(lexer, style); + if (!ac_info->comments_enclose && in_comment) + return AC_CONTINUE_ACTION; + + sci_start_undo_action(sci); + + + /* Insert {} block - special case: make indents, move cursor to beginning */ + if (char_is_curly_bracket(ch) && lexer_has_braces(sci, lexer) && + ac_info->make_indent_for_cbracket && !in_comment) + { + start_line = sci_get_line_from_position(sci, start); + start_pos = SSM(sci, SCI_GETLINEINDENTPOSITION, (uptr_t)start_line, 0); + insert_text(sci, start_pos, "{\n"); + + end_line = sci_get_line_from_position(sci, end); + start_indent = sci_get_line_indentation(sci, start_line); + indent_width = editor_get_indent_prefs(editor)->width; + sci_set_line_indentation(sci, start_line, start_indent); + sci_set_line_indentation(sci, start_line + 1, start_indent + indent_width); + for(i = start_line + 2; i <= end_line; i++) + { + current_indent = sci_get_line_indentation(sci, i); + sci_set_line_indentation(sci, i, current_indent + indent_width); + } + text_end_pos = sci_get_line_end_position(sci, i - 1); + sci_set_current_position(sci, text_end_pos, FALSE); + SSM(sci, SCI_ADDTEXT, 2, (sptr_t)"\n}"); + sci_set_line_indentation(sci, i, start_indent); + if (ac_info->move_cursor_to_beginning) + sci_set_current_position(sci, start_pos, TRUE); + } + else + { + gint selections = get_selections(sci); + /* specially handle rectangular selection */ + if (selections > 1) + { + gint *sels_left = g_malloc(selections * sizeof(gint)); + gint *sels_right = g_malloc(selections * sizeof(gint)); + gint caret = get_caret_pos(sci, 0); + gint anchor = get_ancor_pos(sci, 0); + gboolean caret_is_left = caret < anchor; + gint pos_first = get_caret_pos(sci, 0); + gint pos_second = get_caret_pos(sci, 1); + gboolean selection_is_up_down = pos_first < pos_second; + gint line; + /* looks like a forward loop but actually lines processed in reverse order */ + for (i = 0; i < selections; i++) + { + if(selection_is_up_down) + line = selections - i - 1; + else + line = i; + if (caret_is_left) + { + sels_left[i] = get_caret_pos(sci, line); + sels_right[i] = get_ancor_pos(sci, line) + 1; + } + else + { + sels_right[i] = get_caret_pos(sci, line) + 1; + sels_left[i] = get_ancor_pos(sci, line); + } + } + for (i = 0; i < selections; i++) + { + insert_text(sci, sels_left[i], chars_left); + insert_text(sci, sels_right[i], chars_right); + sels_left[i] += (selections - i - 1) * 2 + 1; + sels_right[i] += (selections - i - 1) * 2 + 1; + } + if (ac_info->keep_selection) + { + i = 0; + SSM(sci, SCI_SETSELECTION, sels_left[i], sels_right[i] - 1); + for (i = 1; i < selections; i++) + SSM(sci, SCI_ADDSELECTION, sels_left[i], sels_right[i] - 1); + } + g_free(sels_left); + g_free(sels_right); + } + else /* normal selection */ + { + insert_text(sci, start, chars_left); + insert_text(sci, end + 1, chars_right); + sci_set_current_position(sci, end + 1, TRUE); + data->jump_on_tab += strlen(chars_right); + data->last_caret = end + 1; + data->last_line = sci_get_current_line(sci); + if (ac_info->keep_selection) + { + sci_set_selection_start(sci, start + 1); + sci_set_selection_end(sci, end + 1); + } + } + } + sci_end_undo_action(sci); + return AC_STOP_ACTION; +} + +static gboolean +check_struct( + ScintillaObject *sci, + gint pos, + const gchar *str) +{ + gchar ch; + gint line, len; + ch = char_at(sci, pos - 1); + while(g_ascii_isspace(ch)) + { + pos--; + ch = char_at(sci, pos - 1); + } + line = sci_get_line_from_position(sci, pos); + len = strlen(str); + const gchar *sci_buf = get_char_range(sci, get_indent(sci, line), len); + g_return_val_if_fail(sci_buf, FALSE); + if (strncmp(sci_buf, str, len) == 0) + return TRUE; + return FALSE; +} + +static void +struct_semicolon( + ScintillaObject *sci, + gint pos, + gchar *chars_right, + gint filetype) +{ + if (filetype_c_or_cpp(filetype) && + (check_struct(sci, pos, "struct") || check_struct(sci, pos, "typedef struct"))) + { + chars_right[1] = ';'; + return; + } + if (filetype_cpp(filetype) && check_struct(sci, pos, "class")) + { + chars_right[1] = ';'; + return; + } +} + +static gboolean +check_define( + ScintillaObject *sci, + gint line) +{ + const gchar* sci_buf = get_char_range(sci, get_indent(sci, line), 7); + g_return_val_if_fail(sci_buf, FALSE); + if (strncmp(sci_buf, "#define", 7) == 0) + return TRUE; + return FALSE; +} + +static gboolean +auto_close_chars( + AutocloseUserData *data, + GdkEventKey *event) +{ + ScintillaObject *sci; + GeanyEditor *editor; + GeanyDocument *doc; + gint ch, ch_next, ch_buf; + gchar chars_left[2] = {0, 0}; + gchar chars_right[3] = {0, 0, 0}; + gint lexer, style; + gint pos, line, lex_offset; + gboolean has_sel; + gint filetype = 0; + + g_return_val_if_fail(data, AC_CONTINUE_ACTION); + doc = data->doc; + g_return_val_if_fail(DOC_VALID(doc), AC_CONTINUE_ACTION); + editor = doc->editor; + g_return_val_if_fail(editor, AC_CONTINUE_ACTION); + sci = editor->sci; + g_return_val_if_fail(sci, AC_CONTINUE_ACTION); + + if (doc->file_type) + filetype = doc->file_type->id; + + pos = sci_get_current_position(sci); + line = sci_get_current_line(sci); + ch = event->keyval; + + if (ch == GDK_BackSpace) + { + return handle_backspace(data, sci, ch, chars_left, chars_right, + event, editor_get_indent_prefs(editor)->width); + } + else if (ch == GDK_Return) + { + return improve_indent(sci, editor, pos); + } + else if (ch == GDK_Tab && ac_info->jump_on_tab) + { + /* jump behind inserted "); */ + if (data->jump_on_tab == 0) + return AC_CONTINUE_ACTION; + sci_set_current_position(sci, pos + data->jump_on_tab, FALSE); + data->jump_on_tab = 0; + return AC_STOP_ACTION; + } + + /* set up completion chars */ + if (!check_chars(sci, ch, chars_left, chars_right)) + return AC_CONTINUE_ACTION; + + has_sel = sci_has_selection(sci); + + /* do not suppress/complete in case: '\|' */ + if (char_is_quote(ch) && char_at(sci, pos - 1) == '\\' && !has_sel) + return AC_CONTINUE_ACTION; + + lexer = sci_get_lexer(sci); + + /* in C-like languages - complete functions with ; */ + lex_offset = -1; + ch_buf = char_at(sci, pos + lex_offset); + while (g_ascii_isspace(ch_buf)) + { + --lex_offset; + ch_buf = char_at(sci, pos + lex_offset); + } + + style = sci_get_style_at(sci, pos + lex_offset); + + /* add ; after functions */ + if (lexer_cpp_like(lexer, style) && + chars_left[0] == '(' && + !has_sel && + ac_info->close_functions && + pos == get_end_pos(sci, line) && + sci_get_line_indentation(sci, line) != 0 && + !check_define(sci, line)) + chars_right[1] = ';'; + + style = sci_get_style_at(sci, pos); + + /* suppress double completion symbols */ + ch_next = char_at(sci, pos); + if (ch == ch_next && !has_sel && ac_info->suppress_doubling && + !(chars_left[0] != chars_right[0] && ch == chars_left[0])) + { + /* jump_on_data may be 2 (due to autoclosing ");"). Need to decrement if ")" is pressed */ + if (data->jump_on_tab > 0) + data->jump_on_tab -= 1; + if ((!ac_info->comments_ac_enable && !highlighting_is_code_style(lexer, style)) && + ch != '"' && ch != '\'') + return AC_CONTINUE_ACTION; + + /* suppress ; only at end of line */ + if (ch == ';' && pos + 1 != get_end_pos(sci, line)) + return AC_CONTINUE_ACTION; + SSM(sci, SCI_DELETERANGE, pos, 1); + return AC_CONTINUE_ACTION; + } + + if (ch == ';') + return AC_CONTINUE_ACTION; + + /* If we have selected text */ + if (has_sel && ac_info->enclose_selections) + return enclose_selection(data, sci, ch, lexer, style, chars_left, chars_right, editor); + + /* disable autocompletion inside comments and strings */ + if (!ac_info->comments_ac_enable && !highlighting_is_code_style(lexer, style)) + return AC_CONTINUE_ACTION; + + if (ch == chars_right[0] && chars_left[0] != chars_right[0]) + return AC_CONTINUE_ACTION; + + /* add ; after struct */ + struct_semicolon(sci, pos, chars_right, filetype); + + /* just close char */ + SSM(sci, SCI_INSERTTEXT, pos, (sptr_t)chars_right); + sci_set_current_position(sci, pos, TRUE); + data->jump_on_tab += strlen(chars_right); + data->last_caret = pos; + data->last_line = sci_get_current_line(sci); + return AC_CONTINUE_ACTION; +} + +static gboolean +on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data) +{ + AutocloseUserData *data = user_data; + g_return_val_if_fail(data && DOC_VALID(data->doc), AC_CONTINUE_ACTION); + return auto_close_chars(data, event); +} + +static void +on_sci_notify(ScintillaObject *sci, gint scn, SCNotification *nt, gpointer user_data) +{ + AutocloseUserData *data = user_data; + + if (!ac_info->jump_on_tab) + return; + g_return_if_fail(data); + + /* reset jump_on_tab state when user clicked away */ + gboolean updated_sel = nt->updated & SC_UPDATE_SELECTION; + gboolean updated_text = nt->updated & SC_UPDATE_CONTENT; + gint new_caret = sci_get_current_position(sci); + gint new_line = sci_get_current_line(sci); + if (updated_sel && !updated_text) + { + gint delta = data->last_caret - new_caret; + gint delta_l = data->last_line - new_line; + if (delta_l == 0 && data->jump_on_tab) + data->jump_on_tab += delta; + else + data->jump_on_tab = 0; + } + data->last_caret = new_caret; + data->last_line = new_line; +} + + +static void +on_document_open(GObject *obj, GeanyDocument *doc, gpointer user_data) +{ + AutocloseUserData *data; + ScintillaObject *sci; + g_return_if_fail(DOC_VALID(doc)); + + sci = doc->editor->sci; + data = g_new0(AutocloseUserData, 1); + g_return_if_fail(data); + data->doc = doc; + data->notify_handler[0] = g_signal_connect(G_OBJECT(sci), "sci-notify", + G_CALLBACK(on_sci_notify), data); + data->notify_handler[1] = g_signal_connect(G_OBJECT(sci), "key-press-event", + G_CALLBACK(on_key_press), data); + /* This will free the data when the sci is destroyed */ + g_object_set_data_full(G_OBJECT(sci), "autoclose-userdata", data, g_free); +} + +static void +autoclose_handlers_cleanup(void) +{ + gint i; + + foreach_document(i) + { + gint j; + gpointer data; + ScintillaObject *sci; + AutocloseUserData *autoclose_data; + + sci = documents[i]->editor->sci; + data = g_object_get_data(G_OBJECT(sci), "autoclose-userdata"); + if(!data) + continue; + autoclose_data = (AutocloseUserData*)data; + for(j = 0; j < 2; j++) + { + gulong handler = autoclose_data->notify_handler[j]; + g_signal_handler_disconnect(sci, handler); + } + } +} + +PluginCallback plugin_callbacks[] = +{ + { "document-open", (GCallback) &on_document_open, FALSE, NULL }, + { "document-new", (GCallback) &on_document_open, FALSE, NULL }, + { NULL, NULL, FALSE, NULL } +}; + +static void +configure_response_cb(GtkDialog *dialog, gint response, gpointer user_data) +{ + if (response != GTK_RESPONSE_OK && response != GTK_RESPONSE_APPLY) + return; + GKeyFile *config = g_key_file_new(); + gchar *data; + gchar *config_dir = g_path_get_dirname(ac_info->config_file); + + g_key_file_load_from_file(config, ac_info->config_file, G_KEY_FILE_NONE, NULL); + +#define SAVE_CONF_BOOL(name) do { \ + ac_info->name = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( \ + g_object_get_data(G_OBJECT(dialog), "check_" #name))); \ + g_key_file_set_boolean(config, "autoclose", #name, ac_info->name); \ +} while (0) + + SAVE_CONF_BOOL(parenthesis); + SAVE_CONF_BOOL(abracket); + SAVE_CONF_BOOL(abracket_htmlonly); + SAVE_CONF_BOOL(cbracket); + SAVE_CONF_BOOL(sbracket); + SAVE_CONF_BOOL(dquote); + SAVE_CONF_BOOL(squote); + SAVE_CONF_BOOL(backquote); + SAVE_CONF_BOOL(backquote_bashonly); + SAVE_CONF_BOOL(comments_ac_enable); + SAVE_CONF_BOOL(delete_pairing_brace); + SAVE_CONF_BOOL(suppress_doubling); + SAVE_CONF_BOOL(enclose_selections); + SAVE_CONF_BOOL(comments_enclose); + SAVE_CONF_BOOL(keep_selection); + SAVE_CONF_BOOL(make_indent_for_cbracket); + SAVE_CONF_BOOL(move_cursor_to_beginning); + SAVE_CONF_BOOL(improved_cbracket_indent); + SAVE_CONF_BOOL(close_functions); + SAVE_CONF_BOOL(bcksp_remove_pair); + SAVE_CONF_BOOL(jump_on_tab); + +#undef SAVE_CONF_BOOL + + if (!g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils_mkdir(config_dir, TRUE) != 0) + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, + _("Plugin configuration directory could not be created.")); + } + else + { + /* write config to file */ + data = g_key_file_to_data(config, NULL, NULL); + utils_write_file(ac_info->config_file, data); + g_free(data); + } + g_free(config_dir); + g_key_file_free(config); +} + +/* Called by Geany to initialize the plugin */ +void +plugin_init(G_GNUC_UNUSED GeanyData *data) +{ + guint i; + foreach_document(i) + { + on_document_open(NULL, documents[i], NULL); + } + GKeyFile *config = g_key_file_new(); + + ac_info = g_new0(AutocloseInfo, 1); + + ac_info->config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, + "plugins", G_DIR_SEPARATOR_S, "autoclose", G_DIR_SEPARATOR_S, "autoclose.conf", NULL); + + g_key_file_load_from_file(config, ac_info->config_file, G_KEY_FILE_NONE, NULL); + +#define GET_CONF_BOOL(name, def) ac_info->name = utils_get_setting_boolean(config, "autoclose", #name, def) + + GET_CONF_BOOL(parenthesis, TRUE); + /* Angular bracket conflicts with conditional statements, enable only for HTML by default */ + GET_CONF_BOOL(abracket, TRUE); + GET_CONF_BOOL(abracket_htmlonly, TRUE); + GET_CONF_BOOL(cbracket, TRUE); + GET_CONF_BOOL(sbracket, TRUE); + GET_CONF_BOOL(dquote, TRUE); + GET_CONF_BOOL(squote, TRUE); + GET_CONF_BOOL(backquote, TRUE); + GET_CONF_BOOL(backquote_bashonly, TRUE); + GET_CONF_BOOL(comments_ac_enable, FALSE); + GET_CONF_BOOL(delete_pairing_brace, TRUE); + GET_CONF_BOOL(suppress_doubling, TRUE); + GET_CONF_BOOL(enclose_selections, TRUE); + GET_CONF_BOOL(comments_enclose, FALSE); + GET_CONF_BOOL(keep_selection, TRUE); + GET_CONF_BOOL(make_indent_for_cbracket, TRUE); + GET_CONF_BOOL(move_cursor_to_beginning, TRUE); + GET_CONF_BOOL(improved_cbracket_indent, TRUE); + GET_CONF_BOOL(close_functions, TRUE); + GET_CONF_BOOL(bcksp_remove_pair, FALSE); + GET_CONF_BOOL(jump_on_tab, TRUE); + +#undef GET_CONF_BOOL + + g_key_file_free(config); +} + +#define GET_CHECKBOX_ACTIVE(name) gboolean sens = gtk_toggle_button_get_active(\ + GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(data), "check_" #name))) + +#define SET_SENS(name) gtk_widget_set_sensitive( \ + g_object_get_data(G_OBJECT(data), "check_" #name), sens) + +static void +ac_make_indent_for_cbracket_cb(GtkToggleButton *togglebutton, gpointer data) +{ + GET_CHECKBOX_ACTIVE(make_indent_for_cbracket); + SET_SENS(move_cursor_to_beginning); +} + +static void +ac_parenthesis_cb(GtkToggleButton *togglebutton, gpointer data) +{ + GET_CHECKBOX_ACTIVE(parenthesis); + SET_SENS(close_functions); +} + +static void +ac_cbracket_cb(GtkToggleButton *togglebutton, gpointer data) +{ + GET_CHECKBOX_ACTIVE(cbracket); + SET_SENS(make_indent_for_cbracket); + SET_SENS(move_cursor_to_beginning); +} + +static void +ac_abracket_htmlonly_cb(GtkToggleButton *togglebutton, gpointer data) +{ + GET_CHECKBOX_ACTIVE(abracket); + SET_SENS(abracket_htmlonly); +} + +static void +ac_backquote_bashonly_cb(GtkToggleButton *togglebutton, gpointer data) +{ + GET_CHECKBOX_ACTIVE(backquote); + SET_SENS(backquote_bashonly); +} + +static void +ac_enclose_selections_cb(GtkToggleButton *togglebutton, gpointer data) +{ + GET_CHECKBOX_ACTIVE(enclose_selections); + SET_SENS(keep_selection); + SET_SENS(comments_enclose); +} + +static void +ac_delete_pairing_brace_cb(GtkToggleButton *togglebutton, gpointer data) +{ + GET_CHECKBOX_ACTIVE(delete_pairing_brace); + SET_SENS(bcksp_remove_pair); +} + +GtkWidget * +plugin_configure(GtkDialog *dialog) +{ + GtkWidget *widget, *vbox, *frame, *container, *scrollbox; + vbox = gtk_vbox_new(FALSE, 0); + scrollbox = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrollbox), vbox); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollbox), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + +#define WIDGET_FRAME(description) do { \ + container = gtk_vbox_new(FALSE, 0); \ + frame = gtk_frame_new(NULL); \ + gtk_frame_set_label(GTK_FRAME(frame), _(description)); \ + gtk_container_add(GTK_CONTAINER(frame), container); \ + gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 3); \ +} while (0) + +#define WIDGET_CONF_BOOL(name, description, tooltip) do { \ + widget = gtk_check_button_new_with_label(_(description)); \ + if (tooltip) gtk_widget_set_tooltip_text(widget, _(tooltip)); \ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), ac_info->name); \ + gtk_box_pack_start(GTK_BOX(container), widget, FALSE, FALSE, 3); \ + g_object_set_data(G_OBJECT(dialog), "check_" #name, widget); \ +} while (0) + + WIDGET_FRAME("Auto-close quotes and brackets"); + WIDGET_CONF_BOOL(parenthesis, "Parenthesis ( )", + "Auto-close parenthesis \"(\" -> \"(|)\""); + g_signal_connect(widget, "toggled", G_CALLBACK(ac_parenthesis_cb), dialog); + WIDGET_CONF_BOOL(cbracket, "Curly brackets { }", + "Auto-close curly brackets \"{\" -> \"{|}\""); + g_signal_connect(widget, "toggled", G_CALLBACK(ac_cbracket_cb), dialog); + WIDGET_CONF_BOOL(sbracket, "Square brackets [ ]", + "Auto-close square brackets \"[\" -> \"[|]\""); + WIDGET_CONF_BOOL(abracket, "Angular brackets < >", + "Auto-close angular brackets \"<\" -> \"<|>\""); + g_signal_connect(widget, "toggled", G_CALLBACK(ac_abracket_htmlonly_cb), dialog); + WIDGET_CONF_BOOL(abracket_htmlonly, "\tOnly for HTML", + "Auto-close angular brackets only in HTML documents"); + WIDGET_CONF_BOOL(dquote, "Double quotes \" \"", + "Auto-close double quotes \" -> \"|\""); + WIDGET_CONF_BOOL(squote, "Single quotes \' \'", + "Auto-close single quotes ' -> '|'"); + WIDGET_CONF_BOOL(backquote, "Backquote ` `", + "Auto-close backquote ` -> `|`"); + g_signal_connect(widget, "toggled", G_CALLBACK(ac_backquote_bashonly_cb), dialog); + WIDGET_CONF_BOOL(backquote_bashonly, "\tOnly for Bash", + "Auto-close backquote only in Bash"); + + WIDGET_FRAME("Improve curly brackets completion"); + WIDGET_CONF_BOOL(make_indent_for_cbracket, "Indent when enclosing", + "If you select some text and press \"{\" or \"}\", plugin " + "will auto-close selected lines and make new block with indent." + "\nYou do not need to select block precisely - block enclosing " + "takes into account only lines."); + g_signal_connect(widget, "toggled", G_CALLBACK(ac_make_indent_for_cbracket_cb), dialog); + WIDGET_CONF_BOOL(move_cursor_to_beginning, "Move cursor to beginning", + "If you checked \"Indent when enclosing\", moving cursor " + "to beginning may be useful: usually you make new block " + "and need to create new statement before this block."); + WIDGET_CONF_BOOL(improved_cbracket_indent, "Improved auto-indentation", + "Improved auto-indent for curly brackets: type \"{\" " + "and then press Enter - plugin will create full indented block. " + "Works without \"auto-close { }\" checkbox."); + + container = vbox; + WIDGET_CONF_BOOL(delete_pairing_brace, "Delete pairing character while backspacing first", + "Check if you want to delete pairing bracket by pressing BackSpace."); + g_signal_connect(widget, "toggled", G_CALLBACK(ac_delete_pairing_brace_cb), dialog); + WIDGET_CONF_BOOL(suppress_doubling, "Suppress double-completion", + "Check if you want to allow editor automatically fix mistypes " + "with brackets: if you type \"{}\" you will get \"{}\", not \"{}}\"."); + WIDGET_CONF_BOOL(enclose_selections, "Enclose selections", + "Automatically enclose selected text by pressing just one bracket key."); + g_signal_connect(widget, "toggled", G_CALLBACK(ac_enclose_selections_cb), dialog); + WIDGET_CONF_BOOL(keep_selection, "Keep selection when enclosing", + "Keep your previously selected text after enclosing."); + + WIDGET_FRAME("Behaviour inside comments and strings"); + WIDGET_CONF_BOOL(comments_ac_enable, "Allow auto-closing in strings and comments", + "Check if you wan to keep auto-closing inside strings and comments too."); + WIDGET_CONF_BOOL(comments_enclose, "Enclose selections in strings and comments", + "Check if you wan to enclose selections inside strings and comments too."); + + container = vbox; + WIDGET_CONF_BOOL(close_functions, "Auto-complete \";\" for functions", + "Full function auto-closing (works only for C/C++): type \"sin(\" " + "and you will get \"sin(|);\"."); + WIDGET_CONF_BOOL(bcksp_remove_pair, "Shift+BackSpace removes pairing brace too", + "Remove left and right brace while pressing Shift+BackSpace.\nTip: " + "to completely remove indented block just Shift+BackSpace first \"{\" " + "or last \"}\"."); + WIDGET_CONF_BOOL(jump_on_tab, "Jump on Tab to enclosed char", + "Jump behind autoclosed items on Tab press."); + +#undef WIDGET_CONF_BOOL +#undef WIDGET_FRAME + + ac_make_indent_for_cbracket_cb(NULL, dialog); + ac_cbracket_cb(NULL, dialog); + ac_enclose_selections_cb(NULL, dialog); + ac_parenthesis_cb(NULL, dialog); + ac_abracket_htmlonly_cb(NULL, dialog); + ac_delete_pairing_brace_cb(NULL, dialog); + g_signal_connect(dialog, "response", G_CALLBACK(configure_response_cb), NULL); + gtk_widget_show_all(scrollbox); + return scrollbox; +} + +/* Called by Geany before unloading the plugin. */ +void +plugin_cleanup(void) +{ + autoclose_handlers_cleanup(); + g_free(ac_info->config_file); + g_free(ac_info); +} + +void +plugin_help(void) +{ + utils_open_browser("http://plugins.geany.org/autoclose.html"); +} diff -Nru geany-plugins-1.23+dfsg/autoclose/src/Makefile.am geany-plugins-1.24+dfsg/autoclose/src/Makefile.am --- geany-plugins-1.23+dfsg/autoclose/src/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/autoclose/src/Makefile.am 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/vars.build.mk + +geanyplugins_LTLIBRARIES = autoclose.la + +autoclose_la_SOURCES = autoclose.c +autoclose_la_LIBADD = $(COMMONLIBS) + +include $(top_srcdir)/build/cppcheck.mk diff -Nru geany-plugins-1.23+dfsg/autoclose/src/Makefile.in geany-plugins-1.24+dfsg/autoclose/src/Makefile.in --- geany-plugins-1.23+dfsg/autoclose/src/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/autoclose/src/Makefile.in 2014-04-13 17:12:41.000000000 +0000 @@ -0,0 +1,802 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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 \ + *\\[\ \ ]*) \ + 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; \ + 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@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp +subdir = autoclose/src +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ + $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ + $(top_srcdir)/build/cppcheck.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ + $(top_srcdir)/build/geanydoc.m4 \ + $(top_srcdir)/build/geanyextrasel.m4 \ + $(top_srcdir)/build/geanygendoc.m4 \ + $(top_srcdir)/build/geanyinsertnum.m4 \ + $(top_srcdir)/build/geanylatex.m4 \ + $(top_srcdir)/build/geanylipsum.m4 \ + $(top_srcdir)/build/geanylua.m4 \ + $(top_srcdir)/build/geanymacro.m4 \ + $(top_srcdir)/build/geanyminiscript.m4 \ + $(top_srcdir)/build/geanynumberedbookmarks.m4 \ + $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ + $(top_srcdir)/build/geanysendmail.m4 \ + $(top_srcdir)/build/geanyvc.m4 \ + $(top_srcdir)/build/geniuspaste.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ + $(top_srcdir)/build/pretty-printer.m4 \ + $(top_srcdir)/build/scope.m4 \ + $(top_srcdir)/build/shiftcolumn.m4 \ + $(top_srcdir)/build/spellcheck.m4 \ + $(top_srcdir)/build/status.m4 \ + $(top_srcdir)/build/tableconvert.m4 \ + $(top_srcdir)/build/treebrowser.m4 \ + $(top_srcdir)/build/unittests.m4 \ + $(top_srcdir)/build/updatechecker.m4 \ + $(top_srcdir)/build/webhelper.m4 \ + $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ + $(top_srcdir)/build/cache/glib-gettext.m4 \ + $(top_srcdir)/build/cache/intltool.m4 \ + $(top_srcdir)/build/cache/libtool.m4 \ + $(top_srcdir)/build/cache/ltoptions.m4 \ + $(top_srcdir)/build/cache/ltsugar.m4 \ + $(top_srcdir)/build/cache/ltversion.m4 \ + $(top_srcdir)/build/cache/lt~obsolete.m4 \ + $(top_srcdir)/build/cache/nls.m4 \ + $(top_srcdir)/build/cache/pkg.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +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__installdirs = "$(DESTDIR)$(geanypluginsdir)" +LTLIBRARIES = $(geanyplugins_LTLIBRARIES) +am__DEPENDENCIES_1 = +am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +autoclose_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_autoclose_la_OBJECTS = autoclose.lo +autoclose_la_OBJECTS = $(am_autoclose_la_OBJECTS) +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 +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +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_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_CCLD_1 = +SOURCES = $(autoclose_la_SOURCES) +DIST_SOURCES = $(autoclose_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + 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 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ +COMMANDER_CFLAGS = @COMMANDER_CFLAGS@ +COMMANDER_LIBS = @COMMANDER_LIBS@ +CPP = @CPP@ +CPPCHECK = @CPPCHECK@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ +DEVHELP_LIBS = @DEVHELP_LIBS@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENCHANT_CFLAGS = @ENCHANT_CFLAGS@ +ENCHANT_LIBS = @ENCHANT_LIBS@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GEANYGENDOC_CFLAGS = @GEANYGENDOC_CFLAGS@ +GEANYGENDOC_LIBS = @GEANYGENDOC_LIBS@ +GEANY_CFLAGS = @GEANY_CFLAGS@ +GEANY_LIBS = @GEANY_LIBS@ +GEANY_VERSION = @GEANY_VERSION@ +GENIUSPASTE_CFLAGS = @GENIUSPASTE_CFLAGS@ +GENIUSPASTE_LIBS = @GENIUSPASTE_LIBS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GPGME_CFLAGS = @GPGME_CFLAGS@ +GPGME_CONFIG = @GPGME_CONFIG@ +GPGME_LIBS = @GPGME_LIBS@ +GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ +GREP = @GREP@ +GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ +GTKSPELL_LIBS = @GTKSPELL_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBMARKDOWN_CFLAGS = @LIBMARKDOWN_CFLAGS@ +LIBMARKDOWN_LIBS = @LIBMARKDOWN_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCALEDIR = @LOCALEDIR@ +LTLIBOBJS = @LTLIBOBJS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_LIBS = @LUA_LIBS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MARKDOWN_CFLAGS = @MARKDOWN_CFLAGS@ +MARKDOWN_LIBS = @MARKDOWN_LIBS@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +MULTITERM_CFLAGS = @MULTITERM_CFLAGS@ +MULTITERM_LIBS = @MULTITERM_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +RST2HTML = @RST2HTML@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +UPDATECHECKER_CFLAGS = @UPDATECHECKER_CFLAGS@ +UPDATECHECKER_LIBS = @UPDATECHECKER_LIBS@ +USE_NLS = @USE_NLS@ +VALAC = @VALAC@ +VERSION = @VERSION@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ +WEBHELPER_CFLAGS = @WEBHELPER_CFLAGS@ +WEBHELPER_LIBS = @WEBHELPER_LIBS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +geanypluginsdir = @geanypluginsdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AM_CFLAGS = \ + -DLOCALEDIR=\""$(LOCALEDIR)"\" \ + -DPREFIX=\""$(prefix)"\" \ + -DDOCDIR=\""$(docdir)"\" \ + -DGEANYPLUGINS_DATADIR=\""$(datadir)"\" \ + -DPKGDATADIR=\""$(pkgdatadir)"\" \ + -DLIBDIR=\""$(libdir)"\" \ + -DPKGLIBDIR=\""$(pkglibdir)"\" \ + $(GEANY_CFLAGS) \ + $(GP_CFLAGS) + +AM_LDFLAGS = -module -avoid-version +COMMONLIBS = \ + $(GEANY_LIBS) \ + $(INTLLIBS) + +geanyplugins_LTLIBRARIES = autoclose.la +autoclose_la_SOURCES = autoclose.c +autoclose_la_LIBADD = $(COMMONLIBS) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/vars.build.mk $(top_srcdir)/build/cppcheck.mk $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign autoclose/src/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign autoclose/src/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + 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/vars.build.mk $(top_srcdir)/build/cppcheck.mk: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(geanypluginsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(geanypluginsdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(geanypluginsdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(geanypluginsdir)"; \ + } + +uninstall-geanypluginsLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(geanypluginsdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(geanypluginsdir)/$$f"; \ + done + +clean-geanypluginsLTLIBRARIES: + -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) + @list='$(geanyplugins_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}; \ + } + +autoclose.la: $(autoclose_la_OBJECTS) $(autoclose_la_DEPENDENCIES) $(EXTRA_autoclose_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) -rpath $(geanypluginsdir) $(autoclose_la_OBJECTS) $(autoclose_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autoclose.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@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 -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 -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +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 + +GTAGS: + 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 + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@HAVE_CPPCHECK_FALSE@check-local: +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(geanypluginsdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-geanypluginsLTLIBRARIES clean-generic clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-geanypluginsLTLIBRARIES + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-geanypluginsLTLIBRARIES + +.MAKE: check-am install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ + clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES + + +@HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) + +@HAVE_CPPCHECK_TRUE@check-local: check-cppcheck + +# 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. +.NOEXPORT: diff -Nru geany-plugins-1.23+dfsg/autoclose/wscript_build geany-plugins-1.24+dfsg/autoclose/wscript_build --- geany-plugins-1.23+dfsg/autoclose/wscript_build 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/autoclose/wscript_build 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - Autoclose +# +# Copyright 2013 Roland Pallai +# +# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + +from build.wafutils import build_plugin + + +name = 'Autoclose' +includes = ['autoclose/src'] + +build_plugin(bld, name, includes=includes) diff -Nru geany-plugins-1.23+dfsg/autoclose/wscript_configure geany-plugins-1.24+dfsg/autoclose/wscript_configure --- geany-plugins-1.23+dfsg/autoclose/wscript_configure 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/autoclose/wscript_configure 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - Autoclose +# +# Copyright 2013 Roland Pallai +# +# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + +from build.wafutils import check_cfg_cached, check_c_header_cached diff -Nru geany-plugins-1.23+dfsg/build/addons.m4 geany-plugins-1.24+dfsg/build/addons.m4 --- geany-plugins-1.23+dfsg/build/addons.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/addons.m4 2013-06-30 11:40:06.000000000 +0000 @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_ADDONS], [ - GP_ARG_DISABLE(Addons, yes) + GP_ARG_DISABLE([Addons], [auto]) + GP_CHECK_PLUGIN_GTK2_ONLY([Addons]) GP_COMMIT_PLUGIN_STATUS([Addons]) AC_CONFIG_FILES([ addons/Makefile diff -Nru geany-plugins-1.23+dfsg/build/autoclose.m4 geany-plugins-1.24+dfsg/build/autoclose.m4 --- geany-plugins-1.23+dfsg/build/autoclose.m4 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/autoclose.m4 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,11 @@ +AC_DEFUN([GP_CHECK_AUTOCLOSE], +[ + GP_ARG_DISABLE([Autoclose], [auto]) + GP_CHECK_PLUGIN_DEPS([Autoclose], [AUTOCLOSE], + [$GP_GTK_PACKAGE >= 2.8]) + GP_COMMIT_PLUGIN_STATUS([Autoclose]) + AC_CONFIG_FILES([ + autoclose/Makefile + autoclose/src/Makefile + ]) +]) diff -Nru geany-plugins-1.23+dfsg/build/cache/ax_python_devel.m4 geany-plugins-1.24+dfsg/build/cache/ax_python_devel.m4 --- geany-plugins-1.23+dfsg/build/cache/ax_python_devel.m4 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/cache/ax_python_devel.m4 2014-04-13 17:12:30.000000000 +0000 @@ -0,0 +1,324 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_python_devel.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PYTHON_DEVEL([version]) +# +# DESCRIPTION +# +# Note: Defines as a precious variable "PYTHON_VERSION". Don't override it +# in your configure.ac. +# +# This macro checks for Python and tries to get the include path to +# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS) +# output variables. It also exports $(PYTHON_EXTRA_LIBS) and +# $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code. +# +# You can search for some particular version of Python by passing a +# parameter to this macro, for example ">= '2.3.1'", or "== '2.4'". Please +# note that you *have* to pass also an operator along with the version to +# match, and pay special attention to the single quotes surrounding the +# version number. Don't use "PYTHON_VERSION" for this: that environment +# variable is declared as precious and thus reserved for the end-user. +# +# This macro should work for all versions of Python >= 2.1.0. As an end +# user, you can disable the check for the python version by setting the +# PYTHON_NOVERSIONCHECK environment variable to something else than the +# empty string. +# +# If you need to use this macro for an older Python version, please +# contact the authors. We're always open for feedback. +# +# LICENSE +# +# Copyright (c) 2009 Sebastian Huber +# Copyright (c) 2009 Alan W. Irwin +# Copyright (c) 2009 Rafael Laboissiere +# Copyright (c) 2009 Andrew Collier +# Copyright (c) 2009 Matteo Settenvini +# Copyright (c) 2009 Horst Knorr +# Copyright (c) 2013 Daniel Mullner +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 16 + +AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL]) +AC_DEFUN([AX_PYTHON_DEVEL],[ + # + # Allow the use of a (user set) custom python version + # + AC_ARG_VAR([PYTHON_VERSION],[The installed Python + version to use, for example '2.3'. This string + will be appended to the Python interpreter + canonical name.]) + + AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]]) + if test -z "$PYTHON"; then + AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path]) + PYTHON_VERSION="" + fi + + # + # Check for a version of Python >= 2.1.0 + # + AC_MSG_CHECKING([for a version of Python >= '2.1.0']) + ac_supports_python_ver=`$PYTHON -c "import sys; \ + ver = sys.version.split ()[[0]]; \ + print (ver >= '2.1.0')"` + if test "$ac_supports_python_ver" != "True"; then + if test -z "$PYTHON_NOVERSIONCHECK"; then + AC_MSG_RESULT([no]) + AC_MSG_FAILURE([ +This version of the AC@&t@_PYTHON_DEVEL macro +doesn't work properly with versions of Python before +2.1.0. You may need to re-run configure, setting the +variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG, +PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. +Moreover, to disable this check, set PYTHON_NOVERSIONCHECK +to something else than an empty string. +]) + else + AC_MSG_RESULT([skip at user request]) + fi + else + AC_MSG_RESULT([yes]) + fi + + # + # if the macro parameter ``version'' is set, honour it + # + if test -n "$1"; then + AC_MSG_CHECKING([for a version of Python $1]) + ac_supports_python_ver=`$PYTHON -c "import sys; \ + ver = sys.version.split ()[[0]]; \ + print (ver $1)"` + if test "$ac_supports_python_ver" = "True"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([this package requires Python $1. +If you have it installed, but it isn't the default Python +interpreter in your system path, please pass the PYTHON_VERSION +variable to configure. See ``configure --help'' for reference. +]) + PYTHON_VERSION="" + fi + fi + + # + # Check if you have distutils, else fail + # + AC_MSG_CHECKING([for the distutils Python package]) + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` + if test -z "$ac_distutils_result"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([cannot import Python module "distutils". +Please check your Python installation. The error was: +$ac_distutils_result]) + PYTHON_VERSION="" + fi + + # + # Check for Python include path + # + AC_MSG_CHECKING([for Python include path]) + if test -z "$PYTHON_CPPFLAGS"; then + python_path=`$PYTHON -c "import distutils.sysconfig; \ + print (distutils.sysconfig.get_python_inc ());"` + plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ + print (distutils.sysconfig.get_python_inc (plat_specific=1));"` + if test -n "${python_path}"; then + if test "${plat_python_path}" != "${python_path}"; then + python_path="-I$python_path -I$plat_python_path" + else + python_path="-I$python_path" + fi + fi + PYTHON_CPPFLAGS=$python_path + fi + AC_MSG_RESULT([$PYTHON_CPPFLAGS]) + AC_SUBST([PYTHON_CPPFLAGS]) + + # + # Check for Python library path + # + AC_MSG_CHECKING([for Python library path]) + if test -z "$PYTHON_LDFLAGS"; then + # (makes two attempts to ensure we've got a version number + # from the interpreter) + ac_python_version=`cat<]], + [[Py_Initialize();]]) + ],[pythonexists=yes],[pythonexists=no]) + AC_LANG_POP([C]) + # turn back to default flags + CPPFLAGS="$ac_save_CPPFLAGS" + LIBS="$ac_save_LIBS" + + AC_MSG_RESULT([$pythonexists]) + + if test ! "x$pythonexists" = "xyes"; then + AC_MSG_FAILURE([ + Could not link test program to Python. Maybe the main Python library has been + installed in some non-standard library path. If so, pass it to configure, + via the LDFLAGS environment variable. + Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib" + ============================================================================ + ERROR! + You probably have to install the development version of the Python package + for your distribution. The exact name of this package varies among them. + ============================================================================ + ]) + PYTHON_VERSION="" + fi + + # + # all done! + # +]) diff -Nru geany-plugins-1.23+dfsg/build/cache/glib-gettext.m4 geany-plugins-1.24+dfsg/build/cache/glib-gettext.m4 --- geany-plugins-1.23+dfsg/build/cache/glib-gettext.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/cache/glib-gettext.m4 2014-04-13 17:12:30.000000000 +0000 @@ -315,7 +315,6 @@ dnl glib_DEFUN([GLIB_GNU_GETTEXT], [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl GLIB_LC_MESSAGES GLIB_WITH_NLS diff -Nru geany-plugins-1.23+dfsg/build/cache/libtool.m4 geany-plugins-1.24+dfsg/build/cache/libtool.m4 --- geany-plugins-1.23+dfsg/build/cache/libtool.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/cache/libtool.m4 2014-04-13 17:12:33.000000000 +0000 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1324,9 +1324,19 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1345,7 +1355,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1688,7 +1701,8 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + 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 @@ -2512,17 +2526,6 @@ esac ;; -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' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2639,7 +2642,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +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 @@ -3255,10 +3258,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3297,7 +3296,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -4049,7 +4048,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4348,7 +4347,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -6241,9 +6240,6 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - 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 @@ -6405,7 +6401,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler diff -Nru geany-plugins-1.23+dfsg/build/cache/nls.m4 geany-plugins-1.24+dfsg/build/cache/nls.m4 --- geany-plugins-1.23+dfsg/build/cache/nls.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/cache/nls.m4 2014-04-13 17:12:30.000000000 +0000 @@ -1,5 +1,5 @@ # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff -Nru geany-plugins-1.23+dfsg/build/commander.m4 geany-plugins-1.24+dfsg/build/commander.m4 --- geany-plugins-1.23+dfsg/build/commander.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/commander.m4 2013-06-30 11:40:06.000000000 +0000 @@ -3,7 +3,7 @@ GP_ARG_DISABLE([Commander], [auto]) GP_CHECK_PLUGIN_DEPS([Commander], [COMMANDER], - [gtk+-2.0 >= 2.16 + [$GP_GTK_PACKAGE >= 2.16 glib-2.0 >= 2.4]) GP_COMMIT_PLUGIN_STATUS([Commander]) diff -Nru geany-plugins-1.23+dfsg/build/common.m4 geany-plugins-1.24+dfsg/build/common.m4 --- geany-plugins-1.23+dfsg/build/common.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/common.m4 2013-06-30 11:40:06.000000000 +0000 @@ -14,15 +14,22 @@ ]) dnl GP_CHECK_PLUGIN_DEPS(PluginName, VARIABLE-PREFIX, modules...) -dnl Checks whether modules exist using PKG_CHECK_MODULES, and enables/disables -dnl plugins appropriately if enable_$plugin=auto +dnl Checks whether modules exist using PKG_CHECK_MODULES, and error +dnl out/disables plugins appropriately depending on enable_$plugin AC_DEFUN([GP_CHECK_PLUGIN_DEPS], [ + AC_REQUIRE([GP_CHECK_GTK_VERSION]) + + gtk_dep=m4_bmatch([$3], [gtk\+-2\.0], [2], [gtk\+-3\.0], [3], [0]) + if test $gtk_dep -ne 0; then + GP_CHECK_PLUGIN_GTKN_ONLY([$1], [$gtk_dep]) + fi + if test "$m4_tolower(AS_TR_SH(enable_$1))" = "yes"; then PKG_CHECK_MODULES([$2], [$3]) elif test "$m4_tolower(AS_TR_SH(enable_$1))" = "auto"; then PKG_CHECK_MODULES([$2], [$3], - [m4_tolower(AS_TR_SH(enable_$1))=yes], + [], [m4_tolower(AS_TR_SH(enable_$1))=no]) fi ]) diff -Nru geany-plugins-1.23+dfsg/build/cppcheck.mk geany-plugins-1.24+dfsg/build/cppcheck.mk --- geany-plugins-1.23+dfsg/build/cppcheck.mk 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/cppcheck.mk 2014-04-12 14:28:39.000000000 +0000 @@ -2,7 +2,10 @@ if HAVE_CPPCHECK check-cppcheck: $(srcdir) - $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ + $(CPPCHECK) \ + -q --template gcc --error-exitcode=2 \ + $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ + $(srcdir) check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/build/debugger.m4 geany-plugins-1.24+dfsg/build/debugger.m4 --- geany-plugins-1.23+dfsg/build/debugger.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/debugger.m4 2013-06-30 11:40:06.000000000 +0000 @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_DEBUGGER], [ GP_ARG_DISABLE([Debugger], [auto]) + GP_CHECK_PLUGIN_GTK2_ONLY([Debugger]) GP_CHECK_PLUGIN_DEPS([debugger], [VTE], [vte >= 0.24]) GP_COMMIT_PLUGIN_STATUS([Debugger]) diff -Nru geany-plugins-1.23+dfsg/build/defineformat.m4 geany-plugins-1.24+dfsg/build/defineformat.m4 --- geany-plugins-1.23+dfsg/build/defineformat.m4 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/defineformat.m4 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,11 @@ +AC_DEFUN([GP_CHECK_DEFINEFORMAT], +[ + GP_ARG_DISABLE([Defineformat], [auto]) + GP_CHECK_PLUGIN_DEPS([Defineformat], [DEFINEFORMAT], + [$GP_GTK_PACKAGE >= 2.8]) + GP_COMMIT_PLUGIN_STATUS([Defineformat]) + AC_CONFIG_FILES([ + defineformat/Makefile + defineformat/src/Makefile + ]) +]) diff -Nru geany-plugins-1.23+dfsg/build/geanydoc.m4 geany-plugins-1.24+dfsg/build/geanydoc.m4 --- geany-plugins-1.23+dfsg/build/geanydoc.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/geanydoc.m4 2013-06-30 11:40:06.000000000 +0000 @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_GEANYDOC], [ - GP_ARG_DISABLE([GeanyDoc], [yes]) + GP_ARG_DISABLE([GeanyDoc], [auto]) + GP_CHECK_PLUGIN_GTK2_ONLY([GeanyDoc]) GP_COMMIT_PLUGIN_STATUS([GeanyDoc]) AC_CONFIG_FILES([ geanydoc/Makefile diff -Nru geany-plugins-1.23+dfsg/build/geanygendoc.m4 geany-plugins-1.24+dfsg/build/geanygendoc.m4 --- geany-plugins-1.23+dfsg/build/geanygendoc.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/geanygendoc.m4 2013-06-30 11:40:06.000000000 +0000 @@ -8,7 +8,7 @@ CTPL_VERSION=0.3 GP_CHECK_PLUGIN_DEPS([GeanyGenDoc], GEANYGENDOC, - [gtk+-2.0 >= ${GTK_VERSION} + [$GP_GTK_PACKAGE >= ${GTK_VERSION} glib-2.0 >= ${GLIB_VERSION} gio-2.0 >= ${GIO_VERSION} ctpl >= ${CTPL_VERSION}]) diff -Nru geany-plugins-1.23+dfsg/build/geanyinsertnum.m4 geany-plugins-1.24+dfsg/build/geanyinsertnum.m4 --- geany-plugins-1.23+dfsg/build/geanyinsertnum.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/geanyinsertnum.m4 2013-06-30 11:40:06.000000000 +0000 @@ -1,6 +1,6 @@ AC_DEFUN([GP_CHECK_GEANYINSERTNUM], [ - GP_ARG_DISABLE([GeanyInsertNum], [yes]) + GP_ARG_DISABLE([GeanyInsertNum], [auto]) GP_COMMIT_PLUGIN_STATUS([GeanyInsertNum]) AC_CONFIG_FILES([ geanyinsertnum/Makefile diff -Nru geany-plugins-1.23+dfsg/build/geanylatex.m4 geany-plugins-1.24+dfsg/build/geanylatex.m4 --- geany-plugins-1.23+dfsg/build/geanylatex.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/geanylatex.m4 2013-06-30 11:40:06.000000000 +0000 @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_GEANYLATEX], [ - GP_ARG_DISABLE([GeanyLaTeX], [yes]) + GP_ARG_DISABLE([GeanyLaTeX], [auto]) + GP_CHECK_PLUGIN_GTK2_ONLY([GeanyLaTeX]) GP_COMMIT_PLUGIN_STATUS([GeanyLaTeX]) AC_CONFIG_FILES([ geanylatex/Makefile diff -Nru geany-plugins-1.23+dfsg/build/geanylipsum.m4 geany-plugins-1.24+dfsg/build/geanylipsum.m4 --- geany-plugins-1.23+dfsg/build/geanylipsum.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/geanylipsum.m4 2013-06-30 11:40:06.000000000 +0000 @@ -1,6 +1,6 @@ AC_DEFUN([GP_CHECK_GEANYLIPSUM], [ - GP_ARG_DISABLE([GeanyLipsum], [yes]) + GP_ARG_DISABLE([GeanyLipsum], [auto]) GP_COMMIT_PLUGIN_STATUS([GeanyLipsum]) AC_CONFIG_FILES([ geanylipsum/Makefile diff -Nru geany-plugins-1.23+dfsg/build/geany.m4 geany-plugins-1.24+dfsg/build/geany.m4 --- geany-plugins-1.23+dfsg/build/geany.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/geany.m4 2013-06-30 11:40:06.000000000 +0000 @@ -1,4 +1,4 @@ -AC_DEFUN([GP_CHECK_GEANY], +AC_DEFUN([_GP_GEANY_LIBDIR], [ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) AC_ARG_WITH([geany-libdir], @@ -6,8 +6,33 @@ [Set Geany's installation libdir [[default=auto]]]), [geany_libdir=${withval}], [geany_libdir=$(${PKG_CONFIG} --variable=libdir geany)]) +]) +dnl GP_GEANY_PKG_CONFIG_PATH_PUSH +dnl Updates PKG_CONFIG_PATH to include the appropriate directory to match +dnl --with-geany-libdir option. This is useful when calling PKG_CONFIG on the +dnl geany package but should be avoided for any other package. +dnl Call GP_GEANY_PKG_CONFIG_PATH_POP to undo the action +AC_DEFUN([GP_GEANY_PKG_CONFIG_PATH_PUSH], +[ + AC_REQUIRE([_GP_GEANY_LIBDIR]) export PKG_CONFIG_PATH="$geany_libdir/pkgconfig:$PKG_CONFIG_PATH" +]) + +dnl GP_GEANY_PKG_CONFIG_PATH_POP +dnl Undoes what GP_GEANY_PKG_CONFIG_PATH_PUSH did +AC_DEFUN([GP_GEANY_PKG_CONFIG_PATH_POP], +[ + AC_REQUIRE([_GP_GEANY_LIBDIR]) + export PKG_CONFIG_PATH="${PKG_CONFIG_PATH#*:}" + test -z "${PKG_CONFIG_PATH}" && unset PKG_CONFIG_PATH +]) + +AC_DEFUN([GP_CHECK_GEANY], +[ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + + GP_GEANY_PKG_CONFIG_PATH_PUSH PKG_CHECK_MODULES([GEANY], [geany >= $1]) geanypluginsdir=$geany_libdir/geany @@ -15,6 +40,5 @@ AC_SUBST([geanypluginsdir]) AC_SUBST([GEANY_VERSION]) - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH#*:}" - test -z "${PKG_CONFIG_PATH}" && unset PKG_CONFIG_PATH + GP_GEANY_PKG_CONFIG_PATH_POP ]) diff -Nru geany-plugins-1.23+dfsg/build/geanymacro.m4 geany-plugins-1.24+dfsg/build/geanymacro.m4 --- geany-plugins-1.23+dfsg/build/geanymacro.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/geanymacro.m4 2013-06-30 11:40:06.000000000 +0000 @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_GEANYMACRO], [ - GP_ARG_DISABLE([GeanyMacro], [yes]) + GP_ARG_DISABLE([GeanyMacro], [auto]) + GP_CHECK_PLUGIN_GTK2_ONLY([GeanyMacro]) GP_COMMIT_PLUGIN_STATUS([GeanyMacro]) AC_CONFIG_FILES([ geanymacro/Makefile diff -Nru geany-plugins-1.23+dfsg/build/geanyminiscript.m4 geany-plugins-1.24+dfsg/build/geanyminiscript.m4 --- geany-plugins-1.23+dfsg/build/geanyminiscript.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/geanyminiscript.m4 2013-06-30 11:40:06.000000000 +0000 @@ -1,6 +1,6 @@ AC_DEFUN([GP_CHECK_GEANYMINISCRIPT], [ - GP_ARG_DISABLE([GeanyMiniScript], [yes]) + GP_ARG_DISABLE([GeanyMiniScript], [auto]) GP_COMMIT_PLUGIN_STATUS([GeanyMiniScript]) AC_CONFIG_FILES([ geanyminiscript/Makefile diff -Nru geany-plugins-1.23+dfsg/build/geanynumberedbookmarks.m4 geany-plugins-1.24+dfsg/build/geanynumberedbookmarks.m4 --- geany-plugins-1.23+dfsg/build/geanynumberedbookmarks.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/geanynumberedbookmarks.m4 2013-06-30 11:40:06.000000000 +0000 @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_GEANYNUMBEREDBOOKMARKS], [ - GP_ARG_DISABLE([GeanyNumberedBookmarks], [yes]) + GP_ARG_DISABLE([GeanyNumberedBookmarks], [auto]) + GP_CHECK_PLUGIN_GTK2_ONLY([GeanyNumberedBookmarks]) GP_COMMIT_PLUGIN_STATUS([GeanyNumberedBookmarks]) AC_CONFIG_FILES([ geanynumberedbookmarks/Makefile diff -Nru geany-plugins-1.23+dfsg/build/geanypg.m4 geany-plugins-1.24+dfsg/build/geanypg.m4 --- geany-plugins-1.23+dfsg/build/geanypg.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/geanypg.m4 2013-06-30 11:40:06.000000000 +0000 @@ -3,7 +3,7 @@ GP_ARG_DISABLE([geanypg], [auto]) if test "$enable_geanypg" = "auto"; then enable_geanypg=no - m4_ifdef([AM_PATH_GPGME], [AM_PATH_GPGME(, enable_geanypg=yes)]) + m4_ifdef([AM_PATH_GPGME], [AM_PATH_GPGME(, enable_geanypg=auto)]) elif test "$enable_geanypg" = "yes"; then m4_ifdef([AM_PATH_GPGME], [AM_PATH_GPGME(,, [AC_MSG_ERROR([Could not find GPGME. Please define GPGME_CFLAGS and GPGME_LIBS if it is installed.])])], @@ -11,7 +11,14 @@ fi - AM_CONDITIONAL(ENABLE_GEANYPG, test "$enable_geanypg" = "yes") + AS_IF([test "$enable_geanypg" != "no"], [ + AC_CHECK_FUNCS([fdopen],,[ + AS_IF([test "$enable_geanypg" = "yes"], + [AC_MSG_ERROR([Could not find fdopen])], + [enable_geanypg=no]) + ]) + ]) + # necessary for gpgme AC_SYS_LARGEFILE diff -Nru geany-plugins-1.23+dfsg/build/geanyprj.m4 geany-plugins-1.24+dfsg/build/geanyprj.m4 --- geany-plugins-1.23+dfsg/build/geanyprj.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/geanyprj.m4 2013-06-30 11:40:06.000000000 +0000 @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_GEANYPRJ], [ - GP_ARG_DISABLE([GeanyPrj], [yes]) + GP_ARG_DISABLE([GeanyPrj], [auto]) + GP_CHECK_PLUGIN_GTK2_ONLY([GeanyPrj]) GP_COMMIT_PLUGIN_STATUS([GeanyPrj]) AC_CONFIG_FILES([ geanyprj/Makefile diff -Nru geany-plugins-1.23+dfsg/build/geanypy.m4 geany-plugins-1.24+dfsg/build/geanypy.m4 --- geany-plugins-1.23+dfsg/build/geanypy.m4 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/geanypy.m4 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,28 @@ +AC_DEFUN([GP_CHECK_GEANYPY], +[ + GP_ARG_DISABLE([Geanypy], [auto]) + GP_CHECK_PLUGIN_GTK2_ONLY([Geanypy]) + GP_CHECK_PLUGIN_DEPS([Geanypy], [PYGTK], [pygtk-2.0]) + dnl FIXME: Checks for Python below should gracefully disable the plugin + dnl if they don't succeed and enable_geanypy is set to `auto`. + dnl However, since these macros don't seem to gracefully handle + dnl failure, and since if PyGTK is found they are likely to succeed + dnl anyway, we assume that if the plugin is not disabled at this + dnl point it is OK for these checks to be fatal. The user can pass + dnl always pass --disable-geanypy anyway. + AS_IF([! test x$enable_geanypy = xno], [ + AX_PYTHON_DEVEL([>= '2.6']) + AX_PYTHON_LIBRARY(,[AC_MSG_ERROR([Cannot find Python library])]) + AC_SUBST([PYTHON]) + AC_DEFINE_UNQUOTED([GEANYPY_PYTHON_LIBRARY], + ["$PYTHON_LIBRARY"], + [Location of Python library to dlopen()]) + ]) + GP_COMMIT_PLUGIN_STATUS([Geanypy]) + AC_CONFIG_FILES([ + geanypy/Makefile + geanypy/src/Makefile + geanypy/geany/Makefile + geanypy/plugins/Makefile + ]) +]) diff -Nru geany-plugins-1.23+dfsg/build/geanyvc.m4 geany-plugins-1.24+dfsg/build/geanyvc.m4 --- geany-plugins-1.23+dfsg/build/geanyvc.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/geanyvc.m4 2013-06-30 11:40:06.000000000 +0000 @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_GEANYVC], [ - GP_ARG_DISABLE([GeanyVC], [yes]) + GP_ARG_DISABLE([GeanyVC], [auto]) + GP_CHECK_PLUGIN_GTK2_ONLY([GeanyVC]) GP_COMMIT_PLUGIN_STATUS([GeanyVC]) AC_ARG_ENABLE(gtkspell, AC_HELP_STRING([--enable-gtkspell=ARG], diff -Nru geany-plugins-1.23+dfsg/build/gproject.m4 geany-plugins-1.24+dfsg/build/gproject.m4 --- geany-plugins-1.23+dfsg/build/gproject.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/gproject.m4 2013-06-30 11:40:06.000000000 +0000 @@ -1,6 +1,6 @@ AC_DEFUN([GP_CHECK_GPROJECT], [ - GP_ARG_DISABLE([GProject], [yes]) + GP_ARG_DISABLE([GProject], [auto]) GP_COMMIT_PLUGIN_STATUS([GProject]) AC_CONFIG_FILES([ gproject/Makefile diff -Nru geany-plugins-1.23+dfsg/build/gtk.m4 geany-plugins-1.24+dfsg/build/gtk.m4 --- geany-plugins-1.23+dfsg/build/gtk.m4 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/gtk.m4 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,57 @@ +dnl checks for the GTK version to build against (2 or 3) +dnl defines GP_GTK_PACKAGE (e.g. "gtk+-2.0"), GP_GTK_VERSION (e.g. "2.24") and +dnl GP_GTK_VERSION_MAJOR (e.g. "2"); and defines the GP_GTK3 AM conditional +AC_DEFUN([GP_CHECK_GTK_VERSION], +[ + AC_REQUIRE([AC_PROG_AWK]) + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + + GP_GEANY_PKG_CONFIG_PATH_PUSH + + _gtk_req=$(${PKG_CONFIG} --print-requires geany | ${AWK} '/^gtk\+-/{print}') + GP_GTK_PACKAGE=$(echo ${_gtk_req} | ${AWK} '{print $[]1}') + GP_GTK_VERSION=$(echo ${_gtk_req} | ${AWK} '{print $[]3}') + GP_GTK_VERSION_MAJOR=$(echo ${GP_GTK_VERSION} | cut -d. -f1) + AC_SUBST([GP_GTK_PACKAGE]) + AC_SUBST([GP_GTK_VERSION]) + AC_SUBST([GP_GTK_VERSION_MAJOR]) + + AM_CONDITIONAL([GP_GTK3], [test "x$GP_GTK_VERSION_MAJOR" = x3]) + + GP_GEANY_PKG_CONFIG_PATH_POP +]) + +dnl executes $1 if GTK3 is used, and $2 otherwise +AC_DEFUN([GP_CHECK_GTK3], +[ + AC_REQUIRE([GP_CHECK_GTK_VERSION]) + AS_IF([test ${GP_GTK_VERSION_MAJOR} = 3],[$1],[$2]) +]) + +dnl GP_CHECK_PLUGIN_GTKN_ONLY pluginname gtkversion +AC_DEFUN([GP_CHECK_PLUGIN_GTKN_ONLY], +[ + AC_REQUIRE([GP_CHECK_GTK_VERSION]) + + AS_IF([test "$m4_tolower(AS_TR_SH(enable_$1))" = no],[], + [AC_MSG_CHECKING([whether the GTK version in use is compatible with plugin $1]) + AS_IF([test ${GP_GTK_VERSION_MAJOR} = $2], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AS_IF([test "$m4_tolower(AS_TR_SH(enable_$1))" = yes], + [AC_MSG_ERROR([$1 is not compatible with the GTK version in use])], + [test "$m4_tolower(AS_TR_SH(enable_$1))" = auto], + [m4_tolower(AS_TR_SH(enable_$1))=no])])]) +]) + +dnl GP_CHECK_PLUGIN_GTK2_ONLY pluginname +AC_DEFUN([GP_CHECK_PLUGIN_GTK2_ONLY], +[ + GP_CHECK_PLUGIN_GTKN_ONLY([$1], [2]) +]) + +dnl GP_CHECK_PLUGIN_GTK3_ONLY pluginname +AC_DEFUN([GP_CHECK_PLUGIN_GTK3_ONLY], +[ + GP_CHECK_PLUGIN_GTKN_ONLY([$1], [3]) +]) diff -Nru geany-plugins-1.23+dfsg/build/markdown.m4 geany-plugins-1.24+dfsg/build/markdown.m4 --- geany-plugins-1.23+dfsg/build/markdown.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/markdown.m4 2013-06-30 11:40:06.000000000 +0000 @@ -49,9 +49,12 @@ GTK_VERSION=2.16 WEBKIT_VERSION=1.1.13 + GP_CHECK_GTK3([webkit_package=webkitgtk-3.0], + [webkit_package=webkit-1.0]) + GP_CHECK_PLUGIN_DEPS([markdown], [MARKDOWN], - [gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + [$GP_GTK_PACKAGE >= ${GTK_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0]) GP_COMMIT_PLUGIN_STATUS([Markdown]) diff -Nru geany-plugins-1.23+dfsg/build/pairtaghighlighter.m4 geany-plugins-1.24+dfsg/build/pairtaghighlighter.m4 --- geany-plugins-1.23+dfsg/build/pairtaghighlighter.m4 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/pairtaghighlighter.m4 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,9 @@ +AC_DEFUN([GP_CHECK_PAIRTAGHIGHLIGHTER], +[ + GP_ARG_DISABLE([PairTagHighlighter], [auto]) + GP_COMMIT_PLUGIN_STATUS([PairTagHighlighter]) + AC_CONFIG_FILES([ + pairtaghighlighter/Makefile + pairtaghighlighter/src/Makefile + ]) +]) diff -Nru geany-plugins-1.23+dfsg/build/pohelper.m4 geany-plugins-1.24+dfsg/build/pohelper.m4 --- geany-plugins-1.23+dfsg/build/pohelper.m4 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/pohelper.m4 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,12 @@ +AC_DEFUN([GP_CHECK_POHELPER], +[ + GP_ARG_DISABLE([PoHelper], [yes]) + + GP_COMMIT_PLUGIN_STATUS([PoHelper]) + + AC_CONFIG_FILES([ + pohelper/Makefile + pohelper/data/Makefile + pohelper/src/Makefile + ]) +]) diff -Nru geany-plugins-1.23+dfsg/build/scope.m4 geany-plugins-1.24+dfsg/build/scope.m4 --- geany-plugins-1.23+dfsg/build/scope.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/scope.m4 2013-06-30 11:40:06.000000000 +0000 @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_SCOPE], [ GP_ARG_DISABLE([Scope], [auto]) + GP_CHECK_PLUGIN_GTK2_ONLY([Scope]) GP_CHECK_PLUGIN_DEPS([scope], [VTE], [vte >= 0.17]) diff -Nru geany-plugins-1.23+dfsg/build/status.m4 geany-plugins-1.24+dfsg/build/status.m4 --- geany-plugins-1.23+dfsg/build/status.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/status.m4 2013-06-30 11:40:06.000000000 +0000 @@ -50,7 +50,7 @@ ${PACKAGE}-${VERSION} Build Environment: - Geany version: ${GEANY_VERSION} + Geany version: ${GEANY_VERSION} (GTK${GP_GTK_VERSION_MAJOR}) Install prefix: ${prefix} Datadir: ${expanded_datadir}/${PACKAGE_TARNAME} Libdir: ${expanded_libdir}/${PACKAGE_TARNAME} diff -Nru geany-plugins-1.23+dfsg/build/wafutils.py geany-plugins-1.24+dfsg/build/wafutils.py --- geany-plugins-1.23+dfsg/build/wafutils.py 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/wafutils.py 2014-04-13 13:33:33.000000000 +0000 @@ -182,45 +182,20 @@ return sorted(plugins) -def get_svn_rev(conf): - def in_git(): - cmd = 'git ls-files >/dev/null 2>&1' - return (conf.exec_command(cmd) == 0) - - def in_svn(): - return os.path.exists('.svn') - - # try GIT - if in_git(): - cmds = [ 'git svn find-rev HEAD 2>/dev/null', - 'git svn find-rev origin/trunk 2>/dev/null', - 'git svn find-rev trunk 2>/dev/null', - 'git svn find-rev master 2>/dev/null' - ] - for cmd in cmds: - try: - stdout = conf.cmd_and_log(cmd) - if stdout: - return int(stdout.strip()) - except WafError: - pass - except ValueError: - Logs.pprint('RED', 'Unparseable revision number') - # try SVN - elif in_svn(): - try: - _env = None if target_is_win32(conf) else dict(LANG='C') - stdout = conf.cmd_and_log(cmd='svn info --non-interactive', env=_env) - lines = stdout.splitlines(True) - for line in lines: - if line.startswith('Last Changed Rev'): - value = line.split(': ', 1)[1] - return int(value.strip()) - except WafError: - pass - except (IndexError, ValueError): - Logs.pprint('RED', 'Unparseable revision number') - return 0 +def get_git_rev(conf): + if conf.options.no_scm: + return + + if not os.path.isdir('.git'): + return + + try: + cmd = 'git rev-parse --short --revs-only HEAD' + revision = conf.cmd_and_log(cmd).strip() + except WafError: + return None + else: + return revision def install_docs(ctx, name, files): diff -Nru geany-plugins-1.23+dfsg/build/webhelper.m4 geany-plugins-1.24+dfsg/build/webhelper.m4 --- geany-plugins-1.23+dfsg/build/webhelper.m4 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/build/webhelper.m4 2013-06-30 11:40:06.000000000 +0000 @@ -18,12 +18,14 @@ fi fi + GP_CHECK_GTK3([webkit_package=webkitgtk-3.0], + [webkit_package=webkit-1.0]) GP_CHECK_PLUGIN_DEPS([WebHelper], [WEBHELPER], - [gtk+-2.0 >= ${GTK_VERSION} + [$GP_GTK_PACKAGE >= ${GTK_VERSION} glib-2.0 >= ${GLIB_VERSION} gio-2.0 >= ${GIO_VERSION} gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0]) diff -Nru geany-plugins-1.23+dfsg/codenav/Makefile.in geany-plugins-1.24+dfsg/codenav/Makefile.in --- geany-plugins-1.23+dfsg/codenav/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/codenav/Makefile.in 2014-04-13 17:12:41.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - NEWS +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog NEWS README subdir = codenav ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -467,22 +545,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -497,57 +578,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 \ @@ -563,12 +599,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; \ @@ -580,15 +611,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 @@ -597,6 +624,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 @@ -760,22 +802,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/codenav/src/Makefile.in geany-plugins-1.24+dfsg/codenav/src/Makefile.in --- geany-plugins-1.23+dfsg/codenav/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/codenav/src/Makefile.in 2014-04-13 17:12:41.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,17 +78,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp subdir = codenav/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -74,12 +104,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -91,6 +124,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -144,6 +178,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 @@ -156,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 = $(codenav_la_SOURCES) DIST_SOURCES = $(codenav_la_SOURCES) am__can_run_installinfo = \ @@ -177,6 +220,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -185,6 +245,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -203,6 +265,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -238,6 +302,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -304,6 +371,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -438,6 +515,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -464,12 +542,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + codenav.la: $(codenav_la_OBJECTS) $(codenav_la_DEPENDENCIES) $(EXTRA_codenav_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) -rpath $(geanypluginsdir) $(codenav_la_OBJECTS) $(codenav_la_LIBADD) $(LIBS) @@ -489,14 +570,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 $@ $< @@ -511,26 +592,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; \ @@ -542,15 +612,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 @@ -559,6 +625,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 @@ -705,24 +786,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/commander/Makefile.in geany-plugins-1.24+dfsg/commander/Makefile.in --- geany-plugins-1.23+dfsg/commander/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/commander/Makefile.in 2014-04-13 17:12:41.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - NEWS +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog NEWS README subdir = commander ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -467,22 +545,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -497,57 +578,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 \ @@ -563,12 +599,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; \ @@ -580,15 +611,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 @@ -597,6 +624,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 @@ -760,22 +802,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/commander/src/Makefile.in geany-plugins-1.24+dfsg/commander/src/Makefile.in --- geany-plugins-1.23+dfsg/commander/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/commander/src/Makefile.in 2014-04-13 17:12:41.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,17 +78,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp subdir = commander/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -74,12 +104,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -91,6 +124,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -144,9 +178,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 = commander_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(commander_la_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 @@ -159,20 +206,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 = $(commander_la_SOURCES) DIST_SOURCES = $(commander_la_SOURCES) am__can_run_installinfo = \ @@ -180,6 +223,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -188,6 +248,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -206,6 +268,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -241,6 +305,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -307,6 +374,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -442,6 +519,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -468,12 +546,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + commander.la: $(commander_la_OBJECTS) $(commander_la_DEPENDENCIES) $(EXTRA_commander_la_DEPENDENCIES) $(AM_V_CCLD)$(commander_la_LINK) -rpath $(geanypluginsdir) $(commander_la_OBJECTS) $(commander_la_LIBADD) $(LIBS) @@ -490,14 +571,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 $@ $< @@ -519,26 +600,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; \ @@ -550,15 +620,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 @@ -567,6 +633,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 @@ -713,24 +794,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/compile geany-plugins-1.24+dfsg/compile --- geany-plugins-1.23+dfsg/compile 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/compile 2014-04-13 17:12:41.000000000 +0000 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# 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 +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + 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 + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# 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 geany-plugins-1.23+dfsg/config.guess geany-plugins-1.24+dfsg/config.guess --- geany-plugins-1.23+dfsg/config.guess 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/config.guess 2014-04-13 17:12:41.000000000 +0000 @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2013-06-10' # 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 -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +20,17 @@ # 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. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 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." @@ -138,6 +132,27 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -200,6 +215,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +321,7 @@ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,6 +820,9 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -852,21 +874,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -879,59 +901,54 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -950,54 +967,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1201,6 +1227,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1227,19 +1256,21 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1256,7 +1287,7 @@ NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1330,9 +1361,6 @@ exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c < header file. */ #undef HAVE_DLFCN_H +/* Define to 1 if you have the `fdopen' function. */ +#undef HAVE_FDOPEN + /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT @@ -36,6 +42,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MKDIO_H +/* If available, contains the Python version number currently in use. */ +#undef HAVE_PYTHON + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H diff -Nru geany-plugins-1.23+dfsg/config.sub geany-plugins-1.24+dfsg/config.sub --- geany-plugins-1.23+dfsg/config.sub 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/config.sub 2014-04-13 17:12:41.000000000 +0000 @@ -1,24 +1,18 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. - -timestamp='2012-04-18' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# 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 -# the Free Software Foundation; either version 2 of the License, or +# Copyright 1992-2013 Free Software Foundation, Inc. + +timestamp='2013-08-10' + +# 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# 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 . @@ -26,11 +20,12 @@ # 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. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 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." @@ -123,7 +116,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +149,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -259,10 +252,12 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -273,7 +268,7 @@ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -291,16 +286,17 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -370,13 +366,13 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -389,7 +385,8 @@ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -407,12 +404,13 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -788,11 +786,15 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -828,7 +830,7 @@ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1019,7 +1021,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1346,21 +1352,21 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1492,9 +1498,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1543,6 +1546,9 @@ c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf ;; @@ -1586,6 +1592,9 @@ mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff -Nru geany-plugins-1.23+dfsg/configure geany-plugins-1.24+dfsg/configure --- geany-plugins-1.23+dfsg/configure 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/configure 2014-04-13 17:12:39.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for geany-plugins 1.23. +# Generated by GNU Autoconf 2.69 for geany-plugins 1.24. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -647,8 +647,8 @@ # Identity of this package. PACKAGE_NAME='geany-plugins' PACKAGE_TARNAME='geany-plugins' -PACKAGE_VERSION='1.23' -PACKAGE_STRING='geany-plugins 1.23' +PACKAGE_VERSION='1.24' +PACKAGE_STRING='geany-plugins 1.24' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -724,6 +724,10 @@ ENABLE_PRETTY_PRINTER_TRUE LIBXML_LIBS LIBXML_CFLAGS +ENABLE_POHELPER_FALSE +ENABLE_POHELPER_TRUE +ENABLE_PAIRTAGHIGHLIGHTER_FALSE +ENABLE_PAIRTAGHIGHLIGHTER_TRUE ENABLE_MULTITERM_FALSE ENABLE_MULTITERM_TRUE MULTITERM_LIBS @@ -754,6 +758,18 @@ ENABLE_GEANYVC_TRUE ENABLE_GEANYSENDMAIL_FALSE ENABLE_GEANYSENDMAIL_TRUE +ENABLE_GEANYPY_FALSE +ENABLE_GEANYPY_TRUE +PYTHON_LIBRARY +PYTHON_EXTRA_LDFLAGS +PYTHON_EXTRA_LIBS +PYTHON_SITE_PKG +PYTHON_LDFLAGS +PYTHON_CPPFLAGS +PYTHON +PYTHON_VERSION +PYGTK_LIBS +PYGTK_CFLAGS ENABLE_GEANYPRJ_FALSE ENABLE_GEANYPRJ_TRUE ENABLE_GEANYNUMBEREDBOOKMARKS_FALSE @@ -791,6 +807,10 @@ DEVHELP_CFLAGS GLIB_MKENUMS GLIB_GENMARSHAL +ENABLE_DEFINEFORMAT_FALSE +ENABLE_DEFINEFORMAT_TRUE +DEFINEFORMAT_LIBS +DEFINEFORMAT_CFLAGS ENABLE_DEBUGGER_FALSE ENABLE_DEBUGGER_TRUE VTE_LIBS @@ -801,12 +821,21 @@ COMMANDER_CFLAGS ENABLE_CODENAV_FALSE ENABLE_CODENAV_TRUE +ENABLE_AUTOCLOSE_FALSE +ENABLE_AUTOCLOSE_TRUE +AUTOCLOSE_LIBS +AUTOCLOSE_CFLAGS ENABLE_ADDONS_FALSE ENABLE_ADDONS_TRUE GP_CFLAGS HAVE_CPPCHECK_FALSE HAVE_CPPCHECK_TRUE CPPCHECK +GP_GTK3_FALSE +GP_GTK3_TRUE +GP_GTK_VERSION_MAJOR +GP_GTK_VERSION +GP_GTK_PACKAGE UNITTESTS_FALSE UNITTESTS_TRUE CHECK_LIBS @@ -996,9 +1025,11 @@ enable_cppcheck enable_extra_c_warnings enable_addons +enable_autoclose enable_codenav enable_commander enable_debugger +enable_defineformat enable_devhelp enable_geanydoc enable_geanyextrasel @@ -1012,6 +1043,7 @@ enable_geanyminiscript enable_geanynumberedbookmarks enable_geanyprj +enable_geanypy enable_geanysendmail enable_geanyvc enable_gtkspell @@ -1023,6 +1055,8 @@ enable_markdown enable_peg_markdown enable_multiterm +enable_pairtaghighlighter +enable_pohelper enable_pretty_printer enable_scope enable_shiftcolumn @@ -1049,10 +1083,14 @@ GEANY_LIBS CHECK_CFLAGS CHECK_LIBS +AUTOCLOSE_CFLAGS +AUTOCLOSE_LIBS COMMANDER_CFLAGS COMMANDER_LIBS VTE_CFLAGS VTE_LIBS +DEFINEFORMAT_CFLAGS +DEFINEFORMAT_LIBS DEVHELP_CFLAGS DEVHELP_LIBS GEANYGENDOC_CFLAGS @@ -1061,6 +1099,9 @@ LUA_LIBS GMODULE_CFLAGS GMODULE_LIBS +PYGTK_CFLAGS +PYGTK_LIBS +PYTHON_VERSION GTKSPELL_CFLAGS GTKSPELL_LIBS GENIUSPASTE_CFLAGS @@ -1619,7 +1660,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 geany-plugins 1.23 to adapt to many kinds of systems. +\`configure' configures geany-plugins 1.24 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1689,7 +1730,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of geany-plugins 1.23:";; + short | recursive ) echo "Configuration of geany-plugins 1.24:";; esac cat <<\_ACEOF @@ -1697,10 +1738,12 @@ --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] @@ -1711,9 +1754,11 @@ --disable-extra-c-warnings Disable extra C Compiler warnings --disable-addons Do not build the Addons plugin + --disable-autoclose Do not build the Autoclose plugin --disable-codenav Do not build the CodeNav plugin --disable-commander Do not build the Commander plugin --disable-debugger Do not build the Debugger plugin + --disable-defineformat Do not build the Defineformat plugin --disable-devhelp Do not build the devhelp plugin --disable-geanydoc Do not build the GeanyDoc plugin --disable-geanyextrasel Do not build the GeanyExtraSel plugin @@ -1729,6 +1774,7 @@ --disable-geanynumberedbookmarks Do not build the GeanyNumberedBookmarks plugin --disable-geanyprj Do not build the GeanyPrj plugin + --disable-geanypy Do not build the Geanypy plugin --disable-geanysendmail Do not build the GeanySendmail plugin --disable-geanyvc Do not build the GeanyVC plugin --enable-gtkspell=ARG Enable GtkSpell support in GeanyVC. [[default=auto]] @@ -1739,6 +1785,9 @@ --disable-markdown Do not build the markdown plugin --enable-peg-markdown Whether to use Peg-Markdown library [[default=auto]] --disable-multiterm Do not build the multiterm plugin + --disable-pairtaghighlighter + Do not build the PairTagHighlighter plugin + --disable-pohelper Do not build the PoHelper plugin --disable-pretty_printer Do not build the pretty-printer plugin --disable-scope Do not build the Scope plugin @@ -1783,12 +1832,20 @@ CHECK_CFLAGS C compiler flags for CHECK, overriding pkg-config CHECK_LIBS linker flags for CHECK, overriding pkg-config + AUTOCLOSE_CFLAGS + C compiler flags for AUTOCLOSE, overriding pkg-config + AUTOCLOSE_LIBS + linker flags for AUTOCLOSE, overriding pkg-config COMMANDER_CFLAGS C compiler flags for COMMANDER, overriding pkg-config COMMANDER_LIBS linker flags for COMMANDER, overriding pkg-config VTE_CFLAGS C compiler flags for VTE, overriding pkg-config VTE_LIBS linker flags for VTE, overriding pkg-config + DEFINEFORMAT_CFLAGS + C compiler flags for DEFINEFORMAT, overriding pkg-config + DEFINEFORMAT_LIBS + linker flags for DEFINEFORMAT, overriding pkg-config DEVHELP_CFLAGS C compiler flags for DEVHELP, overriding pkg-config DEVHELP_LIBS @@ -1803,6 +1860,13 @@ C compiler flags for GMODULE, overriding pkg-config GMODULE_LIBS linker flags for GMODULE, overriding pkg-config + PYGTK_CFLAGS + C compiler flags for PYGTK, overriding pkg-config + PYGTK_LIBS linker flags for PYGTK, overriding pkg-config + PYTHON_VERSION + The installed Python version to use, for example '2.3'. This + string will be appended to the Python interpreter canonical + name. GTKSPELL_CFLAGS C compiler flags for GTKSPELL, overriding pkg-config GTKSPELL_LIBS @@ -1903,7 +1967,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -geany-plugins configure 1.23 +geany-plugins configure 1.24 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2268,7 +2332,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by geany-plugins $as_me 1.23, which was +It was created by geany-plugins $as_me 1.24, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2616,7 +2680,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.11' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2742,9 +2806,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=' @@ -2755,32 +2816,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 @@ -2792,6 +2861,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. @@ -2814,12 +2893,12 @@ 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 @@ -2831,10 +2910,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. @@ -2973,12 +3052,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. @@ -3061,6 +3134,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." @@ -3083,7 +3195,7 @@ # Define the identity of the package. PACKAGE='geany-plugins' - VERSION='1.23' + VERSION='1.24' cat >>confdefs.h <<_ACEOF @@ -3111,6 +3223,12 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used @@ -3118,86 +3236,125 @@ AMTAR='$${TAR-tar}' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 -$as_echo_n "checking how to create a ustar tar archive... " >&6; } -# 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 plaintar pax cpio none' -_am_tools=${am_cv_prog_tar_ustar-$_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 - { echo "$as_me:$LINENO: $_am_tar --version" >&5 + +# 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` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 +$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } + if test $am_uid -le $am_max_uid; 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; } + _am_tools=none + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 +$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } + if test $am_gid -le $am_max_gid; 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; } + _am_tools=none + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +$as_echo_n "checking how to create a ustar tar archive... " >&6; } + + # 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_ustar-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 ($_am_tar --version) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && break - done - am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=ustar -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 ustar -w "$$tardir"' - am__tar_='pax -L -x ustar -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H ustar -L' - am__tar_='find "$tardir" -print | cpio -o -H ustar -L' - am__untar='cpio -i -H ustar -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_ustar}" && break + done + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=ustar -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 ustar -w "$$tardir"' + am__tar_='pax -L -x ustar -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' + am__untar='cpio -i -H ustar -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_ustar}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - rm -rf conftest.dir - if test -s conftest.tar; then - { echo "$as_me:$LINENO: $am__untar &5 + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 ($am__untar &5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break - fi -done -rm -rf conftest.dir + { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 + (cat conftest.dir/file) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done + rm -rf conftest.dir -if ${am_cv_prog_tar_ustar+:} false; then : + if ${am_cv_prog_tar_ustar+:} false; then : $as_echo_n "(cached) " >&6 else am_cv_prog_tar_ustar=$_am_tool fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 $as_echo "$am_cv_prog_tar_ustar" >&6; } @@ -3205,15 +3362,57 @@ +# 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 + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + # 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=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 @@ -4038,6 +4237,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" @@ -4057,7 +4315,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 @@ -4113,8 +4371,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 @@ -4149,16 +4407,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 @@ -4167,8 +4425,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 @@ -4176,7 +4434,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} @@ -5146,7 +5404,8 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + 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 @@ -5547,10 +5806,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -5589,7 +5844,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -6671,7 +6926,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6687,9 +6942,19 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6708,7 +6973,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -8486,7 +8754,7 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -10656,17 +10924,6 @@ esac ;; -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' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -10783,7 +11040,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +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 @@ -13269,9 +13526,15 @@ fi + + + + + export PKG_CONFIG_PATH="$geany_libdir/pkgconfig:$PKG_CONFIG_PATH" + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GEANY" >&5 $as_echo_n "checking for GEANY... " >&6; } @@ -13280,12 +13543,12 @@ pkg_cv_GEANY_CFLAGS="$GEANY_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"geany >= 1.23\""; } >&5 - ($PKG_CONFIG --exists --print-errors "geany >= 1.23") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"geany >= 1.24\""; } >&5 + ($PKG_CONFIG --exists --print-errors "geany >= 1.24") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GEANY_CFLAGS=`$PKG_CONFIG --cflags "geany >= 1.23" 2>/dev/null` + pkg_cv_GEANY_CFLAGS=`$PKG_CONFIG --cflags "geany >= 1.24" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13297,12 +13560,12 @@ pkg_cv_GEANY_LIBS="$GEANY_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"geany >= 1.23\""; } >&5 - ($PKG_CONFIG --exists --print-errors "geany >= 1.23") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"geany >= 1.24\""; } >&5 + ($PKG_CONFIG --exists --print-errors "geany >= 1.24") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GEANY_LIBS=`$PKG_CONFIG --libs "geany >= 1.23" 2>/dev/null` + pkg_cv_GEANY_LIBS=`$PKG_CONFIG --libs "geany >= 1.24" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13323,14 +13586,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GEANY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "geany >= 1.23" 2>&1` + GEANY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "geany >= 1.24" 2>&1` else - GEANY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "geany >= 1.23" 2>&1` + GEANY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "geany >= 1.24" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GEANY_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (geany >= 1.23) were not met: + as_fn_error $? "Package requirements (geany >= 1.24) were not met: $GEANY_PKG_ERRORS @@ -13367,10 +13630,13 @@ + + export PKG_CONFIG_PATH="${PKG_CONFIG_PATH#*:}" test -z "${PKG_CONFIG_PATH}" && unset PKG_CONFIG_PATH + gp_have_unittests=no pkg_failed=no @@ -13471,6 +13737,38 @@ + + + + + + export PKG_CONFIG_PATH="$geany_libdir/pkgconfig:$PKG_CONFIG_PATH" + + + _gtk_req=$(${PKG_CONFIG} --print-requires geany | ${AWK} '/^gtk\+-/{print}') + GP_GTK_PACKAGE=$(echo ${_gtk_req} | ${AWK} '{print $1}') + GP_GTK_VERSION=$(echo ${_gtk_req} | ${AWK} '{print $3}') + GP_GTK_VERSION_MAJOR=$(echo ${GP_GTK_VERSION} | cut -d. -f1) + + + + + if test "x$GP_GTK_VERSION_MAJOR" = x3; then + GP_GTK3_TRUE= + GP_GTK3_FALSE='#' +else + GP_GTK3_TRUE='#' + GP_GTK3_FALSE= +fi + + + + + export PKG_CONFIG_PATH="${PKG_CONFIG_PATH#*:}" + test -z "${PKG_CONFIG_PATH}" && unset PKG_CONFIG_PATH + + + # Check whether --enable-cppcheck was given. if test "${enable_cppcheck+set}" = set; then : enableval=$enable_cppcheck; enable_cppcheck="$enableval" @@ -13616,7 +13914,31 @@ if test "${enable_addons+set}" = set; then : enableval=$enable_addons; enable_addons=$enableval else - enable_addons=yes + enable_addons=auto +fi + + + + + + + if test "$enable_addons" = no; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin Addons" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin Addons... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = 2; 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; } + if test "$enable_addons" = yes; then : + as_fn_error $? "Addons is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_addons" = auto; then : + enable_addons=no +fi +fi fi @@ -13642,65 +13964,59 @@ - # Check whether --enable-codenav was given. -if test "${enable_codenav+set}" = set; then : - enableval=$enable_codenav; enable_codenav=$enableval + # Check whether --enable-autoclose was given. +if test "${enable_autoclose+set}" = set; then : + enableval=$enable_autoclose; enable_autoclose=$enableval else - enable_codenav=yes + enable_autoclose=auto fi - if test "$enable_codenav" = "auto"; then - enable_codenav=yes - fi - if test "$enable_codenav" = yes; then - ENABLE_CODENAV_TRUE= - ENABLE_CODENAV_FALSE='#' -else - ENABLE_CODENAV_TRUE='#' - ENABLE_CODENAV_FALSE= -fi - - - plugins_statusmsg+="CodeNav:$enable_codenav -" - ac_config_files="$ac_config_files codenav/Makefile codenav/src/Makefile" + gtk_dep=0 + if test $gtk_dep -ne 0; then + if test "$enable_autoclose" = no; then : - # Check whether --enable-commander was given. -if test "${enable_commander+set}" = set; then : - enableval=$enable_commander; enable_commander=$enableval else - enable_commander=auto + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin Autoclose" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin Autoclose... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = $gtk_dep; 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; } + if test "$enable_autoclose" = yes; then : + as_fn_error $? "Autoclose is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_autoclose" = auto; then : + enable_autoclose=no +fi +fi fi + fi - - - if test "$enable_commander" = "yes"; then + if test "$enable_autoclose" = "yes"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for COMMANDER" >&5 -$as_echo_n "checking for COMMANDER... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AUTOCLOSE" >&5 +$as_echo_n "checking for AUTOCLOSE... " >&6; } -if test -n "$COMMANDER_CFLAGS"; then - pkg_cv_COMMANDER_CFLAGS="$COMMANDER_CFLAGS" +if test -n "$AUTOCLOSE_CFLAGS"; then + pkg_cv_AUTOCLOSE_CFLAGS="$AUTOCLOSE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.16 - glib-2.0 >= 2.4\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.16 - glib-2.0 >= 2.4") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= 2.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= 2.8") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_COMMANDER_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.16 - glib-2.0 >= 2.4" 2>/dev/null` + pkg_cv_AUTOCLOSE_CFLAGS=`$PKG_CONFIG --cflags "$GP_GTK_PACKAGE >= 2.8" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13708,19 +14024,16 @@ else pkg_failed=untried fi -if test -n "$COMMANDER_LIBS"; then - pkg_cv_COMMANDER_LIBS="$COMMANDER_LIBS" +if test -n "$AUTOCLOSE_LIBS"; then + pkg_cv_AUTOCLOSE_LIBS="$AUTOCLOSE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.16 - glib-2.0 >= 2.4\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.16 - glib-2.0 >= 2.4") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= 2.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= 2.8") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_COMMANDER_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.16 - glib-2.0 >= 2.4" 2>/dev/null` + pkg_cv_AUTOCLOSE_LIBS=`$PKG_CONFIG --libs "$GP_GTK_PACKAGE >= 2.8" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13741,25 +14054,22 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - COMMANDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.16 - glib-2.0 >= 2.4" 2>&1` + AUTOCLOSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GP_GTK_PACKAGE >= 2.8" 2>&1` else - COMMANDER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.16 - glib-2.0 >= 2.4" 2>&1` + AUTOCLOSE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GP_GTK_PACKAGE >= 2.8" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$COMMANDER_PKG_ERRORS" >&5 + echo "$AUTOCLOSE_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gtk+-2.0 >= 2.16 - glib-2.0 >= 2.4) were not met: + as_fn_error $? "Package requirements ($GP_GTK_PACKAGE >= 2.8) were not met: -$COMMANDER_PKG_ERRORS +$AUTOCLOSE_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables COMMANDER_CFLAGS -and COMMANDER_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables AUTOCLOSE_CFLAGS +and AUTOCLOSE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -13770,38 +14080,35 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables COMMANDER_CFLAGS -and COMMANDER_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables AUTOCLOSE_CFLAGS +and AUTOCLOSE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - COMMANDER_CFLAGS=$pkg_cv_COMMANDER_CFLAGS - COMMANDER_LIBS=$pkg_cv_COMMANDER_LIBS + AUTOCLOSE_CFLAGS=$pkg_cv_AUTOCLOSE_CFLAGS + AUTOCLOSE_LIBS=$pkg_cv_AUTOCLOSE_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi - elif test "$enable_commander" = "auto"; then + elif test "$enable_autoclose" = "auto"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for COMMANDER" >&5 -$as_echo_n "checking for COMMANDER... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AUTOCLOSE" >&5 +$as_echo_n "checking for AUTOCLOSE... " >&6; } -if test -n "$COMMANDER_CFLAGS"; then - pkg_cv_COMMANDER_CFLAGS="$COMMANDER_CFLAGS" +if test -n "$AUTOCLOSE_CFLAGS"; then + pkg_cv_AUTOCLOSE_CFLAGS="$AUTOCLOSE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.16 - glib-2.0 >= 2.4\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.16 - glib-2.0 >= 2.4") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= 2.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= 2.8") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_COMMANDER_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.16 - glib-2.0 >= 2.4" 2>/dev/null` + pkg_cv_AUTOCLOSE_CFLAGS=`$PKG_CONFIG --cflags "$GP_GTK_PACKAGE >= 2.8" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13809,19 +14116,16 @@ else pkg_failed=untried fi -if test -n "$COMMANDER_LIBS"; then - pkg_cv_COMMANDER_LIBS="$COMMANDER_LIBS" +if test -n "$AUTOCLOSE_LIBS"; then + pkg_cv_AUTOCLOSE_LIBS="$AUTOCLOSE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.16 - glib-2.0 >= 2.4\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.16 - glib-2.0 >= 2.4") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= 2.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= 2.8") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_COMMANDER_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.16 - glib-2.0 >= 2.4" 2>/dev/null` + pkg_cv_AUTOCLOSE_LIBS=`$PKG_CONFIG --libs "$GP_GTK_PACKAGE >= 2.8" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13842,78 +14146,136 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - COMMANDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.16 - glib-2.0 >= 2.4" 2>&1` + AUTOCLOSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GP_GTK_PACKAGE >= 2.8" 2>&1` else - COMMANDER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.16 - glib-2.0 >= 2.4" 2>&1` + AUTOCLOSE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GP_GTK_PACKAGE >= 2.8" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$COMMANDER_PKG_ERRORS" >&5 + echo "$AUTOCLOSE_PKG_ERRORS" >&5 - enable_commander=no + enable_autoclose=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - enable_commander=no + enable_autoclose=no else - COMMANDER_CFLAGS=$pkg_cv_COMMANDER_CFLAGS - COMMANDER_LIBS=$pkg_cv_COMMANDER_LIBS + AUTOCLOSE_CFLAGS=$pkg_cv_AUTOCLOSE_CFLAGS + AUTOCLOSE_LIBS=$pkg_cv_AUTOCLOSE_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - enable_commander=yes + fi fi - - if test "$enable_commander" = "auto"; then - enable_commander=yes + if test "$enable_autoclose" = "auto"; then + enable_autoclose=yes fi - if test "$enable_commander" = yes; then - ENABLE_COMMANDER_TRUE= - ENABLE_COMMANDER_FALSE='#' + if test "$enable_autoclose" = yes; then + ENABLE_AUTOCLOSE_TRUE= + ENABLE_AUTOCLOSE_FALSE='#' else - ENABLE_COMMANDER_TRUE='#' - ENABLE_COMMANDER_FALSE= + ENABLE_AUTOCLOSE_TRUE='#' + ENABLE_AUTOCLOSE_FALSE= fi - plugins_statusmsg+="Commander:$enable_commander + plugins_statusmsg+="Autoclose:$enable_autoclose " + ac_config_files="$ac_config_files autoclose/Makefile autoclose/src/Makefile" + + - ac_config_files="$ac_config_files commander/Makefile commander/src/Makefile" + # Check whether --enable-codenav was given. +if test "${enable_codenav+set}" = set; then : + enableval=$enable_codenav; enable_codenav=$enableval +else + enable_codenav=yes +fi - # Check whether --enable-debugger was given. -if test "${enable_debugger+set}" = set; then : - enableval=$enable_debugger; enable_debugger=$enableval + if test "$enable_codenav" = "auto"; then + enable_codenav=yes + fi + if test "$enable_codenav" = yes; then + ENABLE_CODENAV_TRUE= + ENABLE_CODENAV_FALSE='#' else - enable_debugger=auto + ENABLE_CODENAV_TRUE='#' + ENABLE_CODENAV_FALSE= fi + plugins_statusmsg+="CodeNav:$enable_codenav +" + + + ac_config_files="$ac_config_files codenav/Makefile codenav/src/Makefile" - if test "$enable_debugger" = "yes"; then + + + + # Check whether --enable-commander was given. +if test "${enable_commander+set}" = set; then : + enableval=$enable_commander; enable_commander=$enableval +else + enable_commander=auto +fi + + + + + + + gtk_dep=0 + if test $gtk_dep -ne 0; then + + + + if test "$enable_commander" = no; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin Commander" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin Commander... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = $gtk_dep; 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; } + if test "$enable_commander" = yes; then : + as_fn_error $? "Commander is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_commander" = auto; then : + enable_commander=no +fi +fi +fi + + fi + + if test "$enable_commander" = "yes"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VTE" >&5 -$as_echo_n "checking for VTE... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for COMMANDER" >&5 +$as_echo_n "checking for COMMANDER... " >&6; } -if test -n "$VTE_CFLAGS"; then - pkg_cv_VTE_CFLAGS="$VTE_CFLAGS" +if test -n "$COMMANDER_CFLAGS"; then + pkg_cv_COMMANDER_CFLAGS="$COMMANDER_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vte >= 0.24\""; } >&5 - ($PKG_CONFIG --exists --print-errors "vte >= 0.24") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= 2.16 + glib-2.0 >= 2.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= 2.16 + glib-2.0 >= 2.4") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_VTE_CFLAGS=`$PKG_CONFIG --cflags "vte >= 0.24" 2>/dev/null` + pkg_cv_COMMANDER_CFLAGS=`$PKG_CONFIG --cflags "$GP_GTK_PACKAGE >= 2.16 + glib-2.0 >= 2.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13921,16 +14283,19 @@ else pkg_failed=untried fi -if test -n "$VTE_LIBS"; then - pkg_cv_VTE_LIBS="$VTE_LIBS" +if test -n "$COMMANDER_LIBS"; then + pkg_cv_COMMANDER_LIBS="$COMMANDER_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vte >= 0.24\""; } >&5 - ($PKG_CONFIG --exists --print-errors "vte >= 0.24") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= 2.16 + glib-2.0 >= 2.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= 2.16 + glib-2.0 >= 2.4") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_VTE_LIBS=`$PKG_CONFIG --libs "vte >= 0.24" 2>/dev/null` + pkg_cv_COMMANDER_LIBS=`$PKG_CONFIG --libs "$GP_GTK_PACKAGE >= 2.16 + glib-2.0 >= 2.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13951,22 +14316,25 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - VTE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "vte >= 0.24" 2>&1` + COMMANDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GP_GTK_PACKAGE >= 2.16 + glib-2.0 >= 2.4" 2>&1` else - VTE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vte >= 0.24" 2>&1` + COMMANDER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GP_GTK_PACKAGE >= 2.16 + glib-2.0 >= 2.4" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$VTE_PKG_ERRORS" >&5 + echo "$COMMANDER_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (vte >= 0.24) were not met: + as_fn_error $? "Package requirements ($GP_GTK_PACKAGE >= 2.16 + glib-2.0 >= 2.4) were not met: -$VTE_PKG_ERRORS +$COMMANDER_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables VTE_CFLAGS -and VTE_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables COMMANDER_CFLAGS +and COMMANDER_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -13977,35 +14345,38 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables VTE_CFLAGS -and VTE_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables COMMANDER_CFLAGS +and COMMANDER_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - VTE_CFLAGS=$pkg_cv_VTE_CFLAGS - VTE_LIBS=$pkg_cv_VTE_LIBS + COMMANDER_CFLAGS=$pkg_cv_COMMANDER_CFLAGS + COMMANDER_LIBS=$pkg_cv_COMMANDER_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi - elif test "$enable_debugger" = "auto"; then + elif test "$enable_commander" = "auto"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VTE" >&5 -$as_echo_n "checking for VTE... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for COMMANDER" >&5 +$as_echo_n "checking for COMMANDER... " >&6; } -if test -n "$VTE_CFLAGS"; then - pkg_cv_VTE_CFLAGS="$VTE_CFLAGS" +if test -n "$COMMANDER_CFLAGS"; then + pkg_cv_COMMANDER_CFLAGS="$COMMANDER_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vte >= 0.24\""; } >&5 - ($PKG_CONFIG --exists --print-errors "vte >= 0.24") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= 2.16 + glib-2.0 >= 2.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= 2.16 + glib-2.0 >= 2.4") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_VTE_CFLAGS=`$PKG_CONFIG --cflags "vte >= 0.24" 2>/dev/null` + pkg_cv_COMMANDER_CFLAGS=`$PKG_CONFIG --cflags "$GP_GTK_PACKAGE >= 2.16 + glib-2.0 >= 2.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -14013,16 +14384,19 @@ else pkg_failed=untried fi -if test -n "$VTE_LIBS"; then - pkg_cv_VTE_LIBS="$VTE_LIBS" +if test -n "$COMMANDER_LIBS"; then + pkg_cv_COMMANDER_LIBS="$COMMANDER_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vte >= 0.24\""; } >&5 - ($PKG_CONFIG --exists --print-errors "vte >= 0.24") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= 2.16 + glib-2.0 >= 2.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= 2.16 + glib-2.0 >= 2.4") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_VTE_LIBS=`$PKG_CONFIG --libs "vte >= 0.24" 2>/dev/null` + pkg_cv_COMMANDER_LIBS=`$PKG_CONFIG --libs "$GP_GTK_PACKAGE >= 2.16 + glib-2.0 >= 2.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -14043,176 +14417,130 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - VTE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "vte >= 0.24" 2>&1` + COMMANDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GP_GTK_PACKAGE >= 2.16 + glib-2.0 >= 2.4" 2>&1` else - VTE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vte >= 0.24" 2>&1` + COMMANDER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GP_GTK_PACKAGE >= 2.16 + glib-2.0 >= 2.4" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$VTE_PKG_ERRORS" >&5 + echo "$COMMANDER_PKG_ERRORS" >&5 - enable_debugger=no + enable_commander=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - enable_debugger=no + enable_commander=no else - VTE_CFLAGS=$pkg_cv_VTE_CFLAGS - VTE_LIBS=$pkg_cv_VTE_LIBS + COMMANDER_CFLAGS=$pkg_cv_COMMANDER_CFLAGS + COMMANDER_LIBS=$pkg_cv_COMMANDER_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - enable_debugger=yes + fi fi - if test "$enable_debugger" = "auto"; then - enable_debugger=yes + + if test "$enable_commander" = "auto"; then + enable_commander=yes fi - if test "$enable_debugger" = yes; then - ENABLE_DEBUGGER_TRUE= - ENABLE_DEBUGGER_FALSE='#' + if test "$enable_commander" = yes; then + ENABLE_COMMANDER_TRUE= + ENABLE_COMMANDER_FALSE='#' else - ENABLE_DEBUGGER_TRUE='#' - ENABLE_DEBUGGER_FALSE= + ENABLE_COMMANDER_TRUE='#' + ENABLE_COMMANDER_FALSE= fi - plugins_statusmsg+="Debugger:$enable_debugger + plugins_statusmsg+="Commander:$enable_commander " - ac_config_files="$ac_config_files debugger/Makefile debugger/src/Makefile debugger/img/Makefile" + ac_config_files="$ac_config_files commander/Makefile commander/src/Makefile" - # Check whether --enable-devhelp was given. -if test "${enable_devhelp+set}" = set; then : - enableval=$enable_devhelp; enable_devhelp=$enableval + + # Check whether --enable-debugger was given. +if test "${enable_debugger+set}" = set; then : + enableval=$enable_debugger; enable_debugger=$enableval else - enable_devhelp=auto + enable_debugger=auto fi - GTK_VERSION=2.16 - WEBKIT_VERSION=1.1.13 - GCONF_VERSION=2.6.0 - LIBWNCK_VERSION=2.10.0 - # Extract the first word of "glib-genmarshal", so it can be a program name with args. -set dummy glib-genmarshal; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GLIB_GENMARSHAL+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GLIB_GENMARSHAL in - [\\/]* | ?:[\\/]*) - ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - ;; -esac -fi -GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL -if test -n "$GLIB_GENMARSHAL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5 -$as_echo "$GLIB_GENMARSHAL" >&6; } + + if test "$enable_debugger" = no; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin Debugger" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin Debugger... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = 2; 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; } + if test "$enable_debugger" = yes; then : + as_fn_error $? "Debugger is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_debugger" = auto; then : + enable_debugger=no +fi +fi fi - # Extract the first word of "glib-mkenums", so it can be a program name with args. -set dummy glib-mkenums; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GLIB_MKENUMS+:} false; then : - $as_echo_n "(cached) " >&6 + + + + gtk_dep=0 + if test $gtk_dep -ne 0; then + + + + if test "$enable_debugger" = no; then : + else - case $GLIB_MKENUMS in - [\\/]* | ?:[\\/]*) - ac_cv_path_GLIB_MKENUMS="$GLIB_MKENUMS" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GLIB_MKENUMS="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS -if test -n "$GLIB_MKENUMS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_MKENUMS" >&5 -$as_echo "$GLIB_MKENUMS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin debugger" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin debugger... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = $gtk_dep; 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; } + if test "$enable_debugger" = yes; then : + as_fn_error $? "debugger is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_debugger" = auto; then : + enable_debugger=no +fi +fi fi + fi - - - if test "$enable_devhelp" = "yes"; then + if test "$enable_debugger" = "yes"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEVHELP" >&5 -$as_echo_n "checking for DEVHELP... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VTE" >&5 +$as_echo_n "checking for VTE... " >&6; } -if test -n "$DEVHELP_CFLAGS"; then - pkg_cv_DEVHELP_CFLAGS="$DEVHELP_CFLAGS" +if test -n "$VTE_CFLAGS"; then + pkg_cv_VTE_CFLAGS="$VTE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_VERSION} - webkit-1.0 >= \${WEBKIT_VERSION} - libwnck-1.0 >= \${LIBWNCK_VERSION} - gconf-2.0 >= \${GCONF_VERSION} - gthread-2.0 - zlib\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} - libwnck-1.0 >= ${LIBWNCK_VERSION} - gconf-2.0 >= ${GCONF_VERSION} - gthread-2.0 - zlib") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vte >= 0.24\""; } >&5 + ($PKG_CONFIG --exists --print-errors "vte >= 0.24") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_DEVHELP_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} - libwnck-1.0 >= ${LIBWNCK_VERSION} - gconf-2.0 >= ${GCONF_VERSION} - gthread-2.0 - zlib" 2>/dev/null` + pkg_cv_VTE_CFLAGS=`$PKG_CONFIG --cflags "vte >= 0.24" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -14220,31 +14548,16 @@ else pkg_failed=untried fi -if test -n "$DEVHELP_LIBS"; then - pkg_cv_DEVHELP_LIBS="$DEVHELP_LIBS" +if test -n "$VTE_LIBS"; then + pkg_cv_VTE_LIBS="$VTE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_VERSION} - webkit-1.0 >= \${WEBKIT_VERSION} - libwnck-1.0 >= \${LIBWNCK_VERSION} - gconf-2.0 >= \${GCONF_VERSION} - gthread-2.0 - zlib\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} - libwnck-1.0 >= ${LIBWNCK_VERSION} - gconf-2.0 >= ${GCONF_VERSION} - gthread-2.0 - zlib") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vte >= 0.24\""; } >&5 + ($PKG_CONFIG --exists --print-errors "vte >= 0.24") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_DEVHELP_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} - libwnck-1.0 >= ${LIBWNCK_VERSION} - gconf-2.0 >= ${GCONF_VERSION} - gthread-2.0 - zlib" 2>/dev/null` + pkg_cv_VTE_LIBS=`$PKG_CONFIG --libs "vte >= 0.24" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -14265,37 +14578,22 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} - libwnck-1.0 >= ${LIBWNCK_VERSION} - gconf-2.0 >= ${GCONF_VERSION} - gthread-2.0 - zlib" 2>&1` + VTE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "vte >= 0.24" 2>&1` else - DEVHELP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} - libwnck-1.0 >= ${LIBWNCK_VERSION} - gconf-2.0 >= ${GCONF_VERSION} - gthread-2.0 - zlib" 2>&1` + VTE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vte >= 0.24" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$DEVHELP_PKG_ERRORS" >&5 + echo "$VTE_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} - libwnck-1.0 >= ${LIBWNCK_VERSION} - gconf-2.0 >= ${GCONF_VERSION} - gthread-2.0 - zlib) were not met: + as_fn_error $? "Package requirements (vte >= 0.24) were not met: -$DEVHELP_PKG_ERRORS +$VTE_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables DEVHELP_CFLAGS -and DEVHELP_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables VTE_CFLAGS +and VTE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -14306,50 +14604,35 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables DEVHELP_CFLAGS -and DEVHELP_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables VTE_CFLAGS +and VTE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - DEVHELP_CFLAGS=$pkg_cv_DEVHELP_CFLAGS - DEVHELP_LIBS=$pkg_cv_DEVHELP_LIBS + VTE_CFLAGS=$pkg_cv_VTE_CFLAGS + VTE_LIBS=$pkg_cv_VTE_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi - elif test "$enable_devhelp" = "auto"; then + elif test "$enable_debugger" = "auto"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEVHELP" >&5 -$as_echo_n "checking for DEVHELP... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VTE" >&5 +$as_echo_n "checking for VTE... " >&6; } -if test -n "$DEVHELP_CFLAGS"; then - pkg_cv_DEVHELP_CFLAGS="$DEVHELP_CFLAGS" +if test -n "$VTE_CFLAGS"; then + pkg_cv_VTE_CFLAGS="$VTE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_VERSION} - webkit-1.0 >= \${WEBKIT_VERSION} - libwnck-1.0 >= \${LIBWNCK_VERSION} - gconf-2.0 >= \${GCONF_VERSION} - gthread-2.0 - zlib\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} - libwnck-1.0 >= ${LIBWNCK_VERSION} - gconf-2.0 >= ${GCONF_VERSION} - gthread-2.0 - zlib") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vte >= 0.24\""; } >&5 + ($PKG_CONFIG --exists --print-errors "vte >= 0.24") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_DEVHELP_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} - libwnck-1.0 >= ${LIBWNCK_VERSION} - gconf-2.0 >= ${GCONF_VERSION} - gthread-2.0 - zlib" 2>/dev/null` + pkg_cv_VTE_CFLAGS=`$PKG_CONFIG --cflags "vte >= 0.24" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -14357,31 +14640,16 @@ else pkg_failed=untried fi -if test -n "$DEVHELP_LIBS"; then - pkg_cv_DEVHELP_LIBS="$DEVHELP_LIBS" +if test -n "$VTE_LIBS"; then + pkg_cv_VTE_LIBS="$VTE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_VERSION} - webkit-1.0 >= \${WEBKIT_VERSION} - libwnck-1.0 >= \${LIBWNCK_VERSION} - gconf-2.0 >= \${GCONF_VERSION} - gthread-2.0 - zlib\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} - libwnck-1.0 >= ${LIBWNCK_VERSION} - gconf-2.0 >= ${GCONF_VERSION} - gthread-2.0 - zlib") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vte >= 0.24\""; } >&5 + ($PKG_CONFIG --exists --print-errors "vte >= 0.24") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_DEVHELP_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} - libwnck-1.0 >= ${LIBWNCK_VERSION} - gconf-2.0 >= ${GCONF_VERSION} - gthread-2.0 - zlib" 2>/dev/null` + pkg_cv_VTE_LIBS=`$PKG_CONFIG --libs "vte >= 0.24" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -14402,161 +14670,102 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} - libwnck-1.0 >= ${LIBWNCK_VERSION} - gconf-2.0 >= ${GCONF_VERSION} - gthread-2.0 - zlib" 2>&1` + VTE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "vte >= 0.24" 2>&1` else - DEVHELP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} - libwnck-1.0 >= ${LIBWNCK_VERSION} - gconf-2.0 >= ${GCONF_VERSION} - gthread-2.0 - zlib" 2>&1` + VTE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vte >= 0.24" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$DEVHELP_PKG_ERRORS" >&5 + echo "$VTE_PKG_ERRORS" >&5 - enable_devhelp=no + enable_debugger=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - enable_devhelp=no + enable_debugger=no else - DEVHELP_CFLAGS=$pkg_cv_DEVHELP_CFLAGS - DEVHELP_LIBS=$pkg_cv_DEVHELP_LIBS + VTE_CFLAGS=$pkg_cv_VTE_CFLAGS + VTE_LIBS=$pkg_cv_VTE_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - enable_devhelp=yes + fi fi - - if test "$enable_devhelp" = "auto"; then - enable_devhelp=yes + if test "$enable_debugger" = "auto"; then + enable_debugger=yes fi - if test "$enable_devhelp" = yes; then - ENABLE_DEVHELP_TRUE= - ENABLE_DEVHELP_FALSE='#' + if test "$enable_debugger" = yes; then + ENABLE_DEBUGGER_TRUE= + ENABLE_DEBUGGER_FALSE='#' else - ENABLE_DEVHELP_TRUE='#' - ENABLE_DEVHELP_FALSE= + ENABLE_DEBUGGER_TRUE='#' + ENABLE_DEBUGGER_FALSE= fi - plugins_statusmsg+="DevHelp:$enable_devhelp + plugins_statusmsg+="Debugger:$enable_debugger " - - ac_config_files="$ac_config_files devhelp/Makefile devhelp/devhelp/Makefile devhelp/src/Makefile devhelp/data/Makefile" + ac_config_files="$ac_config_files debugger/Makefile debugger/src/Makefile debugger/img/Makefile" - # Check whether --enable-geanydoc was given. -if test "${enable_geanydoc+set}" = set; then : - enableval=$enable_geanydoc; enable_geanydoc=$enableval + # Check whether --enable-defineformat was given. +if test "${enable_defineformat+set}" = set; then : + enableval=$enable_defineformat; enable_defineformat=$enableval else - enable_geanydoc=yes + enable_defineformat=auto fi - if test "$enable_geanydoc" = "auto"; then - enable_geanydoc=yes - fi - if test "$enable_geanydoc" = yes; then - ENABLE_GEANYDOC_TRUE= - ENABLE_GEANYDOC_FALSE='#' -else - ENABLE_GEANYDOC_TRUE='#' - ENABLE_GEANYDOC_FALSE= -fi - - - plugins_statusmsg+="GeanyDoc:$enable_geanydoc -" - ac_config_files="$ac_config_files geanydoc/Makefile geanydoc/src/Makefile geanydoc/tests/Makefile" + gtk_dep=0 + if test $gtk_dep -ne 0; then + if test "$enable_defineformat" = no; then : - # Check whether --enable-geanyextrasel was given. -if test "${enable_geanyextrasel+set}" = set; then : - enableval=$enable_geanyextrasel; enable_geanyextrasel=$enableval else - enable_geanyextrasel=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin Defineformat" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin Defineformat... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = $gtk_dep; 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; } + if test "$enable_defineformat" = yes; then : + as_fn_error $? "Defineformat is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_defineformat" = auto; then : + enable_defineformat=no +fi +fi fi + fi - - if test "$enable_geanyextrasel" = "auto"; then - enable_geanyextrasel=yes - fi - if test "$enable_geanyextrasel" = yes; then - ENABLE_GEANYEXTRASEL_TRUE= - ENABLE_GEANYEXTRASEL_FALSE='#' -else - ENABLE_GEANYEXTRASEL_TRUE='#' - ENABLE_GEANYEXTRASEL_FALSE= -fi - - - plugins_statusmsg+="GeanyExtraSel:$enable_geanyextrasel -" - - - ac_config_files="$ac_config_files geanyextrasel/Makefile geanyextrasel/src/Makefile" - - - - - # Check whether --enable-geanygendoc was given. -if test "${enable_geanygendoc+set}" = set; then : - enableval=$enable_geanygendoc; enable_geanygendoc=$enableval -else - enable_geanygendoc=auto -fi - - - - GTK_VERSION=2.12 - GLIB_VERSION=2.14 - GIO_VERSION=2.18 - CTPL_VERSION=0.3 - - - if test "$enable_geanygendoc" = "yes"; then + if test "$enable_defineformat" = "yes"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GEANYGENDOC" >&5 -$as_echo_n "checking for GEANYGENDOC... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEFINEFORMAT" >&5 +$as_echo_n "checking for DEFINEFORMAT... " >&6; } -if test -n "$GEANYGENDOC_CFLAGS"; then - pkg_cv_GEANYGENDOC_CFLAGS="$GEANYGENDOC_CFLAGS" +if test -n "$DEFINEFORMAT_CFLAGS"; then + pkg_cv_DEFINEFORMAT_CFLAGS="$DEFINEFORMAT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_VERSION} - glib-2.0 >= \${GLIB_VERSION} - gio-2.0 >= \${GIO_VERSION} - ctpl >= \${CTPL_VERSION}\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_VERSION} - glib-2.0 >= ${GLIB_VERSION} - gio-2.0 >= ${GIO_VERSION} - ctpl >= ${CTPL_VERSION}") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= 2.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= 2.8") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GEANYGENDOC_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= ${GTK_VERSION} - glib-2.0 >= ${GLIB_VERSION} - gio-2.0 >= ${GIO_VERSION} - ctpl >= ${CTPL_VERSION}" 2>/dev/null` + pkg_cv_DEFINEFORMAT_CFLAGS=`$PKG_CONFIG --cflags "$GP_GTK_PACKAGE >= 2.8" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -14564,25 +14773,16 @@ else pkg_failed=untried fi -if test -n "$GEANYGENDOC_LIBS"; then - pkg_cv_GEANYGENDOC_LIBS="$GEANYGENDOC_LIBS" +if test -n "$DEFINEFORMAT_LIBS"; then + pkg_cv_DEFINEFORMAT_LIBS="$DEFINEFORMAT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_VERSION} - glib-2.0 >= \${GLIB_VERSION} - gio-2.0 >= \${GIO_VERSION} - ctpl >= \${CTPL_VERSION}\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_VERSION} - glib-2.0 >= ${GLIB_VERSION} - gio-2.0 >= ${GIO_VERSION} - ctpl >= ${CTPL_VERSION}") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= 2.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= 2.8") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GEANYGENDOC_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= ${GTK_VERSION} - glib-2.0 >= ${GLIB_VERSION} - gio-2.0 >= ${GIO_VERSION} - ctpl >= ${CTPL_VERSION}" 2>/dev/null` + pkg_cv_DEFINEFORMAT_LIBS=`$PKG_CONFIG --libs "$GP_GTK_PACKAGE >= 2.8" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -14603,31 +14803,22 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GEANYGENDOC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= ${GTK_VERSION} - glib-2.0 >= ${GLIB_VERSION} - gio-2.0 >= ${GIO_VERSION} - ctpl >= ${CTPL_VERSION}" 2>&1` + DEFINEFORMAT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GP_GTK_PACKAGE >= 2.8" 2>&1` else - GEANYGENDOC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= ${GTK_VERSION} - glib-2.0 >= ${GLIB_VERSION} - gio-2.0 >= ${GIO_VERSION} - ctpl >= ${CTPL_VERSION}" 2>&1` + DEFINEFORMAT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GP_GTK_PACKAGE >= 2.8" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$GEANYGENDOC_PKG_ERRORS" >&5 + echo "$DEFINEFORMAT_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gtk+-2.0 >= ${GTK_VERSION} - glib-2.0 >= ${GLIB_VERSION} - gio-2.0 >= ${GIO_VERSION} - ctpl >= ${CTPL_VERSION}) were not met: + as_fn_error $? "Package requirements ($GP_GTK_PACKAGE >= 2.8) were not met: -$GEANYGENDOC_PKG_ERRORS +$DEFINEFORMAT_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables GEANYGENDOC_CFLAGS -and GEANYGENDOC_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables DEFINEFORMAT_CFLAGS +and DEFINEFORMAT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -14638,44 +14829,35 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables GEANYGENDOC_CFLAGS -and GEANYGENDOC_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables DEFINEFORMAT_CFLAGS +and DEFINEFORMAT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - GEANYGENDOC_CFLAGS=$pkg_cv_GEANYGENDOC_CFLAGS - GEANYGENDOC_LIBS=$pkg_cv_GEANYGENDOC_LIBS + DEFINEFORMAT_CFLAGS=$pkg_cv_DEFINEFORMAT_CFLAGS + DEFINEFORMAT_LIBS=$pkg_cv_DEFINEFORMAT_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi - elif test "$enable_geanygendoc" = "auto"; then + elif test "$enable_defineformat" = "auto"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GEANYGENDOC" >&5 -$as_echo_n "checking for GEANYGENDOC... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEFINEFORMAT" >&5 +$as_echo_n "checking for DEFINEFORMAT... " >&6; } -if test -n "$GEANYGENDOC_CFLAGS"; then - pkg_cv_GEANYGENDOC_CFLAGS="$GEANYGENDOC_CFLAGS" +if test -n "$DEFINEFORMAT_CFLAGS"; then + pkg_cv_DEFINEFORMAT_CFLAGS="$DEFINEFORMAT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_VERSION} - glib-2.0 >= \${GLIB_VERSION} - gio-2.0 >= \${GIO_VERSION} - ctpl >= \${CTPL_VERSION}\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_VERSION} - glib-2.0 >= ${GLIB_VERSION} - gio-2.0 >= ${GIO_VERSION} - ctpl >= ${CTPL_VERSION}") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= 2.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= 2.8") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GEANYGENDOC_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= ${GTK_VERSION} - glib-2.0 >= ${GLIB_VERSION} - gio-2.0 >= ${GIO_VERSION} - ctpl >= ${CTPL_VERSION}" 2>/dev/null` + pkg_cv_DEFINEFORMAT_CFLAGS=`$PKG_CONFIG --cflags "$GP_GTK_PACKAGE >= 2.8" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -14683,25 +14865,16 @@ else pkg_failed=untried fi -if test -n "$GEANYGENDOC_LIBS"; then - pkg_cv_GEANYGENDOC_LIBS="$GEANYGENDOC_LIBS" +if test -n "$DEFINEFORMAT_LIBS"; then + pkg_cv_DEFINEFORMAT_LIBS="$DEFINEFORMAT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_VERSION} - glib-2.0 >= \${GLIB_VERSION} - gio-2.0 >= \${GIO_VERSION} - ctpl >= \${CTPL_VERSION}\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_VERSION} - glib-2.0 >= ${GLIB_VERSION} - gio-2.0 >= ${GIO_VERSION} - ctpl >= ${CTPL_VERSION}") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= 2.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= 2.8") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GEANYGENDOC_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= ${GTK_VERSION} - glib-2.0 >= ${GLIB_VERSION} - gio-2.0 >= ${GIO_VERSION} - ctpl >= ${CTPL_VERSION}" 2>/dev/null` + pkg_cv_DEFINEFORMAT_LIBS=`$PKG_CONFIG --libs "$GP_GTK_PACKAGE >= 2.8" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -14722,44 +14895,73 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GEANYGENDOC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= ${GTK_VERSION} - glib-2.0 >= ${GLIB_VERSION} - gio-2.0 >= ${GIO_VERSION} - ctpl >= ${CTPL_VERSION}" 2>&1` + DEFINEFORMAT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GP_GTK_PACKAGE >= 2.8" 2>&1` else - GEANYGENDOC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= ${GTK_VERSION} - glib-2.0 >= ${GLIB_VERSION} - gio-2.0 >= ${GIO_VERSION} - ctpl >= ${CTPL_VERSION}" 2>&1` + DEFINEFORMAT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GP_GTK_PACKAGE >= 2.8" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$GEANYGENDOC_PKG_ERRORS" >&5 + echo "$DEFINEFORMAT_PKG_ERRORS" >&5 - enable_geanygendoc=no + enable_defineformat=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - enable_geanygendoc=no + enable_defineformat=no else - GEANYGENDOC_CFLAGS=$pkg_cv_GEANYGENDOC_CFLAGS - GEANYGENDOC_LIBS=$pkg_cv_GEANYGENDOC_LIBS + DEFINEFORMAT_CFLAGS=$pkg_cv_DEFINEFORMAT_CFLAGS + DEFINEFORMAT_LIBS=$pkg_cv_DEFINEFORMAT_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - enable_geanygendoc=yes + fi fi - # Extract the first word of "rst2html", so it can be a program name with args. -set dummy rst2html; ac_word=$2 + if test "$enable_defineformat" = "auto"; then + enable_defineformat=yes + fi + if test "$enable_defineformat" = yes; then + ENABLE_DEFINEFORMAT_TRUE= + ENABLE_DEFINEFORMAT_FALSE='#' +else + ENABLE_DEFINEFORMAT_TRUE='#' + ENABLE_DEFINEFORMAT_FALSE= +fi + + + plugins_statusmsg+="Defineformat:$enable_defineformat +" + + + ac_config_files="$ac_config_files defineformat/Makefile defineformat/src/Makefile" + + + + + # Check whether --enable-devhelp was given. +if test "${enable_devhelp+set}" = set; then : + enableval=$enable_devhelp; enable_devhelp=$enableval +else + enable_devhelp=auto +fi + + + + GTK_VERSION=2.16 + WEBKIT_VERSION=1.1.13 + GCONF_VERSION=2.6.0 + LIBWNCK_VERSION=2.10.0 + + # Extract the first word of "glib-genmarshal", so it can be a program name with args. +set dummy glib-genmarshal; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_RST2HTML+:} false; then : +if ${ac_cv_path_GLIB_GENMARSHAL+:} false; then : $as_echo_n "(cached) " >&6 else - case $RST2HTML in + case $GLIB_GENMARSHAL in [\\/]* | ?:[\\/]*) - ac_cv_path_RST2HTML="$RST2HTML" # Let the user override the test with a path. + ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -14769,7 +14971,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_RST2HTML="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -14777,357 +14979,1609 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_RST2HTML" && ac_cv_path_RST2HTML="no" ;; esac fi -RST2HTML=$ac_cv_path_RST2HTML -if test -n "$RST2HTML"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RST2HTML" >&5 -$as_echo "$RST2HTML" >&6; } +GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL +if test -n "$GLIB_GENMARSHAL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5 +$as_echo "$GLIB_GENMARSHAL" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - - if test "x$RST2HTML" != "xno"; then - BUILD_RST_TRUE= - BUILD_RST_FALSE='#' + # Extract the first word of "glib-mkenums", so it can be a program name with args. +set dummy glib-mkenums; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GLIB_MKENUMS+:} false; then : + $as_echo_n "(cached) " >&6 else - BUILD_RST_TRUE='#' - BUILD_RST_FALSE= -fi - - + case $GLIB_MKENUMS in + [\\/]* | ?:[\\/]*) + ac_cv_path_GLIB_MKENUMS="$GLIB_MKENUMS" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GLIB_MKENUMS="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - if test "$enable_geanygendoc" = "auto"; then - enable_geanygendoc=yes - fi - if test "$enable_geanygendoc" = yes; then - ENABLE_GEANYGENDOC_TRUE= - ENABLE_GEANYGENDOC_FALSE='#' + ;; +esac +fi +GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS +if test -n "$GLIB_MKENUMS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_MKENUMS" >&5 +$as_echo "$GLIB_MKENUMS" >&6; } else - ENABLE_GEANYGENDOC_TRUE='#' - ENABLE_GEANYGENDOC_FALSE= + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - plugins_statusmsg+="GeanyGenDoc:$enable_geanygendoc -" - - - ac_config_files="$ac_config_files geanygendoc/Makefile geanygendoc/src/Makefile geanygendoc/data/Makefile geanygendoc/data/filetypes/Makefile geanygendoc/docs/Makefile" + gtk_dep=2 + if test $gtk_dep -ne 0; then - # Check whether --enable-geanyinsertnum was given. -if test "${enable_geanyinsertnum+set}" = set; then : - enableval=$enable_geanyinsertnum; enable_geanyinsertnum=$enableval -else - enable_geanyinsertnum=yes -fi + if test "$enable_devhelp" = no; then : - if test "$enable_geanyinsertnum" = "auto"; then - enable_geanyinsertnum=yes - fi - if test "$enable_geanyinsertnum" = yes; then - ENABLE_GEANYINSERTNUM_TRUE= - ENABLE_GEANYINSERTNUM_FALSE='#' else - ENABLE_GEANYINSERTNUM_TRUE='#' - ENABLE_GEANYINSERTNUM_FALSE= + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin devhelp" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin devhelp... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = $gtk_dep; 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; } + if test "$enable_devhelp" = yes; then : + as_fn_error $? "devhelp is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_devhelp" = auto; then : + enable_devhelp=no +fi +fi fi + fi - plugins_statusmsg+="GeanyInsertNum:$enable_geanyinsertnum -" - - - ac_config_files="$ac_config_files geanyinsertnum/Makefile geanyinsertnum/src/Makefile" - - + if test "$enable_devhelp" = "yes"; then +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEVHELP" >&5 +$as_echo_n "checking for DEVHELP... " >&6; } - # Check whether --enable-geanylatex was given. -if test "${enable_geanylatex+set}" = set; then : +if test -n "$DEVHELP_CFLAGS"; then + pkg_cv_DEVHELP_CFLAGS="$DEVHELP_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_VERSION} + webkit-1.0 >= \${WEBKIT_VERSION} + libwnck-1.0 >= \${LIBWNCK_VERSION} + gconf-2.0 >= \${GCONF_VERSION} + gthread-2.0 + zlib\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_VERSION} + webkit-1.0 >= ${WEBKIT_VERSION} + libwnck-1.0 >= ${LIBWNCK_VERSION} + gconf-2.0 >= ${GCONF_VERSION} + gthread-2.0 + zlib") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DEVHELP_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= ${GTK_VERSION} + webkit-1.0 >= ${WEBKIT_VERSION} + libwnck-1.0 >= ${LIBWNCK_VERSION} + gconf-2.0 >= ${GCONF_VERSION} + gthread-2.0 + zlib" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$DEVHELP_LIBS"; then + pkg_cv_DEVHELP_LIBS="$DEVHELP_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_VERSION} + webkit-1.0 >= \${WEBKIT_VERSION} + libwnck-1.0 >= \${LIBWNCK_VERSION} + gconf-2.0 >= \${GCONF_VERSION} + gthread-2.0 + zlib\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_VERSION} + webkit-1.0 >= ${WEBKIT_VERSION} + libwnck-1.0 >= ${LIBWNCK_VERSION} + gconf-2.0 >= ${GCONF_VERSION} + gthread-2.0 + zlib") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DEVHELP_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= ${GTK_VERSION} + webkit-1.0 >= ${WEBKIT_VERSION} + libwnck-1.0 >= ${LIBWNCK_VERSION} + gconf-2.0 >= ${GCONF_VERSION} + gthread-2.0 + zlib" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + DEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= ${GTK_VERSION} + webkit-1.0 >= ${WEBKIT_VERSION} + libwnck-1.0 >= ${LIBWNCK_VERSION} + gconf-2.0 >= ${GCONF_VERSION} + gthread-2.0 + zlib" 2>&1` + else + DEVHELP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= ${GTK_VERSION} + webkit-1.0 >= ${WEBKIT_VERSION} + libwnck-1.0 >= ${LIBWNCK_VERSION} + gconf-2.0 >= ${GCONF_VERSION} + gthread-2.0 + zlib" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$DEVHELP_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (gtk+-2.0 >= ${GTK_VERSION} + webkit-1.0 >= ${WEBKIT_VERSION} + libwnck-1.0 >= ${LIBWNCK_VERSION} + gconf-2.0 >= ${GCONF_VERSION} + gthread-2.0 + zlib) were not met: + +$DEVHELP_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables DEVHELP_CFLAGS +and DEVHELP_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables DEVHELP_CFLAGS +and DEVHELP_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + DEVHELP_CFLAGS=$pkg_cv_DEVHELP_CFLAGS + DEVHELP_LIBS=$pkg_cv_DEVHELP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + elif test "$enable_devhelp" = "auto"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEVHELP" >&5 +$as_echo_n "checking for DEVHELP... " >&6; } + +if test -n "$DEVHELP_CFLAGS"; then + pkg_cv_DEVHELP_CFLAGS="$DEVHELP_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_VERSION} + webkit-1.0 >= \${WEBKIT_VERSION} + libwnck-1.0 >= \${LIBWNCK_VERSION} + gconf-2.0 >= \${GCONF_VERSION} + gthread-2.0 + zlib\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_VERSION} + webkit-1.0 >= ${WEBKIT_VERSION} + libwnck-1.0 >= ${LIBWNCK_VERSION} + gconf-2.0 >= ${GCONF_VERSION} + gthread-2.0 + zlib") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DEVHELP_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= ${GTK_VERSION} + webkit-1.0 >= ${WEBKIT_VERSION} + libwnck-1.0 >= ${LIBWNCK_VERSION} + gconf-2.0 >= ${GCONF_VERSION} + gthread-2.0 + zlib" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$DEVHELP_LIBS"; then + pkg_cv_DEVHELP_LIBS="$DEVHELP_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_VERSION} + webkit-1.0 >= \${WEBKIT_VERSION} + libwnck-1.0 >= \${LIBWNCK_VERSION} + gconf-2.0 >= \${GCONF_VERSION} + gthread-2.0 + zlib\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_VERSION} + webkit-1.0 >= ${WEBKIT_VERSION} + libwnck-1.0 >= ${LIBWNCK_VERSION} + gconf-2.0 >= ${GCONF_VERSION} + gthread-2.0 + zlib") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DEVHELP_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= ${GTK_VERSION} + webkit-1.0 >= ${WEBKIT_VERSION} + libwnck-1.0 >= ${LIBWNCK_VERSION} + gconf-2.0 >= ${GCONF_VERSION} + gthread-2.0 + zlib" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + DEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= ${GTK_VERSION} + webkit-1.0 >= ${WEBKIT_VERSION} + libwnck-1.0 >= ${LIBWNCK_VERSION} + gconf-2.0 >= ${GCONF_VERSION} + gthread-2.0 + zlib" 2>&1` + else + DEVHELP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= ${GTK_VERSION} + webkit-1.0 >= ${WEBKIT_VERSION} + libwnck-1.0 >= ${LIBWNCK_VERSION} + gconf-2.0 >= ${GCONF_VERSION} + gthread-2.0 + zlib" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$DEVHELP_PKG_ERRORS" >&5 + + enable_devhelp=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_devhelp=no +else + DEVHELP_CFLAGS=$pkg_cv_DEVHELP_CFLAGS + DEVHELP_LIBS=$pkg_cv_DEVHELP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + fi + + + + if test "$enable_devhelp" = "auto"; then + enable_devhelp=yes + fi + if test "$enable_devhelp" = yes; then + ENABLE_DEVHELP_TRUE= + ENABLE_DEVHELP_FALSE='#' +else + ENABLE_DEVHELP_TRUE='#' + ENABLE_DEVHELP_FALSE= +fi + + + plugins_statusmsg+="DevHelp:$enable_devhelp +" + + + + ac_config_files="$ac_config_files devhelp/Makefile devhelp/devhelp/Makefile devhelp/src/Makefile devhelp/data/Makefile" + + + + + # Check whether --enable-geanydoc was given. +if test "${enable_geanydoc+set}" = set; then : + enableval=$enable_geanydoc; enable_geanydoc=$enableval +else + enable_geanydoc=auto +fi + + + + + + + if test "$enable_geanydoc" = no; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin GeanyDoc" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin GeanyDoc... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = 2; 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; } + if test "$enable_geanydoc" = yes; then : + as_fn_error $? "GeanyDoc is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_geanydoc" = auto; then : + enable_geanydoc=no +fi +fi +fi + + + + if test "$enable_geanydoc" = "auto"; then + enable_geanydoc=yes + fi + if test "$enable_geanydoc" = yes; then + ENABLE_GEANYDOC_TRUE= + ENABLE_GEANYDOC_FALSE='#' +else + ENABLE_GEANYDOC_TRUE='#' + ENABLE_GEANYDOC_FALSE= +fi + + + plugins_statusmsg+="GeanyDoc:$enable_geanydoc +" + + + ac_config_files="$ac_config_files geanydoc/Makefile geanydoc/src/Makefile geanydoc/tests/Makefile" + + + + + # Check whether --enable-geanyextrasel was given. +if test "${enable_geanyextrasel+set}" = set; then : + enableval=$enable_geanyextrasel; enable_geanyextrasel=$enableval +else + enable_geanyextrasel=yes +fi + + + + if test "$enable_geanyextrasel" = "auto"; then + enable_geanyextrasel=yes + fi + if test "$enable_geanyextrasel" = yes; then + ENABLE_GEANYEXTRASEL_TRUE= + ENABLE_GEANYEXTRASEL_FALSE='#' +else + ENABLE_GEANYEXTRASEL_TRUE='#' + ENABLE_GEANYEXTRASEL_FALSE= +fi + + + plugins_statusmsg+="GeanyExtraSel:$enable_geanyextrasel +" + + + ac_config_files="$ac_config_files geanyextrasel/Makefile geanyextrasel/src/Makefile" + + + + + # Check whether --enable-geanygendoc was given. +if test "${enable_geanygendoc+set}" = set; then : + enableval=$enable_geanygendoc; enable_geanygendoc=$enableval +else + enable_geanygendoc=auto +fi + + + + GTK_VERSION=2.12 + GLIB_VERSION=2.14 + GIO_VERSION=2.18 + CTPL_VERSION=0.3 + + + + + gtk_dep=0 + if test $gtk_dep -ne 0; then + + + + if test "$enable_geanygendoc" = no; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin GeanyGenDoc" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin GeanyGenDoc... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = $gtk_dep; 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; } + if test "$enable_geanygendoc" = yes; then : + as_fn_error $? "GeanyGenDoc is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_geanygendoc" = auto; then : + enable_geanygendoc=no +fi +fi +fi + + fi + + if test "$enable_geanygendoc" = "yes"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GEANYGENDOC" >&5 +$as_echo_n "checking for GEANYGENDOC... " >&6; } + +if test -n "$GEANYGENDOC_CFLAGS"; then + pkg_cv_GEANYGENDOC_CFLAGS="$GEANYGENDOC_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= \${GTK_VERSION} + glib-2.0 >= \${GLIB_VERSION} + gio-2.0 >= \${GIO_VERSION} + ctpl >= \${CTPL_VERSION}\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= ${GTK_VERSION} + glib-2.0 >= ${GLIB_VERSION} + gio-2.0 >= ${GIO_VERSION} + ctpl >= ${CTPL_VERSION}") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GEANYGENDOC_CFLAGS=`$PKG_CONFIG --cflags "$GP_GTK_PACKAGE >= ${GTK_VERSION} + glib-2.0 >= ${GLIB_VERSION} + gio-2.0 >= ${GIO_VERSION} + ctpl >= ${CTPL_VERSION}" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GEANYGENDOC_LIBS"; then + pkg_cv_GEANYGENDOC_LIBS="$GEANYGENDOC_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= \${GTK_VERSION} + glib-2.0 >= \${GLIB_VERSION} + gio-2.0 >= \${GIO_VERSION} + ctpl >= \${CTPL_VERSION}\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= ${GTK_VERSION} + glib-2.0 >= ${GLIB_VERSION} + gio-2.0 >= ${GIO_VERSION} + ctpl >= ${CTPL_VERSION}") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GEANYGENDOC_LIBS=`$PKG_CONFIG --libs "$GP_GTK_PACKAGE >= ${GTK_VERSION} + glib-2.0 >= ${GLIB_VERSION} + gio-2.0 >= ${GIO_VERSION} + ctpl >= ${CTPL_VERSION}" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GEANYGENDOC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GP_GTK_PACKAGE >= ${GTK_VERSION} + glib-2.0 >= ${GLIB_VERSION} + gio-2.0 >= ${GIO_VERSION} + ctpl >= ${CTPL_VERSION}" 2>&1` + else + GEANYGENDOC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GP_GTK_PACKAGE >= ${GTK_VERSION} + glib-2.0 >= ${GLIB_VERSION} + gio-2.0 >= ${GIO_VERSION} + ctpl >= ${CTPL_VERSION}" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GEANYGENDOC_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements ($GP_GTK_PACKAGE >= ${GTK_VERSION} + glib-2.0 >= ${GLIB_VERSION} + gio-2.0 >= ${GIO_VERSION} + ctpl >= ${CTPL_VERSION}) were not met: + +$GEANYGENDOC_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GEANYGENDOC_CFLAGS +and GEANYGENDOC_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GEANYGENDOC_CFLAGS +and GEANYGENDOC_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + GEANYGENDOC_CFLAGS=$pkg_cv_GEANYGENDOC_CFLAGS + GEANYGENDOC_LIBS=$pkg_cv_GEANYGENDOC_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + elif test "$enable_geanygendoc" = "auto"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GEANYGENDOC" >&5 +$as_echo_n "checking for GEANYGENDOC... " >&6; } + +if test -n "$GEANYGENDOC_CFLAGS"; then + pkg_cv_GEANYGENDOC_CFLAGS="$GEANYGENDOC_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= \${GTK_VERSION} + glib-2.0 >= \${GLIB_VERSION} + gio-2.0 >= \${GIO_VERSION} + ctpl >= \${CTPL_VERSION}\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= ${GTK_VERSION} + glib-2.0 >= ${GLIB_VERSION} + gio-2.0 >= ${GIO_VERSION} + ctpl >= ${CTPL_VERSION}") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GEANYGENDOC_CFLAGS=`$PKG_CONFIG --cflags "$GP_GTK_PACKAGE >= ${GTK_VERSION} + glib-2.0 >= ${GLIB_VERSION} + gio-2.0 >= ${GIO_VERSION} + ctpl >= ${CTPL_VERSION}" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GEANYGENDOC_LIBS"; then + pkg_cv_GEANYGENDOC_LIBS="$GEANYGENDOC_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= \${GTK_VERSION} + glib-2.0 >= \${GLIB_VERSION} + gio-2.0 >= \${GIO_VERSION} + ctpl >= \${CTPL_VERSION}\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= ${GTK_VERSION} + glib-2.0 >= ${GLIB_VERSION} + gio-2.0 >= ${GIO_VERSION} + ctpl >= ${CTPL_VERSION}") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GEANYGENDOC_LIBS=`$PKG_CONFIG --libs "$GP_GTK_PACKAGE >= ${GTK_VERSION} + glib-2.0 >= ${GLIB_VERSION} + gio-2.0 >= ${GIO_VERSION} + ctpl >= ${CTPL_VERSION}" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GEANYGENDOC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GP_GTK_PACKAGE >= ${GTK_VERSION} + glib-2.0 >= ${GLIB_VERSION} + gio-2.0 >= ${GIO_VERSION} + ctpl >= ${CTPL_VERSION}" 2>&1` + else + GEANYGENDOC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GP_GTK_PACKAGE >= ${GTK_VERSION} + glib-2.0 >= ${GLIB_VERSION} + gio-2.0 >= ${GIO_VERSION} + ctpl >= ${CTPL_VERSION}" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GEANYGENDOC_PKG_ERRORS" >&5 + + enable_geanygendoc=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_geanygendoc=no +else + GEANYGENDOC_CFLAGS=$pkg_cv_GEANYGENDOC_CFLAGS + GEANYGENDOC_LIBS=$pkg_cv_GEANYGENDOC_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + fi + + + # Extract the first word of "rst2html", so it can be a program name with args. +set dummy rst2html; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_RST2HTML+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $RST2HTML in + [\\/]* | ?:[\\/]*) + ac_cv_path_RST2HTML="$RST2HTML" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_RST2HTML="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_RST2HTML" && ac_cv_path_RST2HTML="no" + ;; +esac +fi +RST2HTML=$ac_cv_path_RST2HTML +if test -n "$RST2HTML"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RST2HTML" >&5 +$as_echo "$RST2HTML" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + if test "x$RST2HTML" != "xno"; then + BUILD_RST_TRUE= + BUILD_RST_FALSE='#' +else + BUILD_RST_TRUE='#' + BUILD_RST_FALSE= +fi + + + + if test "$enable_geanygendoc" = "auto"; then + enable_geanygendoc=yes + fi + if test "$enable_geanygendoc" = yes; then + ENABLE_GEANYGENDOC_TRUE= + ENABLE_GEANYGENDOC_FALSE='#' +else + ENABLE_GEANYGENDOC_TRUE='#' + ENABLE_GEANYGENDOC_FALSE= +fi + + + plugins_statusmsg+="GeanyGenDoc:$enable_geanygendoc +" + + + + ac_config_files="$ac_config_files geanygendoc/Makefile geanygendoc/src/Makefile geanygendoc/data/Makefile geanygendoc/data/filetypes/Makefile geanygendoc/docs/Makefile" + + + + + # Check whether --enable-geanyinsertnum was given. +if test "${enable_geanyinsertnum+set}" = set; then : + enableval=$enable_geanyinsertnum; enable_geanyinsertnum=$enableval +else + enable_geanyinsertnum=auto +fi + + + + if test "$enable_geanyinsertnum" = "auto"; then + enable_geanyinsertnum=yes + fi + if test "$enable_geanyinsertnum" = yes; then + ENABLE_GEANYINSERTNUM_TRUE= + ENABLE_GEANYINSERTNUM_FALSE='#' +else + ENABLE_GEANYINSERTNUM_TRUE='#' + ENABLE_GEANYINSERTNUM_FALSE= +fi + + + plugins_statusmsg+="GeanyInsertNum:$enable_geanyinsertnum +" + + + ac_config_files="$ac_config_files geanyinsertnum/Makefile geanyinsertnum/src/Makefile" + + + + + # Check whether --enable-geanylatex was given. +if test "${enable_geanylatex+set}" = set; then : enableval=$enable_geanylatex; enable_geanylatex=$enableval else - enable_geanylatex=yes + enable_geanylatex=auto +fi + + + + + + + if test "$enable_geanylatex" = no; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin GeanyLaTeX" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin GeanyLaTeX... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = 2; 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; } + if test "$enable_geanylatex" = yes; then : + as_fn_error $? "GeanyLaTeX is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_geanylatex" = auto; then : + enable_geanylatex=no +fi +fi +fi + + + + if test "$enable_geanylatex" = "auto"; then + enable_geanylatex=yes + fi + if test "$enable_geanylatex" = yes; then + ENABLE_GEANYLATEX_TRUE= + ENABLE_GEANYLATEX_FALSE='#' +else + ENABLE_GEANYLATEX_TRUE='#' + ENABLE_GEANYLATEX_FALSE= +fi + + + plugins_statusmsg+="GeanyLaTeX:$enable_geanylatex +" + + + ac_config_files="$ac_config_files geanylatex/Makefile geanylatex/doc/Makefile geanylatex/src/Makefile" + + + + + # Check whether --enable-geanylipsum was given. +if test "${enable_geanylipsum+set}" = set; then : + enableval=$enable_geanylipsum; enable_geanylipsum=$enableval +else + enable_geanylipsum=auto +fi + + + + if test "$enable_geanylipsum" = "auto"; then + enable_geanylipsum=yes + fi + if test "$enable_geanylipsum" = yes; then + ENABLE_GEANYLIPSUM_TRUE= + ENABLE_GEANYLIPSUM_FALSE='#' +else + ENABLE_GEANYLIPSUM_TRUE='#' + ENABLE_GEANYLIPSUM_FALSE= +fi + + + plugins_statusmsg+="GeanyLipsum:$enable_geanylipsum +" + + + ac_config_files="$ac_config_files geanylipsum/Makefile geanylipsum/src/Makefile" + + + + + # Check whether --enable-geanylua was given. +if test "${enable_geanylua+set}" = set; then : + enableval=$enable_geanylua; enable_geanylua=$enableval +else + enable_geanylua=auto +fi + + + + +# Check whether --with-lua-pkg was given. +if test "${with_lua_pkg+set}" = set; then : + withval=$with_lua_pkg; LUA_PKG_NAME=${withval%.pc} +else + LUA_PKG_NAME=lua5.1 + + for L in lua5.1 lua51 lua-5.1 lua; do + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$L\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$L") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + LUA_PKG_NAME=$L; break +fi + done +fi + + + LUA_VERSION=5.1 + + + + gtk_dep=0 + if test $gtk_dep -ne 0; then + + + + if test "$enable_geanylua" = no; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin GeanyLua" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin GeanyLua... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = $gtk_dep; 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; } + if test "$enable_geanylua" = yes; then : + as_fn_error $? "GeanyLua is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_geanylua" = auto; then : + enable_geanylua=no +fi +fi +fi + + fi + + if test "$enable_geanylua" = "yes"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 +$as_echo_n "checking for LUA... " >&6; } + +if test -n "$LUA_CFLAGS"; then + pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${LUA_PKG_NAME} >= \${LUA_VERSION}\""; } >&5 + ($PKG_CONFIG --exists --print-errors "${LUA_PKG_NAME} >= ${LUA_VERSION}") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "${LUA_PKG_NAME} >= ${LUA_VERSION}" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LUA_LIBS"; then + pkg_cv_LUA_LIBS="$LUA_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${LUA_PKG_NAME} >= \${LUA_VERSION}\""; } >&5 + ($PKG_CONFIG --exists --print-errors "${LUA_PKG_NAME} >= ${LUA_VERSION}") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "${LUA_PKG_NAME} >= ${LUA_VERSION}" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "${LUA_PKG_NAME} >= ${LUA_VERSION}" 2>&1` + else + LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "${LUA_PKG_NAME} >= ${LUA_VERSION}" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LUA_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (${LUA_PKG_NAME} >= ${LUA_VERSION}) were not met: + +$LUA_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables LUA_CFLAGS +and LUA_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables LUA_CFLAGS +and LUA_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + LUA_CFLAGS=$pkg_cv_LUA_CFLAGS + LUA_LIBS=$pkg_cv_LUA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + elif test "$enable_geanylua" = "auto"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 +$as_echo_n "checking for LUA... " >&6; } + +if test -n "$LUA_CFLAGS"; then + pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${LUA_PKG_NAME} >= \${LUA_VERSION}\""; } >&5 + ($PKG_CONFIG --exists --print-errors "${LUA_PKG_NAME} >= ${LUA_VERSION}") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "${LUA_PKG_NAME} >= ${LUA_VERSION}" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LUA_LIBS"; then + pkg_cv_LUA_LIBS="$LUA_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${LUA_PKG_NAME} >= \${LUA_VERSION}\""; } >&5 + ($PKG_CONFIG --exists --print-errors "${LUA_PKG_NAME} >= ${LUA_VERSION}") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "${LUA_PKG_NAME} >= ${LUA_VERSION}" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "${LUA_PKG_NAME} >= ${LUA_VERSION}" 2>&1` + else + LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "${LUA_PKG_NAME} >= ${LUA_VERSION}" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LUA_PKG_ERRORS" >&5 + + enable_geanylua=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_geanylua=no +else + LUA_CFLAGS=$pkg_cv_LUA_CFLAGS + LUA_LIBS=$pkg_cv_LUA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + fi + + + + + gtk_dep=0 + if test $gtk_dep -ne 0; then + + + + if test "$enable_geanylua" = no; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin GeanyLua" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin GeanyLua... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = $gtk_dep; 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; } + if test "$enable_geanylua" = yes; then : + as_fn_error $? "GeanyLua is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_geanylua" = auto; then : + enable_geanylua=no +fi +fi +fi + + fi + + if test "$enable_geanylua" = "yes"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5 +$as_echo_n "checking for GMODULE... " >&6; } + +if test -n "$GMODULE_CFLAGS"; then + pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gmodule-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GMODULE_LIBS"; then + pkg_cv_GMODULE_LIBS="$GMODULE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gmodule-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried fi - if test "$enable_geanylatex" = "auto"; then - enable_geanylatex=yes +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-2.0" 2>&1` + else + GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-2.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GMODULE_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (gmodule-2.0) were not met: + +$GMODULE_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GMODULE_CFLAGS +and GMODULE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GMODULE_CFLAGS +and GMODULE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS + GMODULE_LIBS=$pkg_cv_GMODULE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + elif test "$enable_geanylua" = "auto"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5 +$as_echo_n "checking for GMODULE... " >&6; } + +if test -n "$GMODULE_CFLAGS"; then + pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gmodule-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GMODULE_LIBS"; then + pkg_cv_GMODULE_LIBS="$GMODULE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gmodule-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-2.0" 2>&1` + else + GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-2.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GMODULE_PKG_ERRORS" >&5 + + enable_geanylua=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_geanylua=no +else + GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS + GMODULE_LIBS=$pkg_cv_GMODULE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi fi - if test "$enable_geanylatex" = yes; then - ENABLE_GEANYLATEX_TRUE= - ENABLE_GEANYLATEX_FALSE='#' + + + if test "$enable_geanylua" = "auto"; then + enable_geanylua=yes + fi + if test "$enable_geanylua" = yes; then + ENABLE_GEANYLUA_TRUE= + ENABLE_GEANYLUA_FALSE='#' else - ENABLE_GEANYLATEX_TRUE='#' - ENABLE_GEANYLATEX_FALSE= + ENABLE_GEANYLUA_TRUE='#' + ENABLE_GEANYLUA_FALSE= fi - plugins_statusmsg+="GeanyLaTeX:$enable_geanylatex + plugins_statusmsg+="GeanyLua:$enable_geanylua +" + + + + ac_config_files="$ac_config_files geanylua/examples/edit/Makefile geanylua/examples/scripting/Makefile geanylua/examples/info/Makefile geanylua/examples/work/Makefile geanylua/examples/dialogs/Makefile geanylua/examples/Makefile geanylua/docs/Makefile geanylua/Makefile" + + + + + # Check whether --enable-geanymacro was given. +if test "${enable_geanymacro+set}" = set; then : + enableval=$enable_geanymacro; enable_geanymacro=$enableval +else + enable_geanymacro=auto +fi + + + + + + + if test "$enable_geanymacro" = no; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin GeanyMacro" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin GeanyMacro... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = 2; 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; } + if test "$enable_geanymacro" = yes; then : + as_fn_error $? "GeanyMacro is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_geanymacro" = auto; then : + enable_geanymacro=no +fi +fi +fi + + + + if test "$enable_geanymacro" = "auto"; then + enable_geanymacro=yes + fi + if test "$enable_geanymacro" = yes; then + ENABLE_GEANYMACRO_TRUE= + ENABLE_GEANYMACRO_FALSE='#' +else + ENABLE_GEANYMACRO_TRUE='#' + ENABLE_GEANYMACRO_FALSE= +fi + + + plugins_statusmsg+="GeanyMacro:$enable_geanymacro +" + + + ac_config_files="$ac_config_files geanymacro/Makefile geanymacro/src/Makefile" + + + + + # Check whether --enable-geanyminiscript was given. +if test "${enable_geanyminiscript+set}" = set; then : + enableval=$enable_geanyminiscript; enable_geanyminiscript=$enableval +else + enable_geanyminiscript=auto +fi + + + + if test "$enable_geanyminiscript" = "auto"; then + enable_geanyminiscript=yes + fi + if test "$enable_geanyminiscript" = yes; then + ENABLE_GEANYMINISCRIPT_TRUE= + ENABLE_GEANYMINISCRIPT_FALSE='#' +else + ENABLE_GEANYMINISCRIPT_TRUE='#' + ENABLE_GEANYMINISCRIPT_FALSE= +fi + + + plugins_statusmsg+="GeanyMiniScript:$enable_geanyminiscript " - ac_config_files="$ac_config_files geanylatex/Makefile geanylatex/doc/Makefile geanylatex/src/Makefile" + ac_config_files="$ac_config_files geanyminiscript/Makefile geanyminiscript/src/Makefile" + + + + + # Check whether --enable-geanynumberedbookmarks was given. +if test "${enable_geanynumberedbookmarks+set}" = set; then : + enableval=$enable_geanynumberedbookmarks; enable_geanynumberedbookmarks=$enableval +else + enable_geanynumberedbookmarks=auto +fi + + - # Check whether --enable-geanylipsum was given. -if test "${enable_geanylipsum+set}" = set; then : - enableval=$enable_geanylipsum; enable_geanylipsum=$enableval + if test "$enable_geanynumberedbookmarks" = no; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin GeanyNumberedBookmarks" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin GeanyNumberedBookmarks... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = 2; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - enable_geanylipsum=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test "$enable_geanynumberedbookmarks" = yes; then : + as_fn_error $? "GeanyNumberedBookmarks is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_geanynumberedbookmarks" = auto; then : + enable_geanynumberedbookmarks=no +fi +fi fi - if test "$enable_geanylipsum" = "auto"; then - enable_geanylipsum=yes + if test "$enable_geanynumberedbookmarks" = "auto"; then + enable_geanynumberedbookmarks=yes fi - if test "$enable_geanylipsum" = yes; then - ENABLE_GEANYLIPSUM_TRUE= - ENABLE_GEANYLIPSUM_FALSE='#' + if test "$enable_geanynumberedbookmarks" = yes; then + ENABLE_GEANYNUMBEREDBOOKMARKS_TRUE= + ENABLE_GEANYNUMBEREDBOOKMARKS_FALSE='#' else - ENABLE_GEANYLIPSUM_TRUE='#' - ENABLE_GEANYLIPSUM_FALSE= + ENABLE_GEANYNUMBEREDBOOKMARKS_TRUE='#' + ENABLE_GEANYNUMBEREDBOOKMARKS_FALSE= fi - plugins_statusmsg+="GeanyLipsum:$enable_geanylipsum + plugins_statusmsg+="GeanyNumberedBookmarks:$enable_geanynumberedbookmarks " - ac_config_files="$ac_config_files geanylipsum/Makefile geanylipsum/src/Makefile" + ac_config_files="$ac_config_files geanynumberedbookmarks/Makefile geanynumberedbookmarks/src/Makefile" - # Check whether --enable-geanylua was given. -if test "${enable_geanylua+set}" = set; then : - enableval=$enable_geanylua; enable_geanylua=$enableval + # Check whether --enable-geanyprj was given. +if test "${enable_geanyprj+set}" = set; then : + enableval=$enable_geanyprj; enable_geanyprj=$enableval else - enable_geanylua=auto + enable_geanyprj=auto fi -# Check whether --with-lua-pkg was given. -if test "${with_lua_pkg+set}" = set; then : - withval=$with_lua_pkg; LUA_PKG_NAME=${withval%.pc} -else - LUA_PKG_NAME=lua5.1 - - for L in lua5.1 lua51 lua-5.1 lua; do - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$L\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$L") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - LUA_PKG_NAME=$L; break -fi - done -fi - - - LUA_VERSION=5.1 - if test "$enable_geanylua" = "yes"; then -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 -$as_echo_n "checking for LUA... " >&6; } + if test "$enable_geanyprj" = no; then : -if test -n "$LUA_CFLAGS"; then - pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${LUA_PKG_NAME} >= \${LUA_VERSION}\""; } >&5 - ($PKG_CONFIG --exists --print-errors "${LUA_PKG_NAME} >= ${LUA_VERSION}") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "${LUA_PKG_NAME} >= ${LUA_VERSION}" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$LUA_LIBS"; then - pkg_cv_LUA_LIBS="$LUA_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${LUA_PKG_NAME} >= \${LUA_VERSION}\""; } >&5 - ($PKG_CONFIG --exists --print-errors "${LUA_PKG_NAME} >= ${LUA_VERSION}") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "${LUA_PKG_NAME} >= ${LUA_VERSION}" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin GeanyPrj" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin GeanyPrj... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = 2; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - pkg_failed=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test "$enable_geanyprj" = yes; then : + as_fn_error $? "GeanyPrj is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_geanyprj" = auto; then : + enable_geanyprj=no +fi fi - else - pkg_failed=untried fi -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes + if test "$enable_geanyprj" = "auto"; then + enable_geanyprj=yes + fi + if test "$enable_geanyprj" = yes; then + ENABLE_GEANYPRJ_TRUE= + ENABLE_GEANYPRJ_FALSE='#' else - _pkg_short_errors_supported=no + ENABLE_GEANYPRJ_TRUE='#' + ENABLE_GEANYPRJ_FALSE= fi - if test $_pkg_short_errors_supported = yes; then - LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "${LUA_PKG_NAME} >= ${LUA_VERSION}" 2>&1` - else - LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "${LUA_PKG_NAME} >= ${LUA_VERSION}" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LUA_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (${LUA_PKG_NAME} >= ${LUA_VERSION}) were not met: -$LUA_PKG_ERRORS + plugins_statusmsg+="GeanyPrj:$enable_geanyprj +" -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. -Alternatively, you may set the environment variables LUA_CFLAGS -and LUA_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. + ac_config_files="$ac_config_files geanyprj/Makefile geanyprj/src/Makefile geanyprj/tests/Makefile" -Alternatively, you may set the environment variables LUA_CFLAGS -and LUA_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } -else - LUA_CFLAGS=$pkg_cv_LUA_CFLAGS - LUA_LIBS=$pkg_cv_LUA_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + + # Check whether --enable-geanypy was given. +if test "${enable_geanypy+set}" = set; then : + enableval=$enable_geanypy; enable_geanypy=$enableval +else + enable_geanypy=auto fi - elif test "$enable_geanylua" = "auto"; then -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 -$as_echo_n "checking for LUA... " >&6; } -if test -n "$LUA_CFLAGS"; then - pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${LUA_PKG_NAME} >= \${LUA_VERSION}\""; } >&5 - ($PKG_CONFIG --exists --print-errors "${LUA_PKG_NAME} >= ${LUA_VERSION}") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "${LUA_PKG_NAME} >= ${LUA_VERSION}" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + + + + + if test "$enable_geanypy" = no; then : + else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$LUA_LIBS"; then - pkg_cv_LUA_LIBS="$LUA_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${LUA_PKG_NAME} >= \${LUA_VERSION}\""; } >&5 - ($PKG_CONFIG --exists --print-errors "${LUA_PKG_NAME} >= ${LUA_VERSION}") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "${LUA_PKG_NAME} >= ${LUA_VERSION}" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin Geanypy" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin Geanypy... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = 2; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - pkg_failed=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test "$enable_geanypy" = yes; then : + as_fn_error $? "Geanypy is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_geanypy" = auto; then : + enable_geanypy=no +fi fi - else - pkg_failed=untried fi -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "${LUA_PKG_NAME} >= ${LUA_VERSION}" 2>&1` - else - LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "${LUA_PKG_NAME} >= ${LUA_VERSION}" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LUA_PKG_ERRORS" >&5 - enable_geanylua=no -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - enable_geanylua=no + gtk_dep=0 + if test $gtk_dep -ne 0; then + + + + if test "$enable_geanypy" = no; then : + else - LUA_CFLAGS=$pkg_cv_LUA_CFLAGS - LUA_LIBS=$pkg_cv_LUA_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin Geanypy" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin Geanypy... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = $gtk_dep; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - enable_geanylua=yes +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test "$enable_geanypy" = yes; then : + as_fn_error $? "Geanypy is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_geanypy" = auto; then : + enable_geanypy=no +fi +fi fi - fi + fi - if test "$enable_geanylua" = "yes"; then + if test "$enable_geanypy" = "yes"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5 -$as_echo_n "checking for GMODULE... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGTK" >&5 +$as_echo_n "checking for PYGTK... " >&6; } -if test -n "$GMODULE_CFLAGS"; then - pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS" +if test -n "$PYGTK_CFLAGS"; then + pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gmodule-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "pygtk-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0" 2>/dev/null` + pkg_cv_PYGTK_CFLAGS=`$PKG_CONFIG --cflags "pygtk-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -15135,16 +16589,16 @@ else pkg_failed=untried fi -if test -n "$GMODULE_LIBS"; then - pkg_cv_GMODULE_LIBS="$GMODULE_LIBS" +if test -n "$PYGTK_LIBS"; then + pkg_cv_PYGTK_LIBS="$PYGTK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gmodule-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "pygtk-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0" 2>/dev/null` + pkg_cv_PYGTK_LIBS=`$PKG_CONFIG --libs "pygtk-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -15165,22 +16619,22 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-2.0" 2>&1` + PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygtk-2.0" 2>&1` else - GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-2.0" 2>&1` + PYGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygtk-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$GMODULE_PKG_ERRORS" >&5 + echo "$PYGTK_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gmodule-2.0) were not met: + as_fn_error $? "Package requirements (pygtk-2.0) were not met: -$GMODULE_PKG_ERRORS +$PYGTK_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables GMODULE_CFLAGS -and GMODULE_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables PYGTK_CFLAGS +and PYGTK_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -15191,35 +16645,35 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables GMODULE_CFLAGS -and GMODULE_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables PYGTK_CFLAGS +and PYGTK_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS - GMODULE_LIBS=$pkg_cv_GMODULE_LIBS + PYGTK_CFLAGS=$pkg_cv_PYGTK_CFLAGS + PYGTK_LIBS=$pkg_cv_PYGTK_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi - elif test "$enable_geanylua" = "auto"; then + elif test "$enable_geanypy" = "auto"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5 -$as_echo_n "checking for GMODULE... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGTK" >&5 +$as_echo_n "checking for PYGTK... " >&6; } -if test -n "$GMODULE_CFLAGS"; then - pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS" +if test -n "$PYGTK_CFLAGS"; then + pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gmodule-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "pygtk-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0" 2>/dev/null` + pkg_cv_PYGTK_CFLAGS=`$PKG_CONFIG --cflags "pygtk-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -15227,16 +16681,16 @@ else pkg_failed=untried fi -if test -n "$GMODULE_LIBS"; then - pkg_cv_GMODULE_LIBS="$GMODULE_LIBS" +if test -n "$PYGTK_LIBS"; then + pkg_cv_PYGTK_LIBS="$PYGTK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gmodule-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "pygtk-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0" 2>/dev/null` + pkg_cv_PYGTK_LIBS=`$PKG_CONFIG --libs "pygtk-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -15257,166 +16711,425 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-2.0" 2>&1` + PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygtk-2.0" 2>&1` else - GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-2.0" 2>&1` + PYGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygtk-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$GMODULE_PKG_ERRORS" >&5 + echo "$PYGTK_PKG_ERRORS" >&5 - enable_geanylua=no + enable_geanypy=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - enable_geanylua=no + enable_geanypy=no else - GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS - GMODULE_LIBS=$pkg_cv_GMODULE_LIBS + PYGTK_CFLAGS=$pkg_cv_PYGTK_CFLAGS + PYGTK_LIBS=$pkg_cv_PYGTK_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - enable_geanylua=yes + fi fi + if ! test x$enable_geanypy = xno; then : - if test "$enable_geanylua" = "auto"; then - enable_geanylua=yes - fi - if test "$enable_geanylua" = yes; then - ENABLE_GEANYLUA_TRUE= - ENABLE_GEANYLUA_FALSE='#' + + # + # Allow the use of a (user set) custom python version + # + + + # Extract the first word of "python[$PYTHON_VERSION]", so it can be a program name with args. +set dummy python$PYTHON_VERSION; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 else - ENABLE_GEANYLUA_TRUE='#' - ENABLE_GEANYLUA_FALSE= + case $PYTHON in + [\\/]* | ?:[\\/]*) + ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PYTHON=$ac_cv_path_PYTHON +if test -n "$PYTHON"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +$as_echo "$PYTHON" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - plugins_statusmsg+="GeanyLua:$enable_geanylua -" + if test -z "$PYTHON"; then + as_fn_error $? "Cannot find python$PYTHON_VERSION in your system path" "$LINENO" 5 + PYTHON_VERSION="" + fi + # + # Check for a version of Python >= 2.1.0 + # + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a version of Python >= '2.1.0'" >&5 +$as_echo_n "checking for a version of Python >= '2.1.0'... " >&6; } + ac_supports_python_ver=`$PYTHON -c "import sys; \ + ver = sys.version.split ()[0]; \ + print (ver >= '2.1.0')"` + if test "$ac_supports_python_ver" != "True"; then + if test -z "$PYTHON_NOVERSIONCHECK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? " +This version of the AC_PYTHON_DEVEL macro +doesn't work properly with versions of Python before +2.1.0. You may need to re-run configure, setting the +variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG, +PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. +Moreover, to disable this check, set PYTHON_NOVERSIONCHECK +to something else than an empty string. +See \`config.log' for more details" "$LINENO" 5; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: skip at user request" >&5 +$as_echo "skip at user request" >&6; } + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + fi - ac_config_files="$ac_config_files geanylua/examples/edit/Makefile geanylua/examples/scripting/Makefile geanylua/examples/info/Makefile geanylua/examples/work/Makefile geanylua/examples/dialogs/Makefile geanylua/examples/Makefile geanylua/docs/Makefile geanylua/Makefile" + # + # if the macro parameter ``version'' is set, honour it + # + if test -n ">= '2.6'"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a version of Python >= '2.6'" >&5 +$as_echo_n "checking for a version of Python >= '2.6'... " >&6; } + ac_supports_python_ver=`$PYTHON -c "import sys; \ + ver = sys.version.split ()[0]; \ + print (ver >= '2.6')"` + if test "$ac_supports_python_ver" = "True"; 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_fn_error $? "this package requires Python >= '2.6'. +If you have it installed, but it isn't the default Python +interpreter in your system path, please pass the PYTHON_VERSION +variable to configure. See \`\`configure --help'' for reference. +" "$LINENO" 5 + PYTHON_VERSION="" + fi + fi + # + # Check if you have distutils, else fail + # + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 +$as_echo_n "checking for the distutils Python package... " >&6; } + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` + if test -z "$ac_distutils_result"; 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_fn_error $? "cannot import Python module \"distutils\". +Please check your Python installation. The error was: +$ac_distutils_result" "$LINENO" 5 + PYTHON_VERSION="" + fi + # + # Check for Python include path + # + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python include path" >&5 +$as_echo_n "checking for Python include path... " >&6; } + if test -z "$PYTHON_CPPFLAGS"; then + python_path=`$PYTHON -c "import distutils.sysconfig; \ + print (distutils.sysconfig.get_python_inc ());"` + plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ + print (distutils.sysconfig.get_python_inc (plat_specific=1));"` + if test -n "${python_path}"; then + if test "${plat_python_path}" != "${python_path}"; then + python_path="-I$python_path -I$plat_python_path" + else + python_path="-I$python_path" + fi + fi + PYTHON_CPPFLAGS=$python_path + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_CPPFLAGS" >&5 +$as_echo "$PYTHON_CPPFLAGS" >&6; } - # Check whether --enable-geanymacro was given. -if test "${enable_geanymacro+set}" = set; then : - enableval=$enable_geanymacro; enable_geanymacro=$enableval -else - enable_geanymacro=yes -fi + # + # Check for Python library path + # + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python library path" >&5 +$as_echo_n "checking for Python library path... " >&6; } + if test -z "$PYTHON_LDFLAGS"; then + # (makes two attempts to ensure we've got a version number + # from the interpreter) + ac_python_version=`cat<>confdefs.h <<_ACEOF +#define HAVE_PYTHON "$ac_python_version" +_ACEOF - if test "$enable_geanymacro" = "auto"; then - enable_geanymacro=yes - fi - if test "$enable_geanymacro" = yes; then - ENABLE_GEANYMACRO_TRUE= - ENABLE_GEANYMACRO_FALSE='#' -else - ENABLE_GEANYMACRO_TRUE='#' - ENABLE_GEANYMACRO_FALSE= -fi + # First, the library directory: + ac_python_libdir=`cat<&5 +$as_echo "$PYTHON_LDFLAGS" >&6; } - ac_config_files="$ac_config_files geanymacro/Makefile geanymacro/src/Makefile" + # + # Check for site packages + # + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python site-packages path" >&5 +$as_echo_n "checking for Python site-packages path... " >&6; } + if test -z "$PYTHON_SITE_PKG"; then + PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \ + print (distutils.sysconfig.get_python_lib(0,0));"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_SITE_PKG" >&5 +$as_echo "$PYTHON_SITE_PKG" >&6; } + # + # libraries which must be linked in when embedding + # + { $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra libraries" >&5 +$as_echo_n "checking python extra libraries... " >&6; } + if test -z "$PYTHON_EXTRA_LIBS"; then + PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ + conf = distutils.sysconfig.get_config_var; \ + print (conf('LIBS'))"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LIBS" >&5 +$as_echo "$PYTHON_EXTRA_LIBS" >&6; } - # Check whether --enable-geanyminiscript was given. -if test "${enable_geanyminiscript+set}" = set; then : - enableval=$enable_geanyminiscript; enable_geanyminiscript=$enableval -else - enable_geanyminiscript=yes -fi + # + # linking flags needed when embedding + # + { $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra linking flags" >&5 +$as_echo_n "checking python extra linking flags... " >&6; } + if test -z "$PYTHON_EXTRA_LDFLAGS"; then + PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \ + conf = distutils.sysconfig.get_config_var; \ + print (conf('LINKFORSHARED'))"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LDFLAGS" >&5 +$as_echo "$PYTHON_EXTRA_LDFLAGS" >&6; } + # + # final check to see if everything compiles alright + # + { $as_echo "$as_me:${as_lineno-$LINENO}: checking consistency of all components of python development environment" >&5 +$as_echo_n "checking consistency of all components of python development environment... " >&6; } + # save current global flags + ac_save_LIBS="$LIBS" + ac_save_CPPFLAGS="$CPPFLAGS" + LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS" + CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS" + 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 - if test "$enable_geanyminiscript" = "auto"; then - enable_geanyminiscript=yes - fi - if test "$enable_geanyminiscript" = yes; then - ENABLE_GEANYMINISCRIPT_TRUE= - ENABLE_GEANYMINISCRIPT_FALSE='#' + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include +int +main () +{ +Py_Initialize(); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + pythonexists=yes else - ENABLE_GEANYMINISCRIPT_TRUE='#' - ENABLE_GEANYMINISCRIPT_FALSE= + pythonexists=no fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + 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 + # turn back to default flags + CPPFLAGS="$ac_save_CPPFLAGS" + LIBS="$ac_save_LIBS" - plugins_statusmsg+="GeanyMiniScript:$enable_geanyminiscript -" - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pythonexists" >&5 +$as_echo "$pythonexists" >&6; } - ac_config_files="$ac_config_files geanyminiscript/Makefile geanyminiscript/src/Makefile" + if test ! "x$pythonexists" = "xyes"; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? " + Could not link test program to Python. Maybe the main Python library has been + installed in some non-standard library path. If so, pass it to configure, + via the LDFLAGS environment variable. + Example: ./configure LDFLAGS=\"-L/usr/non-standard-path/python/lib\" + ============================================================================ + ERROR! + You probably have to install the development version of the Python package + for your distribution. The exact name of this package varies among them. + ============================================================================ +See \`config.log' for more details" "$LINENO" 5; } + PYTHON_VERSION="" + fi + # + # all done! + # - # Check whether --enable-geanynumberedbookmarks was given. -if test "${enable_geanynumberedbookmarks+set}" = set; then : - enableval=$enable_geanynumberedbookmarks; enable_geanynumberedbookmarks=$enableval -else - enable_geanynumberedbookmarks=yes -fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python DSO location" >&5 +$as_echo_n "checking for Python DSO location... " >&6; } - if test "$enable_geanynumberedbookmarks" = "auto"; then - enable_geanynumberedbookmarks=yes - fi - if test "$enable_geanynumberedbookmarks" = yes; then - ENABLE_GEANYNUMBEREDBOOKMARKS_TRUE= - ENABLE_GEANYNUMBEREDBOOKMARKS_FALSE='#' -else - ENABLE_GEANYNUMBEREDBOOKMARKS_TRUE='#' - ENABLE_GEANYNUMBEREDBOOKMARKS_FALSE= -fi + ax_python_library=`cat << EOD | $PYTHON - 2>/dev/null +from distutils.sysconfig import get_config_vars +from os.path import join as path_join +cvars = get_config_vars() +# support multiarch-enabled distributions like Ubuntu +if not 'MULTIARCH' in cvars.keys(): + cvars['MULTIARCH'] = '' +print(path_join(cvars['LIBDIR'], cvars['MULTIARCH'], cvars['LDLIBRARY'])) +EOD` - plugins_statusmsg+="GeanyNumberedBookmarks:$enable_geanynumberedbookmarks -" + PYTHON_LIBRARY=$ax_python_library + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_LIBRARY" >&5 +$as_echo "$PYTHON_LIBRARY" >&6; } + if test -z "$ax_python_library"; then : + as_fn_error $? "Cannot find Python library" "$LINENO" 5 +fi - ac_config_files="$ac_config_files geanynumberedbookmarks/Makefile geanynumberedbookmarks/src/Makefile" +cat >>confdefs.h <<_ACEOF +#define GEANYPY_PYTHON_LIBRARY "$PYTHON_LIBRARY" +_ACEOF - # Check whether --enable-geanyprj was given. -if test "${enable_geanyprj+set}" = set; then : - enableval=$enable_geanyprj; enable_geanyprj=$enableval -else - enable_geanyprj=yes fi - - - if test "$enable_geanyprj" = "auto"; then - enable_geanyprj=yes + if test "$enable_geanypy" = "auto"; then + enable_geanypy=yes fi - if test "$enable_geanyprj" = yes; then - ENABLE_GEANYPRJ_TRUE= - ENABLE_GEANYPRJ_FALSE='#' + if test "$enable_geanypy" = yes; then + ENABLE_GEANYPY_TRUE= + ENABLE_GEANYPY_FALSE='#' else - ENABLE_GEANYPRJ_TRUE='#' - ENABLE_GEANYPRJ_FALSE= + ENABLE_GEANYPY_TRUE='#' + ENABLE_GEANYPY_FALSE= fi - plugins_statusmsg+="GeanyPrj:$enable_geanyprj + plugins_statusmsg+="Geanypy:$enable_geanypy " - ac_config_files="$ac_config_files geanyprj/Makefile geanyprj/src/Makefile geanyprj/tests/Makefile" + ac_config_files="$ac_config_files geanypy/Makefile geanypy/src/Makefile geanypy/geany/Makefile geanypy/plugins/Makefile" @@ -15455,7 +17168,31 @@ if test "${enable_geanyvc+set}" = set; then : enableval=$enable_geanyvc; enable_geanyvc=$enableval else - enable_geanyvc=yes + enable_geanyvc=auto +fi + + + + + + + if test "$enable_geanyvc" = no; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin GeanyVC" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin GeanyVC... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = 2; 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; } + if test "$enable_geanyvc" = yes; then : + as_fn_error $? "GeanyVC is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_geanyvc" = auto; then : + enable_geanyvc=no +fi +fi fi @@ -15795,7 +17532,7 @@ GPGME_LIBS=`$GPGME_CONFIG --libs` { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - enable_geanypg=yes + enable_geanypg=auto else GPGME_CFLAGS="" GPGME_LIBS="" @@ -15873,12 +17610,28 @@ fi - if test "$enable_geanypg" = "yes"; then - ENABLE_GEANYPG_TRUE= - ENABLE_GEANYPG_FALSE='#' + if test "$enable_geanypg" != "no"; then : + + for ac_func in fdopen +do : + ac_fn_c_check_func "$LINENO" "fdopen" "ac_cv_func_fdopen" +if test "x$ac_cv_func_fdopen" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_FDOPEN 1 +_ACEOF + else - ENABLE_GEANYPG_TRUE='#' - ENABLE_GEANYPG_FALSE= + + if test "$enable_geanypg" = "yes"; then : + as_fn_error $? "Could not find fdopen" "$LINENO" 5 +else + enable_geanypg=no +fi + +fi +done + + fi # necessary for gpgme @@ -15907,7 +17660,7 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -15953,7 +17706,7 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -15977,7 +17730,7 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -16022,7 +17775,7 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -16046,7 +17799,7 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -16115,6 +17868,34 @@ + + + gtk_dep=0 + if test $gtk_dep -ne 0; then + + + + if test "$enable_geniuspaste" = no; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin GeniusPaste" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin GeniusPaste... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = $gtk_dep; 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; } + if test "$enable_geniuspaste" = yes; then : + as_fn_error $? "GeniusPaste is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_geniuspaste" = auto; then : + enable_geniuspaste=no +fi +fi +fi + + fi + if test "$enable_geniuspaste" = "yes"; then pkg_failed=no @@ -16277,7 +18058,7 @@ GENIUSPASTE_LIBS=$pkg_cv_GENIUSPASTE_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - enable_geniuspaste=yes + fi fi @@ -16309,7 +18090,7 @@ if test "${enable_gproject+set}" = set; then : enableval=$enable_gproject; enable_gproject=$enableval else - enable_gproject=yes + enable_gproject=auto fi @@ -16466,13 +18247,50 @@ markdown_library=libmarkdown fi - feature_statusmsg+="Markdown library:$markdown_library -" - - - GTK_VERSION=2.16 - WEBKIT_VERSION=1.1.13 - + feature_statusmsg+="Markdown library:$markdown_library +" + + + GTK_VERSION=2.16 + WEBKIT_VERSION=1.1.13 + + + + if test ${GP_GTK_VERSION_MAJOR} = 3; then : + webkit_package=webkitgtk-3.0 +else + webkit_package=webkit-1.0 +fi + + + + + + gtk_dep=0 + if test $gtk_dep -ne 0; then + + + + if test "$enable_markdown" = no; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin markdown" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin markdown... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = $gtk_dep; 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; } + if test "$enable_markdown" = yes; then : + as_fn_error $? "markdown is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_markdown" = auto; then : + enable_markdown=no +fi +fi +fi + + fi if test "$enable_markdown" = "yes"; then @@ -16484,17 +18302,17 @@ pkg_cv_MARKDOWN_CFLAGS="$MARKDOWN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_VERSION} - webkit-1.0 >= \${WEBKIT_VERSION} + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= \${GTK_VERSION} + \$webkit_package >= \${WEBKIT_VERSION} gthread-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= ${GTK_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_MARKDOWN_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + pkg_cv_MARKDOWN_CFLAGS=`$PKG_CONFIG --cflags "$GP_GTK_PACKAGE >= ${GTK_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -16507,17 +18325,17 @@ pkg_cv_MARKDOWN_LIBS="$MARKDOWN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_VERSION} - webkit-1.0 >= \${WEBKIT_VERSION} + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= \${GTK_VERSION} + \$webkit_package >= \${WEBKIT_VERSION} gthread-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= ${GTK_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_MARKDOWN_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + pkg_cv_MARKDOWN_LIBS=`$PKG_CONFIG --libs "$GP_GTK_PACKAGE >= ${GTK_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -16539,19 +18357,19 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MARKDOWN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + MARKDOWN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GP_GTK_PACKAGE >= ${GTK_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0" 2>&1` else - MARKDOWN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + MARKDOWN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GP_GTK_PACKAGE >= ${GTK_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$MARKDOWN_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + as_fn_error $? "Package requirements ($GP_GTK_PACKAGE >= ${GTK_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0) were not met: $MARKDOWN_PKG_ERRORS @@ -16594,17 +18412,17 @@ pkg_cv_MARKDOWN_CFLAGS="$MARKDOWN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_VERSION} - webkit-1.0 >= \${WEBKIT_VERSION} + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= \${GTK_VERSION} + \$webkit_package >= \${WEBKIT_VERSION} gthread-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= ${GTK_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_MARKDOWN_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + pkg_cv_MARKDOWN_CFLAGS=`$PKG_CONFIG --cflags "$GP_GTK_PACKAGE >= ${GTK_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -16617,17 +18435,17 @@ pkg_cv_MARKDOWN_LIBS="$MARKDOWN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_VERSION} - webkit-1.0 >= \${WEBKIT_VERSION} + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= \${GTK_VERSION} + \$webkit_package >= \${WEBKIT_VERSION} gthread-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= ${GTK_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_MARKDOWN_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + pkg_cv_MARKDOWN_LIBS=`$PKG_CONFIG --libs "$GP_GTK_PACKAGE >= ${GTK_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -16649,12 +18467,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MARKDOWN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + MARKDOWN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GP_GTK_PACKAGE >= ${GTK_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0" 2>&1` else - MARKDOWN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= ${GTK_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + MARKDOWN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GP_GTK_PACKAGE >= ${GTK_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -16670,7 +18488,7 @@ MARKDOWN_LIBS=$pkg_cv_MARKDOWN_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - enable_markdown=yes + fi fi @@ -16736,6 +18554,7 @@ done IFS=$as_save_IFS + test -z "$ac_cv_path_VALAC" && ac_cv_path_VALAC="valac" ;; esac fi @@ -16749,13 +18568,9 @@ fi - if test -z "$VALAC"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Vala compiler found. You will not be able to compile .vala source files." >&5 -$as_echo "$as_me: WARNING: No Vala compiler found. You will not be able to compile .vala source files." >&2;} -else - if test -n "0.7.0"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking $VALAC is at least version 0.7.0" >&5 -$as_echo_n "checking $VALAC is at least version 0.7.0... " >&6; } + if test "$VALAC" != valac && test -n "0.7.0"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $VALAC is at least version 0.7.0" >&5 +$as_echo_n "checking whether $VALAC is at least version 0.7.0... " >&6; } am__vala_version=`$VALAC --version | sed 's/Vala *//'` as_arg_v1=0.7.0 as_arg_v2="$am__vala_version" @@ -16770,13 +18585,19 @@ 2) : { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "Vala 0.7.0 not found." "$LINENO" 5 ;; #( + VALAC=valac ;; #( *) : ;; esac fi -fi - + if test "$VALAC" = valac; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no proper vala compiler found" >&5 +$as_echo "$as_me: WARNING: no proper vala compiler found" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: you will not be able to compile vala source files" >&5 +$as_echo "$as_me: WARNING: you will not be able to compile vala source files" >&2;} + else + : + fi if test "$VALAC" = ""; then : if test "$enable_multiterm" = "auto"; then : enable_multiterm=no @@ -16787,6 +18608,34 @@ fi + + + gtk_dep=2 + if test $gtk_dep -ne 0; then + + + + if test "$enable_multiterm" = no; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin multiterm" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin multiterm... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = $gtk_dep; 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; } + if test "$enable_multiterm" = yes; then : + as_fn_error $? "multiterm is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_multiterm" = auto; then : + enable_multiterm=no +fi +fi +fi + + fi + if test "$enable_multiterm" = "yes"; then pkg_failed=no @@ -16949,7 +18798,7 @@ MULTITERM_LIBS=$pkg_cv_MULTITERM_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - enable_multiterm=yes + fi fi @@ -16975,6 +18824,68 @@ + + # Check whether --enable-pairtaghighlighter was given. +if test "${enable_pairtaghighlighter+set}" = set; then : + enableval=$enable_pairtaghighlighter; enable_pairtaghighlighter=$enableval +else + enable_pairtaghighlighter=auto +fi + + + + if test "$enable_pairtaghighlighter" = "auto"; then + enable_pairtaghighlighter=yes + fi + if test "$enable_pairtaghighlighter" = yes; then + ENABLE_PAIRTAGHIGHLIGHTER_TRUE= + ENABLE_PAIRTAGHIGHLIGHTER_FALSE='#' +else + ENABLE_PAIRTAGHIGHLIGHTER_TRUE='#' + ENABLE_PAIRTAGHIGHLIGHTER_FALSE= +fi + + + plugins_statusmsg+="PairTagHighlighter:$enable_pairtaghighlighter +" + + + ac_config_files="$ac_config_files pairtaghighlighter/Makefile pairtaghighlighter/src/Makefile" + + + + + # Check whether --enable-pohelper was given. +if test "${enable_pohelper+set}" = set; then : + enableval=$enable_pohelper; enable_pohelper=$enableval +else + enable_pohelper=yes +fi + + + + + if test "$enable_pohelper" = "auto"; then + enable_pohelper=yes + fi + if test "$enable_pohelper" = yes; then + ENABLE_POHELPER_TRUE= + ENABLE_POHELPER_FALSE='#' +else + ENABLE_POHELPER_TRUE='#' + ENABLE_POHELPER_FALSE= +fi + + + plugins_statusmsg+="PoHelper:$enable_pohelper +" + + + + ac_config_files="$ac_config_files pohelper/Makefile pohelper/data/Makefile pohelper/src/Makefile" + + + LIBXML_VERSION=2.6.27 @@ -16987,6 +18898,34 @@ + + + gtk_dep=0 + if test $gtk_dep -ne 0; then + + + + if test "$enable_pretty_printer" = no; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin pretty-printer" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin pretty-printer... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = $gtk_dep; 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; } + if test "$enable_pretty_printer" = yes; then : + as_fn_error $? "pretty-printer is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_pretty_printer" = auto; then : + enable_pretty_printer=no +fi +fi +fi + + fi + if test "$enable_pretty_printer" = "yes"; then pkg_failed=no @@ -17149,7 +19088,7 @@ LIBXML_LIBS=$pkg_cv_LIBXML_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - enable_pretty_printer=yes + fi fi @@ -17186,6 +19125,58 @@ + + + if test "$enable_scope" = no; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin Scope" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin Scope... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = 2; 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; } + if test "$enable_scope" = yes; then : + as_fn_error $? "Scope is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_scope" = auto; then : + enable_scope=no +fi +fi +fi + + + + + + + gtk_dep=0 + if test $gtk_dep -ne 0; then + + + + if test "$enable_scope" = no; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin scope" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin scope... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = $gtk_dep; 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; } + if test "$enable_scope" = yes; then : + as_fn_error $? "scope is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_scope" = auto; then : + enable_scope=no +fi +fi +fi + + fi + if test "$enable_scope" = "yes"; then pkg_failed=no @@ -17348,7 +19339,7 @@ VTE_LIBS=$pkg_cv_VTE_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - enable_scope=yes + fi fi @@ -17496,6 +19487,34 @@ have_enchant_1_5=yes fi + + + gtk_dep=0 + if test $gtk_dep -ne 0; then + + + + if test "$enable_spellcheck" = no; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin spellcheck" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin spellcheck... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = $gtk_dep; 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; } + if test "$enable_spellcheck" = yes; then : + as_fn_error $? "spellcheck is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_spellcheck" = auto; then : + enable_spellcheck=no +fi +fi +fi + + fi + if test "$enable_spellcheck" = "yes"; then pkg_failed=no @@ -17658,7 +19677,7 @@ ENCHANT_LIBS=$pkg_cv_ENCHANT_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - enable_spellcheck=yes + fi fi @@ -17870,6 +19889,34 @@ + + + gtk_dep=0 + if test $gtk_dep -ne 0; then + + + + if test "$enable_updatechecker" = no; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin Updatechecker" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin Updatechecker... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = $gtk_dep; 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; } + if test "$enable_updatechecker" = yes; then : + as_fn_error $? "Updatechecker is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_updatechecker" = auto; then : + enable_updatechecker=no +fi +fi +fi + + fi + if test "$enable_updatechecker" = "yes"; then pkg_failed=no @@ -18032,7 +20079,7 @@ UPDATECHECKER_LIBS=$pkg_cv_UPDATECHECKER_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - enable_updatechecker=yes + fi fi @@ -18126,6 +20173,42 @@ fi + + if test ${GP_GTK_VERSION_MAJOR} = 3; then : + webkit_package=webkitgtk-3.0 +else + webkit_package=webkit-1.0 +fi + + + + + gtk_dep=0 + if test $gtk_dep -ne 0; then + + + + if test "$enable_webhelper" = no; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GTK version in use is compatible with plugin WebHelper" >&5 +$as_echo_n "checking whether the GTK version in use is compatible with plugin WebHelper... " >&6; } + if test ${GP_GTK_VERSION_MAJOR} = $gtk_dep; 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; } + if test "$enable_webhelper" = yes; then : + as_fn_error $? "WebHelper is not compatible with the GTK version in use" "$LINENO" 5 +elif test "$enable_webhelper" = auto; then : + enable_webhelper=no +fi +fi +fi + + fi + if test "$enable_webhelper" = "yes"; then pkg_failed=no @@ -18136,26 +20219,26 @@ pkg_cv_WEBHELPER_CFLAGS="$WEBHELPER_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_VERSION} + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= \${GTK_VERSION} glib-2.0 >= \${GLIB_VERSION} gio-2.0 >= \${GIO_VERSION} gdk-pixbuf-2.0 >= \${GDK_PIXBUF_VERSION} - webkit-1.0 >= \${WEBKIT_VERSION} + \$webkit_package >= \${WEBKIT_VERSION} gthread-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_VERSION} + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= ${GTK_VERSION} glib-2.0 >= ${GLIB_VERSION} gio-2.0 >= ${GIO_VERSION} gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_WEBHELPER_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= ${GTK_VERSION} + pkg_cv_WEBHELPER_CFLAGS=`$PKG_CONFIG --cflags "$GP_GTK_PACKAGE >= ${GTK_VERSION} glib-2.0 >= ${GLIB_VERSION} gio-2.0 >= ${GIO_VERSION} gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -18168,26 +20251,26 @@ pkg_cv_WEBHELPER_LIBS="$WEBHELPER_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_VERSION} + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= \${GTK_VERSION} glib-2.0 >= \${GLIB_VERSION} gio-2.0 >= \${GIO_VERSION} gdk-pixbuf-2.0 >= \${GDK_PIXBUF_VERSION} - webkit-1.0 >= \${WEBKIT_VERSION} + \$webkit_package >= \${WEBKIT_VERSION} gthread-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_VERSION} + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= ${GTK_VERSION} glib-2.0 >= ${GLIB_VERSION} gio-2.0 >= ${GIO_VERSION} gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_WEBHELPER_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= ${GTK_VERSION} + pkg_cv_WEBHELPER_LIBS=`$PKG_CONFIG --libs "$GP_GTK_PACKAGE >= ${GTK_VERSION} glib-2.0 >= ${GLIB_VERSION} gio-2.0 >= ${GIO_VERSION} gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -18209,28 +20292,28 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - WEBHELPER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= ${GTK_VERSION} + WEBHELPER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GP_GTK_PACKAGE >= ${GTK_VERSION} glib-2.0 >= ${GLIB_VERSION} gio-2.0 >= ${GIO_VERSION} gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0" 2>&1` else - WEBHELPER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= ${GTK_VERSION} + WEBHELPER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GP_GTK_PACKAGE >= ${GTK_VERSION} glib-2.0 >= ${GLIB_VERSION} gio-2.0 >= ${GIO_VERSION} gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$WEBHELPER_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gtk+-2.0 >= ${GTK_VERSION} + as_fn_error $? "Package requirements ($GP_GTK_PACKAGE >= ${GTK_VERSION} glib-2.0 >= ${GLIB_VERSION} gio-2.0 >= ${GIO_VERSION} gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0) were not met: $WEBHELPER_PKG_ERRORS @@ -18273,26 +20356,26 @@ pkg_cv_WEBHELPER_CFLAGS="$WEBHELPER_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_VERSION} + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= \${GTK_VERSION} glib-2.0 >= \${GLIB_VERSION} gio-2.0 >= \${GIO_VERSION} gdk-pixbuf-2.0 >= \${GDK_PIXBUF_VERSION} - webkit-1.0 >= \${WEBKIT_VERSION} + \$webkit_package >= \${WEBKIT_VERSION} gthread-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_VERSION} + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= ${GTK_VERSION} glib-2.0 >= ${GLIB_VERSION} gio-2.0 >= ${GIO_VERSION} gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_WEBHELPER_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= ${GTK_VERSION} + pkg_cv_WEBHELPER_CFLAGS=`$PKG_CONFIG --cflags "$GP_GTK_PACKAGE >= ${GTK_VERSION} glib-2.0 >= ${GLIB_VERSION} gio-2.0 >= ${GIO_VERSION} gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -18305,26 +20388,26 @@ pkg_cv_WEBHELPER_LIBS="$WEBHELPER_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_VERSION} + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GP_GTK_PACKAGE >= \${GTK_VERSION} glib-2.0 >= \${GLIB_VERSION} gio-2.0 >= \${GIO_VERSION} gdk-pixbuf-2.0 >= \${GDK_PIXBUF_VERSION} - webkit-1.0 >= \${WEBKIT_VERSION} + \$webkit_package >= \${WEBKIT_VERSION} gthread-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_VERSION} + ($PKG_CONFIG --exists --print-errors "$GP_GTK_PACKAGE >= ${GTK_VERSION} glib-2.0 >= ${GLIB_VERSION} gio-2.0 >= ${GIO_VERSION} gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_WEBHELPER_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= ${GTK_VERSION} + pkg_cv_WEBHELPER_LIBS=`$PKG_CONFIG --libs "$GP_GTK_PACKAGE >= ${GTK_VERSION} glib-2.0 >= ${GLIB_VERSION} gio-2.0 >= ${GIO_VERSION} gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -18346,18 +20429,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - WEBHELPER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= ${GTK_VERSION} + WEBHELPER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GP_GTK_PACKAGE >= ${GTK_VERSION} glib-2.0 >= ${GLIB_VERSION} gio-2.0 >= ${GIO_VERSION} gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0" 2>&1` else - WEBHELPER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= ${GTK_VERSION} + WEBHELPER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GP_GTK_PACKAGE >= ${GTK_VERSION} glib-2.0 >= ${GLIB_VERSION} gio-2.0 >= ${GIO_VERSION} gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} + $webkit_package >= ${WEBKIT_VERSION} gthread-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -18373,7 +20456,7 @@ WEBHELPER_LIBS=$pkg_cv_WEBHELPER_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - enable_webhelper=yes + fi fi @@ -18542,6 +20625,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='#' @@ -18574,6 +20665,10 @@ as_fn_error $? "conditional \"UNITTESTS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${GP_GTK3_TRUE}" && test -z "${GP_GTK3_FALSE}"; then + as_fn_error $? "conditional \"GP_GTK3\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_CPPCHECK_TRUE}" && test -z "${HAVE_CPPCHECK_FALSE}"; then as_fn_error $? "conditional \"HAVE_CPPCHECK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18582,6 +20677,10 @@ as_fn_error $? "conditional \"ENABLE_ADDONS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_AUTOCLOSE_TRUE}" && test -z "${ENABLE_AUTOCLOSE_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_AUTOCLOSE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_CODENAV_TRUE}" && test -z "${ENABLE_CODENAV_FALSE}"; then as_fn_error $? "conditional \"ENABLE_CODENAV\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18594,6 +20693,10 @@ as_fn_error $? "conditional \"ENABLE_DEBUGGER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_DEFINEFORMAT_TRUE}" && test -z "${ENABLE_DEFINEFORMAT_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_DEFINEFORMAT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_DEVHELP_TRUE}" && test -z "${ENABLE_DEVHELP_FALSE}"; then as_fn_error $? "conditional \"ENABLE_DEVHELP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18646,6 +20749,10 @@ as_fn_error $? "conditional \"ENABLE_GEANYPRJ\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_GEANYPY_TRUE}" && test -z "${ENABLE_GEANYPY_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_GEANYPY\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_GEANYSENDMAIL_TRUE}" && test -z "${ENABLE_GEANYSENDMAIL_FALSE}"; then as_fn_error $? "conditional \"ENABLE_GEANYSENDMAIL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18658,10 +20765,6 @@ as_fn_error $? "conditional \"ENABLE_GEANYPG\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${ENABLE_GEANYPG_TRUE}" && test -z "${ENABLE_GEANYPG_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_GEANYPG\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${ENABLE_GENIUSPASTE_TRUE}" && test -z "${ENABLE_GENIUSPASTE_FALSE}"; then as_fn_error $? "conditional \"ENABLE_GENIUSPASTE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18682,6 +20785,14 @@ as_fn_error $? "conditional \"ENABLE_MULTITERM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_PAIRTAGHIGHLIGHTER_TRUE}" && test -z "${ENABLE_PAIRTAGHIGHLIGHTER_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_PAIRTAGHIGHLIGHTER\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${ENABLE_POHELPER_TRUE}" && test -z "${ENABLE_POHELPER_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_POHELPER\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_PRETTY_PRINTER_TRUE}" && test -z "${ENABLE_PRETTY_PRINTER_FALSE}"; then as_fn_error $? "conditional \"ENABLE_PRETTY_PRINTER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19123,7 +21234,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by geany-plugins $as_me 1.23, which was +This file was extended by geany-plugins $as_me 1.24, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19189,7 +21300,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -geany-plugins config.status 1.23 +geany-plugins config.status 1.24 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -19602,6 +21713,8 @@ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "addons/Makefile") CONFIG_FILES="$CONFIG_FILES addons/Makefile" ;; "addons/src/Makefile") CONFIG_FILES="$CONFIG_FILES addons/src/Makefile" ;; + "autoclose/Makefile") CONFIG_FILES="$CONFIG_FILES autoclose/Makefile" ;; + "autoclose/src/Makefile") CONFIG_FILES="$CONFIG_FILES autoclose/src/Makefile" ;; "codenav/Makefile") CONFIG_FILES="$CONFIG_FILES codenav/Makefile" ;; "codenav/src/Makefile") CONFIG_FILES="$CONFIG_FILES codenav/src/Makefile" ;; "commander/Makefile") CONFIG_FILES="$CONFIG_FILES commander/Makefile" ;; @@ -19609,6 +21722,8 @@ "debugger/Makefile") CONFIG_FILES="$CONFIG_FILES debugger/Makefile" ;; "debugger/src/Makefile") CONFIG_FILES="$CONFIG_FILES debugger/src/Makefile" ;; "debugger/img/Makefile") CONFIG_FILES="$CONFIG_FILES debugger/img/Makefile" ;; + "defineformat/Makefile") CONFIG_FILES="$CONFIG_FILES defineformat/Makefile" ;; + "defineformat/src/Makefile") CONFIG_FILES="$CONFIG_FILES defineformat/src/Makefile" ;; "devhelp/Makefile") CONFIG_FILES="$CONFIG_FILES devhelp/Makefile" ;; "devhelp/devhelp/Makefile") CONFIG_FILES="$CONFIG_FILES devhelp/devhelp/Makefile" ;; "devhelp/src/Makefile") CONFIG_FILES="$CONFIG_FILES devhelp/src/Makefile" ;; @@ -19647,6 +21762,10 @@ "geanyprj/Makefile") CONFIG_FILES="$CONFIG_FILES geanyprj/Makefile" ;; "geanyprj/src/Makefile") CONFIG_FILES="$CONFIG_FILES geanyprj/src/Makefile" ;; "geanyprj/tests/Makefile") CONFIG_FILES="$CONFIG_FILES geanyprj/tests/Makefile" ;; + "geanypy/Makefile") CONFIG_FILES="$CONFIG_FILES geanypy/Makefile" ;; + "geanypy/src/Makefile") CONFIG_FILES="$CONFIG_FILES geanypy/src/Makefile" ;; + "geanypy/geany/Makefile") CONFIG_FILES="$CONFIG_FILES geanypy/geany/Makefile" ;; + "geanypy/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES geanypy/plugins/Makefile" ;; "geanysendmail/Makefile") CONFIG_FILES="$CONFIG_FILES geanysendmail/Makefile" ;; "geanysendmail/src/Makefile") CONFIG_FILES="$CONFIG_FILES geanysendmail/src/Makefile" ;; "geanyvc/Makefile") CONFIG_FILES="$CONFIG_FILES geanyvc/Makefile" ;; @@ -19666,6 +21785,11 @@ "markdown/peg-markdown/peg-0.1.9/Makefile") CONFIG_FILES="$CONFIG_FILES markdown/peg-markdown/peg-0.1.9/Makefile" ;; "multiterm/Makefile") CONFIG_FILES="$CONFIG_FILES multiterm/Makefile" ;; "multiterm/src/Makefile") CONFIG_FILES="$CONFIG_FILES multiterm/src/Makefile" ;; + "pairtaghighlighter/Makefile") CONFIG_FILES="$CONFIG_FILES pairtaghighlighter/Makefile" ;; + "pairtaghighlighter/src/Makefile") CONFIG_FILES="$CONFIG_FILES pairtaghighlighter/src/Makefile" ;; + "pohelper/Makefile") CONFIG_FILES="$CONFIG_FILES pohelper/Makefile" ;; + "pohelper/data/Makefile") CONFIG_FILES="$CONFIG_FILES pohelper/data/Makefile" ;; + "pohelper/src/Makefile") CONFIG_FILES="$CONFIG_FILES pohelper/src/Makefile" ;; "pretty-printer/Makefile") CONFIG_FILES="$CONFIG_FILES pretty-printer/Makefile" ;; "pretty-printer/src/Makefile") CONFIG_FILES="$CONFIG_FILES pretty-printer/src/Makefile" ;; "scope/Makefile") CONFIG_FILES="$CONFIG_FILES scope/Makefile" ;; @@ -20285,7 +22409,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 @@ -20298,7 +22422,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. @@ -20332,21 +22456,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" || @@ -21106,7 +23228,7 @@ ${PACKAGE}-${VERSION} Build Environment: - Geany version: ${GEANY_VERSION} + Geany version: ${GEANY_VERSION} (GTK${GP_GTK_VERSION_MAJOR}) Install prefix: ${prefix} Datadir: ${expanded_datadir}/${PACKAGE_TARNAME} Libdir: ${expanded_libdir}/${PACKAGE_TARNAME} diff -Nru geany-plugins-1.23+dfsg/configure.ac geany-plugins-1.24+dfsg/configure.ac --- geany-plugins-1.23+dfsg/configure.ac 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/configure.ac 2014-04-12 14:28:39.000000000 +0000 @@ -1,6 +1,6 @@ AC_PREREQ([2.61]) dnl Don't forget when updating version number to do GP_CHECK_GEANY also -AC_INIT([geany-plugins], [1.23]) +AC_INIT([geany-plugins], [1.24]) AM_INIT_AUTOMAKE([1.8 foreign dist-bzip2 tar-ustar]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) @@ -18,16 +18,19 @@ GP_I18N dnl common checks -GP_CHECK_GEANY(1.23) +GP_CHECK_GEANY(1.24) GP_CHECK_UNITTESTS(0.9.4) +GP_CHECK_GTK_VERSION GP_CHECK_CPPCHECK GP_CHECK_CFLAGS dnl plugin checks GP_CHECK_ADDONS +GP_CHECK_AUTOCLOSE GP_CHECK_CODENAV GP_CHECK_COMMANDER GP_CHECK_DEBUGGER +GP_CHECK_DEFINEFORMAT GP_CHECK_DEVHELP GP_CHECK_GEANYDOC GP_CHECK_GEANYEXTRASEL @@ -40,6 +43,7 @@ GP_CHECK_GEANYMINISCRIPT GP_CHECK_GEANYNUMBEREDBOOKMARKS GP_CHECK_GEANYPRJ +GP_CHECK_GEANYPY GP_CHECK_GEANYSENDMAIL GP_CHECK_GEANYVC GP_CHECK_GEANYPG @@ -47,6 +51,8 @@ GP_CHECK_GPROJECT GP_CHECK_MARKDOWN GP_CHECK_MULTITERM +GP_CHECK_PAIRTAGHIGHLIGHTER +GP_CHECK_POHELPER GP_CHECK_PRETTYPRINTER GP_CHECK_SCOPE GP_CHECK_SHIFTCOLUMN diff -Nru geany-plugins-1.23+dfsg/debian/changelog geany-plugins-1.24+dfsg/debian/changelog --- geany-plugins-1.23+dfsg/debian/changelog 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/changelog 2014-05-20 07:24:31.000000000 +0000 @@ -1,3 +1,65 @@ +geany-plugins (1.24+dfsg-2~hyper1+quantal1) quantal; urgency=medium + + * Backport to quantal + + -- Chow Loong Jin Tue, 20 May 2014 15:22:31 +0800 + +geany-plugins (1.24+dfsg-2~hyper1+raring1) raring; urgency=medium + + * Backport to raring + + -- Chow Loong Jin Tue, 20 May 2014 12:32:44 +0800 + +geany-plugins (1.24+dfsg-2~hyper1+saucy1) saucy; urgency=medium + + * Backport to saucy + + -- Chow Loong Jin Tue, 20 May 2014 10:50:31 +0800 + +geany-plugins (1.24+dfsg-2~hyper1+trusty1) trusty; urgency=medium + + * Backport to trusty + + -- Chow Loong Jin Tue, 20 May 2014 10:19:26 +0800 + +geany-plugins (1.24+dfsg-2) unstable; urgency=medium + + [ Chow Loong Jin ] + * [6e4e828] Add --enable flags for new plugins + + [ Evgeni Golov ] + * [431a28d] add python-gtk2-dev B-D, needed for geanypy + * [f2dc92e] add package definitions for the new plugins + * [10567a7] properly link geanypy against gmodule, patch by upstream + * [de7dfab] add the new plugins to debian/copyright + * [988f71a] use canonical git urls + * [c1e261c] Standards-Version: 3.9.5 + * [6fa8471] it's Perl and Python, not perl and python + * [a0558cb] remove unused lintian overrides + * [88ee768] fix compilation on GNU/Hurd + + -- Chow Loong Jin Tue, 22 Apr 2014 18:55:08 +0200 + +geany-plugins (1.24+dfsg-1) unstable; urgency=medium + + [ Evgeni Golov ] + * [0aa0db1] add signature check for downloads + * [f152c29] Imported Upstream version 1.24+dfsg + * [4e0e7f4] we need gean 1.24 to build geany-plugins 1.24 + + [ Chow Loong Jin ] + * [ccfcba3] Use small compiled program to dump GEANY_ABI and GEANY_API. + Geany 1.24.1 contains a GEANY_ABI that isn't just a simple integer -- it's an + expression that needs to be resolved now. + + -- Chow Loong Jin Sun, 20 Apr 2014 01:34:06 +0800 + +geany-plugins (1.23+dfsg-3) unstable; urgency=low + + * No-change upload to unstable now that freeze is over + + -- Chow Loong Jin Fri, 10 May 2013 15:45:38 +0800 + geany-plugins (1.23+dfsg-2~hyper1+quantal) quantal; urgency=low * Backport to quantal diff -Nru geany-plugins-1.23+dfsg/debian/cleanfiles geany-plugins-1.24+dfsg/debian/cleanfiles --- geany-plugins-1.23+dfsg/debian/cleanfiles 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/cleanfiles 2014-05-20 07:24:31.000000000 +0000 @@ -0,0 +1,2 @@ +debian/dumpabiver +debian/abiversion.sh diff -Nru geany-plugins-1.23+dfsg/debian/control geany-plugins-1.24+dfsg/debian/control --- geany-plugins-1.23+dfsg/debian/control 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/control 2014-05-20 07:24:31.000000000 +0000 @@ -8,7 +8,7 @@ dh-autoreconf (>= 4), autotools-dev, intltool (>= 0.35), - geany (>= 1.23), + geany (>= 1.24), libgtk2.0-dev (>= 2.16), libglib2.0-dev (>= 2.18), libenchant-dev (>= 1.3), @@ -25,18 +25,21 @@ libwnck-dev (>= 2.10.0), libgconf2-dev (>= 2.6.0), libmarkdown2-dev, + python-gtk2-dev, valac (>= 0.7.0) -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Homepage: http://plugins.geany.org -Vcs-Git: git://git.debian.org/git/pkg-geany/packages/geany-plugins.git -Vcs-Browser: http://git.debian.org/?p=pkg-geany/packages/geany-plugins.git +Vcs-Git: git://anonscm.debian.org/pkg-geany/packages/geany-plugins.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-geany/packages/geany-plugins.git Package: geany-plugins Architecture: all Enhances: geany Depends: geany-plugin-addons (>= ${source:Version}), + geany-plugin-autoclose (>= ${source:Version}), geany-plugin-codenav (>= ${source:Version}), geany-plugin-debugger (>= ${source:Version}), + geany-plugin-defineformat (>= ${source:Version}), geany-plugin-devhelp (>= ${source:Version}), geany-plugin-doc (>= ${source:Version}), geany-plugin-extrasel (>= ${source:Version}), @@ -51,8 +54,11 @@ geany-plugin-miniscript (>= ${source:Version}), geany-plugin-multiterm (>= ${source:Version}), geany-plugin-numberedbookmarks (>= ${source:Version}), + geany-plugin-pairtaghighlighter (>= ${source:Version}), geany-plugin-pg (>= ${source:Version}), + geany-plugin-pohelper (>= ${source:Version}), geany-plugin-prj (>= ${source:Version}), + geany-plugin-py (>= ${source:Version}), geany-plugin-sendmail (>= ${source:Version}), geany-plugin-tableconvert (>= ${source:Version}), geany-plugin-vc (>= ${source:Version}), @@ -115,6 +121,41 @@ Geany is a small and lightweight integrated development environment using the Gtk+ toolkit. +Package: geany-plugin-autoclose +Enhances: geany +Architecture: any +Depends: ${geany:ABI}, geany-plugins-common (= ${source:Version}), + ${shlibs:Depends}, ${misc:Depends} +Description: auto-closing plugin for Geany + This plugin enables auto-closing features. Auto-closing works while you typing + and intellectually helps you to write code. + . + Features: + * auto-close for: { }, [ ], ( ), " ", ' ', < >, ` ` + * customizeable auto-closing inside strings and comments + * delete pairing character if you pressed BackSpace + * suppress inserting one char twice (if you type "{}" you will get "{}", not + "{}}") + * enclose selected text into brackets instead of removing selection (select + text and type "(" or ")" to enclose selection into "()") + * keep selection when enclosing + * for C-like languages enclosing selection into "{}" makes auto-indentation + (select text and type "{" or "}" - text will be enclosed and indented) + * enclosing in {} moves cursor to beginning (before "{" character) + * for C-like languages to insert {}-block you do not need to select text + precisely: plugin detects boundaries automatically, just ensure that + selection covers lines you need to indent (works like TAB indentation) + * fix auto-indent inside {} (makes full indent for this block) + * auto-close curly bracket by pressing Enter + * auto-close functions (``"sin(|" -> "sin(|);"``) with doubling suppression + (for C/C++ languages only) + * remove paring brace when pressing Shift+BackSpace, unindent {}-blocks + * add semicolon after ``struct {|};`` and ``class {|};`` + * move cursor to closed char by pressing Tab + . + Geany is a small and lightweight integrated development environment using the + Gtk+ toolkit. + Package: geany-plugin-codenav Enhances: geany Architecture: any @@ -162,6 +203,17 @@ Geany is a small and lightweight integrated development environment using the Gtk+ toolkit. +Package: geany-plugin-defineformat +Enhances: geany +Architecture: any +Depends: ${geany:ABI}, geany-plugins-common (= ${source:Version}), + ${shlibs:Depends}, ${misc:Depends} +Description: on-the-fly #define prettyprinter plugin for Geany + This plugin will help you to write multiline defines with aligned backslash. + . + Geany is a small and lightweight integrated development environment using the + Gtk+ toolkit. + Package: geany-plugin-devhelp Enhances: geany Architecture: any @@ -358,8 +410,8 @@ . The filter type can be: - Unix shell script, - - perl script, - - python script, + - Perl script, + - Python script, - sed commands, - awk script. . @@ -400,6 +452,18 @@ Geany is a small and lightweight integrated development environment using the Gtk+ toolkit. +Package: geany-plugin-pairtaghighlighter +Enhances: geany +Architecture: any +Depends: ${geany:ABI}, geany-plugins-common (= ${source:Version}), + ${shlibs:Depends}, ${misc:Depends} +Description: tag pair highlighter plugin for Geany + Finds and highlights matching opening/closing HTML tag by clicking or + moving cursor inside a tag. + . + Geany is a small and lightweight integrated development environment using the + Gtk+ toolkit. + Package: geany-plugin-pg Enhances: geany Architecture: any @@ -412,6 +476,25 @@ Geany is a small and lightweight integrated development environment using the Gtk+ toolkit. +Package: geany-plugin-pohelper +Enhances: geany +Architecture: any +Depends: ${geany:ABI}, geany-plugins-common (= ${source:Version}), + ${shlibs:Depends}, ${misc:Depends} +Description: Geany plugin for improved support for GetText translation files + Pohelper is a plugin for Geany that improves the support for + GetText translation files + . + Features: + * Navigation between all, untranslated or fuzzy messages + * Reformatting of the translation (reflow) + * Toggling the fuzziness of a translation + * Pasting of the untranslated string to the translation + * Automatic updating of the translation metadata + . + Geany is a small and lightweight integrated development environment using the + Gtk+ toolkit. + Package: geany-plugin-prj Enhances: geany Architecture: any @@ -426,6 +509,18 @@ Geany is a small and lightweight integrated development environment using the GTK+ toolkit. +Package: geany-plugin-py +Enhances: geany +Architecture: any +Depends: ${geany:ABI}, geany-plugins-common (= ${source:Version}), + ${shlibs:Depends}, ${misc:Depends} +Description: Python bindings for the Geany plugin API + GeanyPy allows people to write their Geany plugins in Python making + authoring a plugin much more accessible to non C programmers. + . + Geany is a small and lightweight integrated development environment using the + Gtk+ toolkit. + Package: geany-plugin-scope Enhances: geany Architecture: any diff -Nru geany-plugins-1.23+dfsg/debian/copyright geany-plugins-1.24+dfsg/debian/copyright --- geany-plugins-1.23+dfsg/debian/copyright 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/copyright 2014-05-20 07:24:31.000000000 +0000 @@ -9,6 +9,10 @@ 2009 Eugene Arshinov License: GPL-2+ +Files: autoclose/* defineformat/* +Copyright: 2013-2014 Pavel Roschin +License: GPL-2+ + Files: build/* configure.ac */Makefile.am @@ -105,6 +109,15 @@ 2007, Frank Lanitz License: GPL-3+ +Files: geanypy/* +Copyright: 2011-2014 Matthew Brush + 2014 Lex Trotman +License: GPL-2+ + +Files: geanypy/geany/console.py +Copyright: 2004-2010 by Yevgen Muntyan +License: LGPL-2.1+ + Files: geanysendmail/* Copyright: 2007-2011, Frank Lanitz 2008-2009, Timothy Boronczyk @@ -160,6 +173,14 @@ Copyright: 2011 Matthew Brush License: GPL-2+ +Files: pairtaghighlighter/* +Copyright: Volodymyr Kononenko +License: BSD-2-clause + +Files: pohelper/* webhelper/* +Copyright: 2010-2014, Colomban Wendling +License: GPL-3+ + Files: pretty-printer/* Copyright: 2009, Cedric Tabin License: GPL-2+ @@ -189,10 +210,6 @@ Copyright: 2011, Frank Lanitz License: GPL-2+ -Files: webhelper/* -Copyright: 2010-2011, Colomban Wendling -License: GPL-3+ - Files: xmlsnippets/* Copyright: 2010 Eugene Arshinov License: GPL-2+ @@ -272,6 +289,24 @@ On Debian systems, the full copy of the GPL-2 license can be found in /usr/share/common-licenses/GPL-3 +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This library 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 + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the full copy of the LGPL-2.1 license can be found in + /usr/share/common-licenses/LGPL-2.1 + License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in @@ -303,3 +338,27 @@ appreciated but is not required. . THE SOFTWARE IS PROVIDED 'AS IS'. USE ENTIRELY AT YOUR OWN RISK. + +License: BSD-2-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + - Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -Nru geany-plugins-1.23+dfsg/debian/dumpabiver.c geany-plugins-1.24+dfsg/debian/dumpabiver.c --- geany-plugins-1.23+dfsg/debian/dumpabiver.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/dumpabiver.c 2014-05-20 07:24:31.000000000 +0000 @@ -0,0 +1,9 @@ +#include +#include + +int main() +{ + printf("GEANY_ABI=geany-abi-%d\nGEANY_API=geany-api-%d\n", + GEANY_ABI_VERSION, GEANY_API_VERSION); + return 0; +} diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-addons.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-addons.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-addons.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-addons.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-autoclose.docs geany-plugins-1.24+dfsg/debian/geany-plugin-autoclose.docs --- geany-plugins-1.23+dfsg/debian/geany-plugin-autoclose.docs 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-autoclose.docs 2014-05-20 07:24:31.000000000 +0000 @@ -0,0 +1 @@ +autoclose/README diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-autoclose.install geany-plugins-1.24+dfsg/debian/geany-plugin-autoclose.install --- geany-plugins-1.23+dfsg/debian/geany-plugin-autoclose.install 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-autoclose.install 2014-05-20 07:24:31.000000000 +0000 @@ -0,0 +1 @@ +/usr/lib/*/geany/autoclose.so diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-codenav.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-codenav.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-codenav.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-codenav.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-commander.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-commander.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-commander.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-commander.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-debugger.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-debugger.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-debugger.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-debugger.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-defineformat.docs geany-plugins-1.24+dfsg/debian/geany-plugin-defineformat.docs --- geany-plugins-1.23+dfsg/debian/geany-plugin-defineformat.docs 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-defineformat.docs 2014-05-20 07:24:31.000000000 +0000 @@ -0,0 +1 @@ +defineformat/README diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-defineformat.install geany-plugins-1.24+dfsg/debian/geany-plugin-defineformat.install --- geany-plugins-1.23+dfsg/debian/geany-plugin-defineformat.install 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-defineformat.install 2014-05-20 07:24:31.000000000 +0000 @@ -0,0 +1 @@ +/usr/lib/*/geany/defineformat.so diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-devhelp.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-devhelp.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-devhelp.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-devhelp.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-doc.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-doc.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-doc.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-doc.lintian-overrides 2014-05-20 07:24:31.000000000 +0000 @@ -1,4 +1,3 @@ # This is a plugin to search for documentation, not containing documentation geany-plugin-doc binary: wrong-section-according-to-package-name geany-plugin-doc binary: documentation-package-not-architecture-independent -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-extrasel.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-extrasel.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-extrasel.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-extrasel.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-gendoc.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-gendoc.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-gendoc.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-gendoc.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-geniuspaste.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-geniuspaste.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-geniuspaste.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-geniuspaste.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-gproject.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-gproject.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-gproject.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-gproject.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-insertnum.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-insertnum.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-insertnum.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-insertnum.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-latex.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-latex.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-latex.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-latex.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-lipsum.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-lipsum.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-lipsum.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-lipsum.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-macro.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-macro.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-macro.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-macro.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-miniscript.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-miniscript.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-miniscript.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-miniscript.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-multiterm.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-multiterm.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-multiterm.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-multiterm.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-numberedbookmarks.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-numberedbookmarks.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-numberedbookmarks.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-numberedbookmarks.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-pairtaghighlighter.docs geany-plugins-1.24+dfsg/debian/geany-plugin-pairtaghighlighter.docs --- geany-plugins-1.23+dfsg/debian/geany-plugin-pairtaghighlighter.docs 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-pairtaghighlighter.docs 2014-05-20 07:24:31.000000000 +0000 @@ -0,0 +1 @@ +pairtaghighlighter/README diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-pairtaghighlighter.install geany-plugins-1.24+dfsg/debian/geany-plugin-pairtaghighlighter.install --- geany-plugins-1.23+dfsg/debian/geany-plugin-pairtaghighlighter.install 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-pairtaghighlighter.install 2014-05-20 07:24:31.000000000 +0000 @@ -0,0 +1 @@ +/usr/lib/*/geany/pairtaghighlighter.so diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-pg.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-pg.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-pg.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-pg.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-pohelper.docs geany-plugins-1.24+dfsg/debian/geany-plugin-pohelper.docs --- geany-plugins-1.23+dfsg/debian/geany-plugin-pohelper.docs 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-pohelper.docs 2014-05-20 07:24:31.000000000 +0000 @@ -0,0 +1 @@ +pohelper/README diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-pohelper.install geany-plugins-1.24+dfsg/debian/geany-plugin-pohelper.install --- geany-plugins-1.23+dfsg/debian/geany-plugin-pohelper.install 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-pohelper.install 2014-05-20 07:24:31.000000000 +0000 @@ -0,0 +1,2 @@ +/usr/lib/*/geany/pohelper.so +/usr/share/geany-plugins/pohelper/* diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-prettyprinter.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-prettyprinter.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-prettyprinter.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-prettyprinter.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-prj.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-prj.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-prj.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-prj.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-py.docs geany-plugins-1.24+dfsg/debian/geany-plugin-py.docs --- geany-plugins-1.23+dfsg/debian/geany-plugin-py.docs 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-py.docs 2014-05-20 07:24:31.000000000 +0000 @@ -0,0 +1 @@ +geanypy/README diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-py.install geany-plugins-1.24+dfsg/debian/geany-plugin-py.install --- geany-plugins-1.23+dfsg/debian/geany-plugin-py.install 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-py.install 2014-05-20 07:24:31.000000000 +0000 @@ -0,0 +1,3 @@ +/usr/lib/*/geany/geanypy.so +/usr/lib/*/geany/geanypy/ +/usr/share/geany/geanypy/ diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-scope.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-scope.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-scope.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-scope.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-sendmail.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-sendmail.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-sendmail.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-sendmail.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-shiftcolumn.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-shiftcolumn.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-shiftcolumn.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-shiftcolumn.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-spellcheck.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-spellcheck.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-spellcheck.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-spellcheck.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-tableconvert.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-tableconvert.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-tableconvert.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-tableconvert.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-treebrowser.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-treebrowser.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-treebrowser.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-treebrowser.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-updatechecker.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-updatechecker.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-updatechecker.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-updatechecker.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-vc.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-vc.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-vc.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-vc.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-webhelper.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-webhelper.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-webhelper.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-webhelper.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/geany-plugin-xmlsnippets.lintian-overrides geany-plugins-1.24+dfsg/debian/geany-plugin-xmlsnippets.lintian-overrides --- geany-plugins-1.23+dfsg/debian/geany-plugin-xmlsnippets.lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/geany-plugin-xmlsnippets.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-fortify-functions diff -Nru geany-plugins-1.23+dfsg/debian/lintian-overrides geany-plugins-1.24+dfsg/debian/lintian-overrides --- geany-plugins-1.23+dfsg/debian/lintian-overrides 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hardening-no-relro diff -Nru geany-plugins-1.23+dfsg/debian/patches/debian-doc-locations.patch geany-plugins-1.24+dfsg/debian/patches/debian-doc-locations.patch --- geany-plugins-1.23+dfsg/debian/patches/debian-doc-locations.patch 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/patches/debian-doc-locations.patch 2014-05-20 07:24:31.000000000 +0000 @@ -1,3 +1,7 @@ +From: Evgeni Golov +Date: Fri, 29 Mar 2013 23:14:44 +0100 +Subject: load help files from Debian's locations + diff --git a/commander/src/commander-plugin.c b/commander/src/commander-plugin.c index 7afb6fe..92ff4ca 100644 --- a/commander/src/commander-plugin.c diff -Nru geany-plugins-1.23+dfsg/debian/patches/geanypy-link-gmodule.patch geany-plugins-1.24+dfsg/debian/patches/geanypy-link-gmodule.patch --- geany-plugins-1.23+dfsg/debian/patches/geanypy-link-gmodule.patch 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/patches/geanypy-link-gmodule.patch 2014-05-20 07:24:31.000000000 +0000 @@ -0,0 +1,39 @@ +From d1e9203fd5b0eb7c14bc537b7a918555bb9ba91e Mon Sep 17 00:00:00 2001 +From: Colomban Wendling +Date: Sun, 20 Apr 2014 14:06:14 +0200 +Subject: [PATCH] geanypy: Add missing linking against gmodule + +--- + build/geanypy.m4 | 1 + + geanypy/src/Makefile.am | 5 +++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/build/geanypy.m4 b/build/geanypy.m4 +index 7fd4258..a4582f0 100644 +--- a/build/geanypy.m4 ++++ b/build/geanypy.m4 +@@ -3,6 +3,7 @@ AC_DEFUN([GP_CHECK_GEANYPY], + GP_ARG_DISABLE([Geanypy], [auto]) + GP_CHECK_PLUGIN_GTK2_ONLY([Geanypy]) + GP_CHECK_PLUGIN_DEPS([Geanypy], [PYGTK], [pygtk-2.0]) ++ GP_CHECK_PLUGIN_DEPS([Geanypy], [GMODULE], [gmodule-2.0]) + dnl FIXME: Checks for Python below should gracefully disable the plugin + dnl if they don't succeed and enable_geanypy is set to `auto`. + dnl However, since these macros don't seem to gracefully handle +diff --git a/geanypy/src/Makefile.am b/geanypy/src/Makefile.am +index 34b257a..7e6b53a 100644 +--- a/geanypy/src/Makefile.am ++++ b/geanypy/src/Makefile.am +@@ -8,9 +8,10 @@ geanypy_la_CPPFLAGS = @GEANY_CFLAGS@ @PYGTK_CFLAGS@ @PYTHON_CPPFLAGS@ \ + -DGEANYPY_PYTHON_DIR="\"$(libdir)/geany/geanypy\"" \ + -DGEANYPY_PLUGIN_DIR="\"$(datadir)/geany/geanypy/plugins\"" \ + -UHAVE_CONFIG_H +-geanypy_la_CFLAGS = -fno-strict-aliasing -Wno-write-strings ++geanypy_la_CFLAGS = -fno-strict-aliasing -Wno-write-strings @GMODULE_CFLAGS@ + geanypy_la_LIBADD = @GEANY_LIBS@ @PYGTK_LIBS@ @PYTHON_LDFLAGS@ \ +- @PYTHON_EXTRA_LIBS@ @PYTHON_EXTRA_LDFLAGS@ ++ @PYTHON_EXTRA_LIBS@ @PYTHON_EXTRA_LDFLAGS@ \ ++ @GMODULE_LIBS@ + geanypy_la_SOURCES = geanypy-app.c \ + geanypy-dialogs.c \ + geanypy-document.c geanypy-document.h \ diff -Nru geany-plugins-1.23+dfsg/debian/patches/hurd.patch geany-plugins-1.24+dfsg/debian/patches/hurd.patch --- geany-plugins-1.23+dfsg/debian/patches/hurd.patch 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/patches/hurd.patch 2014-05-20 07:24:31.000000000 +0000 @@ -0,0 +1,41 @@ +From: Evgeni Golov +Date: Sun, 20 Apr 2014 17:48:54 +0200 +Subject: scope: build properly on GNU/Hurd + The scope plugin currently does not build on GNU/Hurd. + These patches fix the issue by properly detecting BSD + flavours (and not misdetecting GNU/Hurd as one) and + defining PATH_MAX as GNU/Hurd has no such limitation. + +diff --git a/scope/src/conterm.c b/scope/src/conterm.c +index e09cfff..9a2bfc7 100644 +--- a/scope/src/conterm.c ++++ b/scope/src/conterm.c +@@ -33,9 +33,12 @@ + #if (defined(__unix__) || defined(unix)) && !defined(USG) + #include + #endif +-#ifdef BSD ++#if defined(__FreeBSD__) || defined(__DragonFly__) + #include + #include ++#elif defined(__NetBSD__) || defined(__OpenBSD__) || (defined(__APPLE__) && defined(__MACH__)) ++#include ++#include + #else + #include + #endif +diff --git a/scope/src/program.c b/scope/src/program.c +index e939c3b..5f8f2c0 100644 +--- a/scope/src/program.c ++++ b/scope/src/program.c +@@ -23,6 +23,10 @@ + + #include "common.h" + ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + static StashGroup *program_group; + static StashGroup *options_group; + static StashGroup *thread_group; diff -Nru geany-plugins-1.23+dfsg/debian/patches/series geany-plugins-1.24+dfsg/debian/patches/series --- geany-plugins-1.23+dfsg/debian/patches/series 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/patches/series 2014-05-20 07:24:31.000000000 +0000 @@ -1 +1,3 @@ debian-doc-locations.patch +geanypy-link-gmodule.patch +hurd.patch diff -Nru geany-plugins-1.23+dfsg/debian/rules geany-plugins-1.24+dfsg/debian/rules --- geany-plugins-1.23+dfsg/debian/rules 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/rules 2014-05-20 07:24:31.000000000 +0000 @@ -5,8 +5,6 @@ export LDFLAGS += -Wl,--as-needed -Wl,-z,defs GEANY_VERSION = $(shell pkg-config --modversion geany) -GEANY_ABI = geany-abi-$(shell grep 'define GEANY_ABI_VERSION' /usr/include/geany/plugindata.h | awk '{print $$3}') -GEANY_API = geany-api-$(shell grep 'define GEANY_API_VERSION' /usr/include/geany/plugindata.h | awk '{print $$3}') override_dh_autoreconf: dh_autoreconf --as-needed @@ -16,9 +14,11 @@ dh_auto_configure -- \ --libexecdir='$${exec_prefix}/lib' \ --enable-addons \ + --enable-autoclose \ --enable-codenav \ --enable-commander \ --enable-debugger \ + --enable-defineformat \ --enable-devhelp \ --enable-geanydoc \ --enable-geanyextrasel \ @@ -31,6 +31,7 @@ --enable-geanyminiscript \ --enable-geanynumberedbookmarks \ --enable-geanyprj \ + --enable-geanypy \ --enable-geanysendmail \ --enable-geanyvc \ --enable-gtkspell \ @@ -39,7 +40,10 @@ --enable-geniuspaste \ --enable-gproject \ --enable-markdown \ + --disable-peg-markdown \ --enable-multiterm \ + --enable-pairtaghighlighter \ + --enable-pohelper \ --enable-pretty_printer \ --enable-scope \ --enable-shiftcolumn \ @@ -66,16 +70,24 @@ dh_installchangelogs # add geany:Version substvar to debian/*.substvars -override_dh_gencontrol: +debian/dumpabiver: debian/dumpabiver.c + $(CC) -o $@ $< $(shell pkg-config --cflags geany) + +debian/abiversion.sh: debian/dumpabiver + $< > $@ + +override_dh_gencontrol: debian/abiversion.sh + . debian/abiversion.sh && \ dh_gencontrol -- \ "-Vgeany:Version=$(GEANY_VERSION)" \ - "-Vgeany:API=$(GEANY_API)" \ - "-Vgeany:ABI=$(GEANY_ABI)" + "-Vgeany:API=$${GEANY_ABI}" \ + "-Vgeany:ABI=$${GEANY_ABI}" # Don't make shlibs (false positive on pretty-printer.so override_dh_makeshlibs: override_dh_install: + find debian/tmp/ -name '*.pyc' -delete dh_install --list-missing %: diff -Nru geany-plugins-1.23+dfsg/debian/upstream/signing-key.asc geany-plugins-1.24+dfsg/debian/upstream/signing-key.asc --- geany-plugins-1.23+dfsg/debian/upstream/signing-key.asc 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/upstream/signing-key.asc 2014-05-20 07:24:31.000000000 +0000 @@ -0,0 +1,226 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQINBE1rywUBEAC1RnAQ4p2ej4qmfPss4cYBkqbNCfejg97KitowL2IQMb8SWIJ+ +pTLsSrCXm/OXaC1IDmkytQ0NGylahHYn2/YDoszjYzo4fu+QWfndnUxXUlud2M6x +beMyxA0Gn/r0GZdTD+kyHXy4xy0fXKCulVYdSaZWa82cBixSOMIONZNUugpWabdj +VjWEcS6lQ3cG/vcxeOrfSMad2gBLbYbOF0UMnzMc7KooDZZ6JXh0m8M52glfnBZN +ODSTetn+02hNY4l7uVI9ZVOmq98pLU9/FVohskvZGio5baSoCGYcD7YckG+gcQvb +MRua2WVTpaXIsEtPkSmyuA2y3ogOhWu+XyMqTvRfQqoLLxP2bKi0AHHxzHX7CPA7 +6BTTkl/EWdLXLMtmvLQdGX1Xq7Us0dO8FsOPdFCePPFHx8kq1osilZs3tp2SvVoe +/jzoxnv0Mj9ypWVBbmQN+Qv1mjca+KRS7Luldt1tcJFVz5GKFL835w9CCjX9mU85 +zt/CACQP+KjtAawdpBu6oc4A9y/OyJrIubg5N4RBwNU4F2Rweduupr61vKbvUai7 +Uo6ICi2B8/hAMg78QVAKg3Uvz3zkciLjTmt0JhQgq6stkph0J75jgDoCXqJ++QGa +G/yx70ZcVL5TYhQHaadcmDGWITXjPrR2sHeLSP/MvJQiFXgAE35HWJzB/wARAQAB +tCNDaG93IExvb25nIEppbiA8aHlwZXJhaXJAZ21haWwuY29tPohGBBARAgAGBQJN +a80oAAoJEOCxXFKPAqQRjR4AoNLZhKvvbBC2FBrJv886/5Bd5sIGAKCxzBe6uVMQ +/6NPL33sEl0dKeZO2ohGBBARCAAGBQJNk4cAAAoJEDfhwXVwCWrRDyoAn3fQqLYC +4xuw6dBvcRNMJ8fvoLPzAJ4/nJrrfK5AX+sc47HfwDPfUmxofokBHAQTAQIABgUC +TWxaZQAKCRDUr37v5+YghRraB/493BVXzcc6DtAfB5AMJRIl0aA/PiN+oMib2N3t ++2nIUuzP9j+ptXyOaWmQWYcU+5fccNwgk0pzJfqj6UpHUvms2SffPUABlJeN/nwx +j3/8blsnj1y0T39Sicy6rTf127qLcnKOnO0Hk0lM4ju6+x749VkGxC4OQPibF0L9 +FKZvGAt3q+iwYAeFWMLXnM0bDCacUxAwCoeeDdH/FxG9wS9GlybP8ftjV92svwZo +RLiLSvUDHXhvOZWY4n95evjPi8Ac6eDvopr+FNSlBBxPsvwrwXizsI/u84ROvShz +xX0LgnmPd4d5xEeay2vT5TQoXPmH++Yh6f/yFG3uYzDEJU3+iQI3BBMBAgAiBQJN +a8vUAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRD71SJbWIdSoTtYD/dp +8Igh5TkyN2zfn55mYrOW8nbiJR+bkkz/wP8Jmdjn7sHaHmeRRm+dz2PWfECpN8C/ +c69JcFnUgqGKdQosz1XUmXqsR7bdA6HvIPhC5+8rGMhIWT2l8+usyaCIiiEjFxr+ +VWAOtdgF2awT9f9D4j80AfYYQt4KT8eFGDxG3Ef7BJhHJtmDa8Xa1VSG/06YbeGN +G08cVvNfdOoMcRlxi9WMnWV+16JPH8/bNcTWr/vprfFXdXBQLpy0lKPXPxfw5Lzl +hzaal+VLlyfnU6Z8ol+t2WJrprBUs/oggpn+9lV6cPnYa5fmhxmzlAJpmEeS9L9y +LyIkqb/lUh1+YB3pdmFEddITwixMG24DODFc52JnoJs0FxURSBs6bBJ/WIsWTHmq +m4929iu3lFDRF57aiRNqNPWdzWHPQqCiejnSPqbUXRIUPU/i2UMtfUe8v+eyfTas +NnkDE87ydXI65j9w0qL/+eMBbMPD2zOkhWhQZmmkzfuVykGx+mCfaejq/ysVniLo +Le4NSPJs5+PNYRlgIOjvrPUM9jm3adoa2nxZhZE7ajgh7bKwx3W8/+01FGc/Lp02 +idwJUSMlUs6uPQEJ5uYSC4gIGFW/caCfCquhg3RVe+CWEvGxlIkvBjiveK2XpY0i +dER3yhBjz4fNzr8RjOdR3s+5Pnom9ZHwgxDyvBhhiQQcBBABAgAGBQJNbsPfAAoJ +EKJ/PpTsA3ff7AYf/RnoO67Crz77uBX5EVSlwYoY44i7WWc1bE/4PzYou1Oqtk6Z +MJkn81JVz1fnwjQXmnacSGniNqleRheaJMbGNf5JHsJj1yjEyOkYuKy9MMSytswO ++bLB/zDb2DkBVxbrFcTMqYBu/LZA1UexO4I6a2gemnQ2kH+R1fvk72WNOi0lbU/C +wC3St30KKp+Qg8UCW4sDFwiKtLlJgJt0qNKpRIWZgXR5T3asex/yqV8HzAWCloxj +0U4YGVRZenBxIYoi9QqJTu8zsoW6mmUGcC9udjoixAqMKZPVop47vL/7X77S9acr +SPmiutWnmxOYd7byfIGLYu/ksYChIdcOqayc9omlWiTpud/fVxIoVBB/r9gUO06w +uju13Ac34YFmkQ8tbVeGoI772py463S51O+w8hjoW6/qeY6Ltoq/Pk3ln3FkZ5Vz +h2kIPhywYZ6jaa2vVJPFvukeUitKYMKPX0m/KoR7DGZF0/Glpou0sGtZmLYwi5eV +rdiNzkdYThiRnkaqawuDLG/qgBMw2JBbgCxwquLjdnTID3EglSyKCBK535WFNOe2 +25/NB7gZ1/3cYB12RiQKBbVI9MKRtN6eN73dZBdjbqFiw4i1iZRQ4gZ2D75FULds +86UwMckM++f/F8hvjnfPGYqz/Q8iUBmMiDaubApqxLODEhmOtFMvlnOWUl6XT8lf +sDZOJA+0u5RyewT+2hszlYGphS6vyqwHQUN3r8lRnIGwuybjy0FkmrJvVLS/OIRd +tt7PD0wi+RraNM/C0A97GAMxrA+yQvfa8Fu/4JlFdh+O2aVUFhL215xu81yL9f2y +MiDNBsF+u9iDMXLGpfRelIZpT7j+l53INkDV3UqSFnzDvle5R3i8UkfHCND8aVgv +Xpa4AcDGLkPCdbOKNWjnjJhnG02vIdffXNLiIFR/957HyepQLTH9qbVU6vtcpS1P +aKuNhEHKn4ZqCiqVA/l/ZiQ9dCh4du5SN401yLACkXlr1ZNjzlP6plSTsmphTSSG +/juTPmF1TudIWd9ZPDdkeqRfvoumAUmnpPLr4fHvdDE9051rkVW3NEBN6tzJJ36e +k6hr8cyLMiveWIPKnUWI96pTXYpGLvAtxaYmXeMX+OKzeII4VgvVPLVz2G162VrW +DEnRYJJ2gsuy7p0uK2Q9DMCF9XBEfF/g6EK10Anwb1whRx7YLiUF7mvZcOgOIUH+ +xQB4JL0JH3OFy7255aRmW4BLoytRlKZg3MU2E04Q5401iK1k8MM7a6Kj8OXdmBe8 +IHpDjX8QVmjdvHwtmmZOS1hONfTyp7YREZbkySzWKSgJp4ZtwaRRpFcVdiI4mrQ6 +heW7kzEFQc/Zx11OZzjtR7QV0rZgAzCnFhj+SbO0JENob3cgTG9vbmcgSmluIDxj +aG93MDA4MkBudHUuZWR1LnNnPohFBBARAgAGBQJNa80xAAoJEOCxXFKPAqQRrYYA +nRdlV+3C3eSI5uSXJhEn3oqbjPCXAJjpwnyHdobN+rzG/7g+rArUpvU6iEYEEBEI +AAYFAk2ThwAACgkQN+HBdXAJatGlOgCfR4+ifBH9aBhKaa++7tPGrAEsJLQAoJa0 +DunKHoI00zgtfacKvU5cubZCiQEcBBMBAgAGBQJNbFplAAoJENSvfu/n5iCF+jQH +/0S6oTBVhocnQ2HGKcNyfGbWQ5K1NNkxJdhE/hTmXK2T2MvXIKLihRAWyZDVYIUB ++GRSe+mrBSoVFdoCQFAWRlbMr/rqnBPR/xX2Ux1OAffzc+2q9O73DxavJBcuCtCH +30ztX+nF9123in/lvHIV5pfPd0QHIhJtsh/bzm742lb1gzcj238795JOLT76UQEd +zWcDn8FnkKxxGillqUQhFza8EQBqDsQfXPpYc4gQ24SBFVVaIJXdIDVfK7viqU6y +xNoNEL8Xi4HwXRsp2Oh4szNCQtsylO//deNaQQcZaTsAz297wb+RxJOUkz2lT/uO +C8HqwINKdAAuIX39XmWtVUWJAjgEEwECACIFAk1ry90CGwMGCwkIBwMCBhUIAgkK +CwQWAgMBAh4BAheAAAoJEPvVIltYh1KhfikP/3W1FmVaAPWens0nTy0xMQcRxPEb +wPabMBFSyi/Eepy66KY45ZVhFhvrzwCtPujZoof1SjeabPMA+5C0XBZUMzrLCa0M +0XWlThTrBN/agU3C5s9G+rXdX0hDfmelv5dSYBlcZ3MVsFSiSRu8LNud0zie4nbP +BSZdFNWgjEczsdjf+zMqBZJNVjpd0pAGeLEVVkdV9iUK+NcLBdQP+NOhByxQIjE+ +ry6SqUbn1Ll4MGpLi7d9kz82OLLa1YnqD9O9yzFmTkzTIvSVVnUmMCZAdntGJ97m +YwJpx9eKr1ktd7liYuAklkRzBoXZbzLNXifMTbGxyemsWLZ8jaI1kURPTj7nCfP2 +zfVLVpQN9/PHkWb8dOtbU1lZkD+oO17s15SAD/r5AHCoT6qKHnstBgrSdFQtx09r +H1qwUfcpyvvcA2v0A7aY/d3k+gnWNy6iYMAgMZ7h+HYPMJXzlrS4tCrHFzT2pUTw +RwST11O3QC59TUHanFBhZEShr99CwuSbNN+ABfB00H2uSVvlFeWConlIH7JCawdb +2NNsbPdoAQLXT5pbBoDyj3qpRLPKxR5h3Sen0Jkkc8vNh6MS9PJpZGEl/43smq3m +vf2u4d5zcQtNU0k6Hmvt+1koE6RoGOkEluZ749tZJvOPA2lYJ2KNB7VKFUzUukhn +w0UAESGcMh8zJa/liQQcBBABAgAGBQJNbsPfAAoJEKJ/PpTsA3ffpSEf/0HP+QF5 +ueurfaeX4tMmwjMh42wmQqI8YW1zOJXmZyyyQQ06/OdlLOY46fpecgQFZoLQdD9B +Z0hyeUPSLKZ62zyGAW3Qwl1Lb11iPhtCMbjJ6gb5iA2V9ja/HB1wGts1Tbl0KNml +0FiFHKR9szvRGQ/543mW+PB/5OPGQhi4ugnpHEOOe6OUJCdAHfrJsl6tT+BOksyW +zs8cU77DWa/14Svw0qNTF1weB9kAzja1Jveoaad5v5uM8N0TqJc7KkAdUE/JwjxM +crWrrILAaBGbi2VHPkbnSptI1dophR7dSDGq/3k/QopkXuGCBLOYCuM+k5LDzs7i +AQ+R5iiF5dT0mYUhDawGVBuhziAq9t7Zw9tOgBmK6Qa5DLPtORFd5BzsTH1ZPDiF +W6r1TLioqQGbcGyB7WaGmNnCpQ8PokitjZJp1TllsJ/diay76/8+djruhqtuuYLh +CAIxXJZMV4gWsGgYK/kwEgI1QG45AVt3Jdnkcdk8ucixB4YgIdnwdTAIRl7Bqagk +mo9kLwHrA6Rn7PByMVn4pxfiW+0iX7ePgvw22zfhcA0J2gPMNx6MGs4WxtgaR/AP +KwXJVUYjdM8VtTJxHlMoZzynSzfr+03IVzTdPPfI5iOMa0mCOtEbDKu4+Bxj5mPV +iAyXwLkw62b6p7TOaFx1Aqb8RPYTV2TMI3CssaB3++mAt5UamihUOcRksmk3znVv +40i7PqKMxE23BKJQQuz7IZMY6LsP2j1xJL7lu9kZeKBij71XKZvPcCzKS3B9dFZY +JHF65klZ6KFvQUSmuPyjfegedwQuAUJhkUR96L5GaMLQSTZLntnnYycdjRfwQ4LK +2A+0IVWaukVZGyrUMSw7Ckczq5HkQz9YMlHAByHW5Pi8gJYTTIyEWAbLgLDXR/o2 +iIPXxCUJ7iQm4FD16rAP91nUCNqCrcGa2oyZNS6QlF4S3KYIdtaSFiE8DMSzj3iH +g2jfXylIqeWskax0yED0MG4MHU6zdy1ub6WBcAfZEURSP4HYab9sw4OzNM7P/OMB +PlkFGfUEEHQ0kqea3eGDrLSQpl6h0f4dqbKdOYJN4oR1PhIzgNo62J7527YiNo/7 +x2ER2GdBedsV4yRX09GTT00BbkHW/FKsMTcuu2YTTpaReyBDutEbj+BbUAcueRkz +ZNqXOyhJ+qYu6V1jmbcc2eGhJF4uVqyPakCy/sRQS2ppq81P1uQw7j80WTDz3nZy +46fvK+odk4ULzZFILm/IVxVGp+6CIrqrbnJiQcgvc9WIbjOybn5YG11YWhhNYuzP +uGduVPCVPR16yMWY7xZ/pHFqAlC4Up0UKIyMReUgRJ1niIyqiwyYHqZwnbRwgQAh +0tK88n5Dt4sFG5u0JENob3cgTG9vbmcgSmluIDxoeXBlcmFpckB1YnVudHUuY29t +PohGBBARAgAGBQJNa80VAAoJEOCxXFKPAqQRFLYAn0TQu+ZX+8gl0R+UnVAW8bEz +k4mlAJ9EmaZyNPDoRGcjVfv0IJcFMouSTohGBBARCAAGBQJNk4cAAAoJEDfhwXVw +CWrRq2EAnix6S5GfjJnjEJOWoa1+w9evbgXGAJ92n+WGR+B5h+FJcLQLSjGMrk18 +DIkBHAQTAQIABgUCTWxaZQAKCRDUr37v5+YghTpKB/9Vp5EnArzGlRkoIQp83385 +iInefSbmAz3RypGP3qQkBsmORq30dlXWIND/owlrTf3/mh6uGMYjV8TXwPxjCaZJ +Fwwjg2gVYmzh8XV2DZby+VA67VId7uTNXlZ4j2MUGKLtOXv2Qs8CMky8qSwRYIdr +GkxMV/dZxs6jjeWWpagjNRslEbyG2zVuMZTIl7OkRjrYDxypQsXFCEkUDCkb3g6a +Gflu5b0n0DFWeSKDZZEYILFR2OAzz1nBS5cizo3RU+pd0hiA1FSpxC4PSmPTq1SP +2R9sCgOuf5a28+Mvaau3uCAzwfvYsnBUVjnoMxV7pjhAz00fNbiz73umhvb+q0Az +iQI7BBMBAgAlAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCTWvMpgIZAQAK +CRD71SJbWIdSockwEACjhKQhQybLv/mgwPFGIeSkpPQDAy/tKr1mnKtUWFHstzJE +uyoFXg32Y6oelshuqu+8ZaY1DY9P5Q7VQuprjv1TDvLqlauOAwt8zoggjA3/+4XV +6ub4VkG8I8715D5bqF/HalbsRN8iqxPl7Z2dGa4s96gGq2DsSF96riPbXviSb30C +bAPp32DrNJkG3PHpjbQw6SGN4S28Lk31JSU58Zb0X5Unkze+o1Wd9AyZrSTWa+CX +uMiCyewqlmeXnw6Gv2J/19vNfyJMIv2BD7hbpol6Xm1y/BOiLYc4hVhDku0Y48ok +6c32cUqmPwkjtHVFTkm64kuj/DmUFKTLTEzgyY8nlmMpsokG2CfCwv9SrDrCky0U +dzSELMu2Afh8zZcE6/LcOEDr7Vis53u4aKSvCytpqbQQCI7KyFYPraiJIbstrxCV +Xb/XiJwyB06Jja4wJIuxU00fc5wjLCVWqGU1jSw4QvjiFC07EM+gmnkSjfIeCjVD +V0gPtRriaZCwJ+fYQ0q/cnPAEUdsOu9ayzxw36Io/5rPQG7cxMwhoSFctptnktEi +ooYZ6W6NrWfnodqt7SUjWtmYyqXP01JKxCy0+Q1XFlkkpJ1xqdXkYSqPp28SEgQI +HQzYmJbrtZGJSk/TmKrsPoo7l1AjvJ7fjCXYQ2mXR6ZgDmtN6yaYW5jn0KOGYIkE +HAQQAQIABgUCTW7D3wAKCRCifz6U7AN33/WLH/95fxy/h+UcHKkdqKxBjk/GeNDO +bYdUJMTShEn3KxKGO2rHp4njPqB+0qk+pASyGWUFKq8O9mgZ0pjp19Wx6bX1DKgV +QXUM9MZrta3wl1tdxDuBeyfkwMhEdiv/jE+bcYnYEycTOltEZyPP2uqqnlAuB5+o +SC4S3iUvd9M4lwGTvveG+X6SooL9l3vFm26Qt+lnrISm1OJecdCW9vn0NJy2U000 +MsJhMQE0uXrPA5MdAb6VTSatKIoiJgojIkbM4eeunJLt0qtM7VR9NkNAXaIsEO2W +17/32RcSAQ/b+WVX+Dj/pvjqaSmyyvvh4+MffvK1XYB1h743oYZ8yG3Q9VCJAaHk +lFfsFEcYn0KFBilUOxGA026ENePiigF8CZF+rRdWdxoNktRxkmajX7WCm7bJhW5w +IoHvNfoBGlz1DYdzb4y27POZAo87Gmd/ykcQy+1/tK/7erqyH4KkQIwV26lVm2TJ +DUqxAiKEuNn0zpSeGre4K/J0Xl3Lc6DAw7r/qFwanIvem4VCF8THARSFCcj18NQk +XwGGg7KSRntI5BP7Dver1ExIADB2hqK7MKbK0XelgF6v7bpFfIlomGLc/yjbGz2Y +EVgzyByPbkJuqbuQAVNvue63Ex0P+wUl42x3p5U/0+RfK0M+Trj+ehPVrMTbVbaS +ZGAQWLrAAKZVFifBbKVfNY9QIdHV0Kx1NmQDPxW2hx3D2GraRh6ePSMqMvg3i8bE ++EoAfmP3Z5LfOoU3tsqvY2mrx56Zuq0F2sOz8CYzI2nXiWG4fy2QMw5qOnmp080m +fWqRaf1aa0RTPRuHKimwplodXh2TFY1QjRHV9f97zjjCuYrm8yzQfpYtE9TcSs0r +fR/tPqbDx6iW9QWwGrnbDLAT+iVVBwLTwYfA/SkHoS9SEksCN/6VOGyDgB26VZBD +aPaHKO30U3vQ94pFOCb064uYvIJks3joZglyLx5Of1RCU9ivef+ydfjSPg9Z1A1k +yIsMvpg5F9HNVSMsT+tG/OX5NsFpBCehvbDWHya93LlAQTfvoFMr2GzmcIVXHahn +wKnUqdfGJ/bsHAv5PQThCCpsSWdDx9ef5EXWXurM805R9dnxuS4gejZw8vwNdARf +2ncBLOF7y8d9GZbSaDrKg03e/bzwrO/p1ntbXG6QDPymn5rto0O2suEYzHw/ZXce +4OyJRieGSk2ls9dmljHMfK5V8gf1qQcQ5SE67Dt7bVQms1qZFTP4Y1LVtHlndXD5 +VxvunQwVNDLG2oYnXBmy7RW+HoK83lA6Tbnn2cWGlQN6sb1PZFYXaH5Wv+PnxGze +NOIOBrSuakjeqZ14l76G/gphzx8Lx+XOVVwcY97sbk4rfDSN743kRpR7vnvitCZD +aG93IExvb25nIEppbiA8Y2hvdzAwODJAZS5udHUuZWR1LnNnPohGBBARAgAGBQJN +a80eAAoJEOCxXFKPAqQRMrUAnR13MXMB+ZFtbvSS6mf8xzEscrobAKCripNzY3DB +pz08jpRVhhT+X7eQMYhGBBARCAAGBQJNk4cAAAoJEDfhwXVwCWrR+mEAmQFcbVTU +I4/xskA5STPmgZCtc+doAJ9orLCJzv757Zc+tT2SrnbRJZQQGIkBHAQTAQIABgUC +TWxaZQAKCRDUr37v5+YghYlDB/wN3ml/XS+bLETrjTBNXqt02+PKPK8mZAsE5zHA +JgXpzOxv+0gA5ohznu2dltUe9bA6+xwFnPJ1cdNR5064rtGtmRoNJJpWtxJp3G6P +bi6zRlerMZTi+swc1B0yapNSllEfV8/m5pf3VK2qo3Fa/C2u+zD+VHzJwTOxyFzm +MSVLy2OAgFN+1I8gwiZGW64nXcuD3L9AdQQikNR66wSfMHvi6zkV5XbSD2QYYl+/ +SGs4lbSHrbv/S39ZVTplxMgBrXtcEIdsK1E6oKu1DyYIMKqRAwmO4+fWREtRrBm2 +XPViVRraK27eyfoD52Tj9M1NZ7qg73YGw9AaMCcE9cIsUgBNiQI4BBMBAgAiBQJN +a8vnAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRD71SJbWIdSodsdD/9t +7lFJ7wCTZpwM4txOrtcQxblRLdPuMTsPmWUTZYD4UAp40mQgan2rcmm5xcSc7qDj +MscJeJyu2UU78bbcL3c04Yw/BrCy94WWosbXCcfD4OVIp83dp8i1xVimi+MmrNfu +vzPX5VFViqHQU/JU5hKjs8A0rMK+4cfBUTioUQmiIyXl217vnhbdD/1kRagbQ9tK +6ZILRmd/4q9+dtsXs3n/+pw71UkTv9sq1Bmpx9PNIio4ttJXMs7sJtWioW9dhr6T +05S1vOFzJD1fwSGffSCVmKTazouacYXy8LTPDrM0unSKXezsNxY33GCgNxJcRWVK +TbdABy+Zul74qcD884H/r3w3bD735/L7MFDeVR/i4no9ClmWq89NzD4rjQA5oCeB +WbTBEcNmEzmWdtHjnuSNY7ynOZoPc6UAITIaL4EiF3NjMRfAWr7csCmmP+TRxzxg +8ywJ9aLk9xQl7Kb/uED4Mm+5vnKx9MMGDKfmL5b2jqo9n2ggyMuAsy2msaRQL4Tf +s3eHM0HCDNWswWUMYqMnt0KQU/UMj8GL+/GvYQqURkkHRkhOcl598qIGAKBJ1O72 +DYEaVjafrbCNitRAE9+LyA/bbVH1XBYHlOTYGISyRBZgxLB5FIvPzdLT1uFesdHT +OB47xIx4VTcQpRJgLtKadf+bwtVsFL5Nc9Ih8hzKHYkEHAQQAQIABgUCTW7D3wAK +CRCifz6U7AN339fnH/975uTeTfDq5eMBfoJ017Uqt1YP8VRSwTP+WXPdY7AgcfJ1 +ppcGaTLcWlAxftouET8suhKvS75DPht7h2U71LSSXrA63tMzYJfMReYJaX0qyaUm +hkYEoJX3OXl/WcK9r8alw8yElOBPyBcnguQixVbNT57hbToKxZvC9wGXo1O+yGq9 +3QgLlyDQ8roHvJqr2LZQvQDC/Jn+981kSdY/gjncuvi1FNveG1LauuyLtmoFPEBQ +PaUn7iQ7wf9spSket3L3bdJqCw7tYTchqsQ6+LmGrRMEir2YcdBDwwctcT1SsaOf +8MuOvI4ahdGM8VtDQL8jG+71u5t6rkNe9L5dOOjKULRH3H4xUXBz0FsheqT4YUvY +jiZ7DYhcZuSibVapQGhisLRNXcrnLTmit42GWw8UTotrFLuVFUlHoUNuja+t7O26 +cYhA6hyNnyjPvIa7fvug2ATF95mhGJTr7jzItK5amJEzPQWAKcQk1p2n9d5s58sP +ZSxbXHb2qROdMn88CeEZmfeNrrpSWX9w0rWE80HU6pYizNlOQ2Gp4Y01Zfkhf746 +MZUefkhOFqsSQkzpqn/WA7im9wj+BREh3PXsTI4hN99UYSHBYpzXGnSC46m0iQAe +u/q7yQrAYpDof8VRMGUFmcTw5/nkt0HEaVu4UlpLfHv2UGx70LuOxIq8A0S1vmuw +eaMbLH6l4xT1Acf3QNyth4umunwOUGj3tgNM1GhWpmLlSRmlTBYyoYOu09RSPIeh +NkTbPb2fMYOALB6YFTULll60aQWLe1HdSt76OD113ThfY0N8yrRv77DNAHSXpC+S +YMjHx0pIo2vkuOOcN7Amvr7efPZ8CsGa/IECU5tvO8dFJOUfJUvGh+/i/18Tc9xC +W9P49HDG2zY7P6JjR9HpLRYhISu/rC1O6kIlfvv4Z+0FG6A/IxEe/1HgMMy2T1YS +5Q0qDcZ6CCgCywbhFK351jtzdzVFFP0XmKv9WVB9laFHSoGBfs0bi9pkipnSkKf+ +sUziU8fAeNQRr3sP/kENBNFJU9E73aNK52yXoqpPnpE3ah2LQDwAG8csK77Mpy0n +9zoUETOcF28t9ueeDr8k5tsoUAmFdiZ/gnM4heIEMoHjsOJea9BFlAxVpmkUlRMX +dRXJbQ4B+R1rdNFjlyATqMFpPRQtBpjnaGPcuzTUObatsM1GdqcYQeazx4MbwroX +NJpFwNHE9p0gxj83L3v3oLISqF9AOPodNE5IzQDnjGBttPYoYO+6KMEWxUFH+GaZ +QgeQLS+jYa+qXb107m42iOzAthFBPWPqbV2lWodfmaE4U2hXMUfy8S/Jy6mxfPCF +0aIo2gwwHXnlgExBiXvDb9n9jQ/QZZoyvxE8U4chtCxDaG93IExvb25nIEppbiA8 +bG9vbmdqaW5Ac29sdXRpb24tc3BhY2UuY29tPokCOAQTAQIAIgUCTdyxEAIbAwYL +CQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ+9UiW1iHUqF2kA//aAJ3EKsQ9bRk +3IND8d2aK9opnIKoAIjKcHihUK53lRREhrlt7kwowCf2buhlwQhfcl+RcgoCIG39 +PVLUTBEc1Wb5Aggxu1DLbb29sVgD5DVryaDnLKj+FLoq0Drh/OtQfF5PJ3nT1j4X +O7Ppmh1VNg9OH5xUAzKvG1CWgU5/3O0MrBci0aIge08odF77Az1d/QCpjR5CB08b +sbd1ZtNJs4qz1HivBRaMCCLjxxDwGl6K8P+kiQEoN5SQ4bARmMq5AU3vcsv5P835 +sXVbbMWmVyRd3ubv8gBG557FnLzl/dBs6PuffkbG4K1FXO8TNbshj2uLqNABTiJS +RyiowWsgJscCsfIYDOJrvTPUWx87mTBr+/NwnOJG1TeQ2VkeTTwvPYodol7YWnE+ +N5Pbyf2yRS2g0dlNldrgiizkBkg32xegpTSX2Dcmb9rkNn3vSag4gUIPyiRlZZgS +OUDY0/UepLT79B3Wo5F+zI2sJVqi2rwvcnqRwWE6eb94V8q4oxee1CcKvzjof1lQ +T9Lze5sypfk2BgOqrOH8uPT8EoxYyUy1r6EbagZf6e+GJP8Z0f8wg+DxQm2kbQ9y +XzbTRsPEu/yMy53qjJc6tkffdYpMiD1tUEE8phKGtnIw04I+jN0RkjYHekA9wsfu +vaDLYoRBLzzemJr0hjTpSILACWa6gEy5Ag0ETWvLBQEQALlaCKqTlXq/LDFSH6gw +TeyA8akZDNWvnoNA1Mf8XysixCunWBi6kw8uxJ2QggYtsv7+pIu+nNQzdVenPbYa +9PJyxxymNFk3SFl7K2qnG4m4J1RgFQEJRm3KpoI2X41jcpa2wWCficY8RU+0AIm3 +RCMmZML1rrXuxa9TANiA6v0o5qvsQ0/QOLXDBHYNzqsvYRnzsATk1963IAxF4caz +Lcy2wpcILfyyJL7NtDNRe8sb1T8XI3uTJn2o1PPArU3fOj1oIGosL1x1J0Uxg761 +OsfJ6O7wEnsMDL0YwLGesrl1T1gtcaZlQZO2w2H26JphfVUul9+/M3nhsK61HWP0 +RlwiY2rb2ekcfK9GSZLJGk6wXrJ8oY4nxvBNoTo2TrJ5c0yhNUF890CwkJTX4V/L +6xvrcn4T86MD2FiRrUzwzXhwjcKKk0Dc8Nt1UxBdP0ksdmx2BVu3ge1OcHyN2tsD +FqIRmH96pseHxYMGlMeCTXvrYkz1MUrHuchFUWL50Fej8uqnaD8CkwlBjWX0iG+m +t01NpxkgXeX8+2nOe8pnX0nYdXTp+qOrNuLaajlBGfb80XYbnweWCRpj9RheU1ep +jW8P/wSUZ/yf0tkzJSIGSUM001KvVlRRfKWoy4Af/8E3BWFKEwegvPMOHzorSdCG +sS4oa/zRnOcjfC2aS+sl4/hpABEBAAGJAh8EGAECAAkFAk1rywUCGwwACgkQ+9Ui +W1iHUqGDRQ/9H7Ht6ZAXQ+08JPe5m2sNsiJQfD5KbwZcPUMwyYvNVPrzC+lAFsxI +gn0wTKgLGFIK0YDgQwnEx5Czq7tXm3X4OvBn8bhey5xlCjKtGBI4ByfRE6LupBEx +Nv55QrCyDdodYZ4jqVn2Jj8G+tKLtS6Rkf/qNtVZLMD0aKBJd8dgnffGJBnVtiOh +oQSgSXDEteNF9oDFmLj9kECHMX0e55Lo4f4RljsWgWAaB8srdQQShnekbRDknPZy +Cx1ju7qtyg5UIOj1HWORzV9TCzufn4QOrmG87+anJYrirmEFRIn0D8KUXtwJoWMM +/3GFZ7ckINqujILWF8Kh74hhshxiq4RA/x1pfGlpVTExUnF0MgPCrb3aCogflP+z +nTwAE7Y0r7SpPAwn3wgVCQoPnSMAgSppm6HA0kWsrCAEgR1DXYcdBIBySwsO6A0G +RO5LlYZMEmMDsZs1IoaZxPzfsSPXe6+iI7sqD+pjdseo9rGwP6LKfoM02bEmkED4 +yvpsBov3jA4ptSd66HjbgU54moqFi2CRZsX/msc64dh8gQdDcTAJUSMCbeCo7tCZ +ObFWbT2OYOvQHsRa20gHDCgOue0YcRdmwenQH8gTXh8hxvJkFxKqZdNalhPfyp4c +QASZQxnJcAtWNTspVSEvzqAsFev8vZdIH9iC3JhOQg8CT83/F82whl0= +=L9/V +-----END PGP PUBLIC KEY BLOCK----- diff -Nru geany-plugins-1.23+dfsg/debian/watch geany-plugins-1.24+dfsg/debian/watch --- geany-plugins-1.23+dfsg/debian/watch 2013-04-01 17:59:08.000000000 +0000 +++ geany-plugins-1.24+dfsg/debian/watch 2014-05-20 07:24:31.000000000 +0000 @@ -1,5 +1,5 @@ # Compulsory line, this is a version 3 file version=3 -opts=dversionmangle=s/\+dfsg(\.\d+)?$// \ +opts=dversionmangle=s/\+dfsg(\.\d+)?$//,pgpsigurlmangle=s/$/.sig/ \ http://plugins.geany.org/geany-plugins/geany-plugins-(.*).tar.gz diff -Nru geany-plugins-1.23+dfsg/debugger/img/Makefile.in geany-plugins-1.24+dfsg/debugger/img/Makefile.in --- geany-plugins-1.23+dfsg/debugger/img/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/debugger/img/Makefile.in 2014-04-13 17:12:41.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,16 +78,19 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(dist_plugindata_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.docs.mk +DIST_COMMON = $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindata_DATA) subdir = debugger/img ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -73,12 +103,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -90,6 +123,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -105,12 +139,18 @@ 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 = \ @@ -147,12 +187,15 @@ } am__installdirs = "$(DESTDIR)$(plugindatadir)" DATA = $(dist_plugindata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -171,6 +214,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -206,6 +251,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -272,6 +320,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -421,11 +479,11 @@ @list='$(dist_plugindata_DATA)'; test -n "$(plugindatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(plugindatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -564,16 +622,17 @@ .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-dist_plugindataDATA \ - 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-dist_plugindataDATA + 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-dist_plugindataDATA 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-dist_plugindataDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru geany-plugins-1.23+dfsg/debugger/INSTALL geany-plugins-1.24+dfsg/debugger/INSTALL --- geany-plugins-1.23+dfsg/debugger/INSTALL 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/debugger/INSTALL 2013-06-30 11:40:06.000000000 +0000 @@ -24,9 +24,9 @@ Fourth -------------------------------------------------------------------------------- -Building much of the available plugins from svn by doing this: +Building much of the available plugins from git by doing this: -svn co https://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk geany-plugins +git clone https://github.com/geany/geany-plugins.git cd geany-plugins ./waf configure ./waf build -p -k diff -Nru geany-plugins-1.23+dfsg/debugger/Makefile.in geany-plugins-1.24+dfsg/debugger/Makefile.in --- geany-plugins-1.23+dfsg/debugger/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/debugger/Makefile.in 2014-04-13 17:12:41.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - INSTALL NEWS THANKS TODO +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog INSTALL NEWS README THANKS TODO subdir = debugger ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -467,22 +545,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -497,57 +578,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 \ @@ -563,12 +599,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; \ @@ -580,15 +611,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 @@ -597,6 +624,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 @@ -760,22 +802,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/debugger/src/callbacks.c geany-plugins-1.24+dfsg/debugger/src/callbacks.c --- geany-plugins-1.23+dfsg/debugger/src/callbacks.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/debugger/src/callbacks.c 2014-04-13 13:33:33.000000000 +0000 @@ -157,13 +157,17 @@ /* * Handles mouse leave event to check if a calltip is still present and hides it if yes */ -static gint leave_signal; +static gulong leave_signal = 0; static gboolean on_mouse_leave(GtkWidget *widget, GdkEvent *event, gpointer user_data) { ScintillaObject *so = (ScintillaObject*)widget; - if (scintilla_send_message (so, SCI_CALLTIPACTIVE, 0, 0)) + if (leave_signal > 0) { g_signal_handler_disconnect(G_OBJECT(widget), leave_signal); + leave_signal = 0; + } + if (scintilla_send_message (so, SCI_CALLTIPACTIVE, 0, 0)) + { scintilla_send_message (so, SCI_CALLTIPCANCEL, 0, 0); } return FALSE; @@ -234,12 +238,17 @@ } case SCN_DWELLEND: { + if (leave_signal > 0) + { + g_signal_handler_disconnect(G_OBJECT(editor->sci), leave_signal); + leave_signal = 0; + } + if (DBS_STOPPED != debug_get_state ()) break; if (scintilla_send_message (editor->sci, SCI_CALLTIPACTIVE, 0, 0)) { - g_signal_handler_disconnect(G_OBJECT(editor->sci), leave_signal); scintilla_send_message (editor->sci, SCI_CALLTIPCANCEL, 0, 0); } break; diff -Nru geany-plugins-1.23+dfsg/debugger/src/Makefile.in geany-plugins-1.24+dfsg/debugger/src/Makefile.in --- geany-plugins-1.23+dfsg/debugger/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/debugger/src/Makefile.in 2014-04-13 17:12:41.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk \ - $(top_srcdir)/build/vars.docs.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/vars.docs.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp subdir = debugger/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -158,9 +192,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 = debugger_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(debugger_la_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 @@ -173,20 +220,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 = $(debugger_la_SOURCES) DIST_SOURCES = $(debugger_la_SOURCES) am__can_run_installinfo = \ @@ -194,6 +237,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -202,6 +262,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -220,6 +282,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -255,6 +319,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -321,6 +388,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -516,6 +593,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -542,12 +620,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + debugger.la: $(debugger_la_OBJECTS) $(debugger_la_DEPENDENCIES) $(EXTRA_debugger_la_DEPENDENCIES) $(AM_V_CCLD)$(debugger_la_LINK) -rpath $(geanypluginsdir) $(debugger_la_OBJECTS) $(debugger_la_LIBADD) $(LIBS) @@ -591,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 $@ $< @@ -809,26 +890,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; \ @@ -840,15 +910,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 @@ -857,6 +923,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 @@ -1003,24 +1084,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/debugger/src/plugin.c geany-plugins-1.24+dfsg/debugger/src/plugin.c --- geany-plugins-1.23+dfsg/debugger/src/plugin.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/debugger/src/plugin.c 2014-04-12 14:28:39.000000000 +0000 @@ -91,6 +91,8 @@ GtkWidget* vbox; int i; + plugin_module_make_resident(geany_plugin); + keys_init(); pixbufs_init(); diff -Nru geany-plugins-1.23+dfsg/defineformat/AUTHORS geany-plugins-1.24+dfsg/defineformat/AUTHORS --- geany-plugins-1.23+dfsg/defineformat/AUTHORS 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/defineformat/AUTHORS 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1 @@ +Pavel Roschin diff -Nru geany-plugins-1.23+dfsg/defineformat/ChangeLog geany-plugins-1.24+dfsg/defineformat/ChangeLog --- geany-plugins-1.23+dfsg/defineformat/ChangeLog 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/defineformat/ChangeLog 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1 @@ + diff -Nru geany-plugins-1.23+dfsg/defineformat/COPYING geany-plugins-1.24+dfsg/defineformat/COPYING --- geany-plugins-1.23+dfsg/defineformat/COPYING 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/defineformat/COPYING 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff -Nru geany-plugins-1.23+dfsg/defineformat/Makefile.am geany-plugins-1.24+dfsg/defineformat/Makefile.am --- geany-plugins-1.23+dfsg/defineformat/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/defineformat/Makefile.am 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,4 @@ +include $(top_srcdir)/build/vars.auxfiles.mk + +SUBDIRS = src +plugin = defineformat diff -Nru geany-plugins-1.23+dfsg/defineformat/Makefile.in geany-plugins-1.24+dfsg/defineformat/Makefile.in --- geany-plugins-1.23+dfsg/defineformat/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/defineformat/Makefile.in 2014-04-13 17:12:41.000000000 +0000 @@ -0,0 +1,825 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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 \ + *\\[\ \ ]*) \ + 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; \ + 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@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog NEWS README +subdir = defineformat +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ + $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ + $(top_srcdir)/build/cppcheck.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ + $(top_srcdir)/build/geanydoc.m4 \ + $(top_srcdir)/build/geanyextrasel.m4 \ + $(top_srcdir)/build/geanygendoc.m4 \ + $(top_srcdir)/build/geanyinsertnum.m4 \ + $(top_srcdir)/build/geanylatex.m4 \ + $(top_srcdir)/build/geanylipsum.m4 \ + $(top_srcdir)/build/geanylua.m4 \ + $(top_srcdir)/build/geanymacro.m4 \ + $(top_srcdir)/build/geanyminiscript.m4 \ + $(top_srcdir)/build/geanynumberedbookmarks.m4 \ + $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ + $(top_srcdir)/build/geanysendmail.m4 \ + $(top_srcdir)/build/geanyvc.m4 \ + $(top_srcdir)/build/geniuspaste.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ + $(top_srcdir)/build/pretty-printer.m4 \ + $(top_srcdir)/build/scope.m4 \ + $(top_srcdir)/build/shiftcolumn.m4 \ + $(top_srcdir)/build/spellcheck.m4 \ + $(top_srcdir)/build/status.m4 \ + $(top_srcdir)/build/tableconvert.m4 \ + $(top_srcdir)/build/treebrowser.m4 \ + $(top_srcdir)/build/unittests.m4 \ + $(top_srcdir)/build/updatechecker.m4 \ + $(top_srcdir)/build/webhelper.m4 \ + $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ + $(top_srcdir)/build/cache/glib-gettext.m4 \ + $(top_srcdir)/build/cache/intltool.m4 \ + $(top_srcdir)/build/cache/libtool.m4 \ + $(top_srcdir)/build/cache/ltoptions.m4 \ + $(top_srcdir)/build/cache/ltsugar.m4 \ + $(top_srcdir)/build/cache/ltversion.m4 \ + $(top_srcdir)/build/cache/lt~obsolete.m4 \ + $(top_srcdir)/build/cache/nls.m4 \ + $(top_srcdir)/build/cache/pkg.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +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_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 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__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__installdirs = "$(DESTDIR)$(plugindocdir)" +DATA = $(dist_plugindoc_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +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) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ +COMMANDER_CFLAGS = @COMMANDER_CFLAGS@ +COMMANDER_LIBS = @COMMANDER_LIBS@ +CPP = @CPP@ +CPPCHECK = @CPPCHECK@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ +DEVHELP_LIBS = @DEVHELP_LIBS@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENCHANT_CFLAGS = @ENCHANT_CFLAGS@ +ENCHANT_LIBS = @ENCHANT_LIBS@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GEANYGENDOC_CFLAGS = @GEANYGENDOC_CFLAGS@ +GEANYGENDOC_LIBS = @GEANYGENDOC_LIBS@ +GEANY_CFLAGS = @GEANY_CFLAGS@ +GEANY_LIBS = @GEANY_LIBS@ +GEANY_VERSION = @GEANY_VERSION@ +GENIUSPASTE_CFLAGS = @GENIUSPASTE_CFLAGS@ +GENIUSPASTE_LIBS = @GENIUSPASTE_LIBS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GPGME_CFLAGS = @GPGME_CFLAGS@ +GPGME_CONFIG = @GPGME_CONFIG@ +GPGME_LIBS = @GPGME_LIBS@ +GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ +GREP = @GREP@ +GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ +GTKSPELL_LIBS = @GTKSPELL_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBMARKDOWN_CFLAGS = @LIBMARKDOWN_CFLAGS@ +LIBMARKDOWN_LIBS = @LIBMARKDOWN_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCALEDIR = @LOCALEDIR@ +LTLIBOBJS = @LTLIBOBJS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_LIBS = @LUA_LIBS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MARKDOWN_CFLAGS = @MARKDOWN_CFLAGS@ +MARKDOWN_LIBS = @MARKDOWN_LIBS@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +MULTITERM_CFLAGS = @MULTITERM_CFLAGS@ +MULTITERM_LIBS = @MULTITERM_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +RST2HTML = @RST2HTML@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +UPDATECHECKER_CFLAGS = @UPDATECHECKER_CFLAGS@ +UPDATECHECKER_LIBS = @UPDATECHECKER_LIBS@ +USE_NLS = @USE_NLS@ +VALAC = @VALAC@ +VERSION = @VERSION@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ +WEBHELPER_CFLAGS = @WEBHELPER_CFLAGS@ +WEBHELPER_LIBS = @WEBHELPER_LIBS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +geanypluginsdir = @geanypluginsdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugindocdir = $(docdir)/$(plugin) +htmldocdir = $(plugindocdir) +plugindatadir = $(pkgdatadir)/$(plugin) +pluginlibdir = $(pkglibdir)/$(plugin) +examplesdir = $(plugindatadir) +dist_plugindoc_DATA = \ + README \ + ChangeLog \ + NEWS \ + COPYING \ + AUTHORS \ + $(AUXFILES) + +EXTRA_DIST = \ + wscript_build \ + wscript_configure + +SUBDIRS = src +plugin = defineformat +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/vars.auxfiles.mk $(top_srcdir)/build/vars.docs.mk $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign defineformat/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign defineformat/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + 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/vars.auxfiles.mk $(top_srcdir)/build/vars.docs.mk: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-dist_plugindocDATA: $(dist_plugindoc_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_plugindoc_DATA)'; test -n "$(plugindocdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindocdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindocdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindocdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindocdir)" || exit $$?; \ + done + +uninstall-dist_plugindocDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_plugindoc_DATA)'; test -n "$(plugindocdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(plugindocdir)'; $(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. +$(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//`; \ + 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; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +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 + +GTAGS: + 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 + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile $(DATA) +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(plugindocdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: install-dist_plugindocDATA + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-dist_plugindocDATA + +.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-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-dist_plugindocDATA 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 \ + uninstall-dist_plugindocDATA + + +# 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. +.NOEXPORT: diff -Nru geany-plugins-1.23+dfsg/defineformat/README geany-plugins-1.24+dfsg/defineformat/README --- geany-plugins-1.23+dfsg/defineformat/README 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/defineformat/README 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,28 @@ +Defineformat +============ + +.. contents:: + +About +----- + +Defineformat -- on-the-fly #define prettyprinter. This plugin will help you to +write multiline defines with aligned backslash. + +Usage +----- + +After installed successfully, load the plugin in Geany's plugin manager. +Try it: open C/C++ file and type: + +#define A() do { \ + +Requirements +------------ + +* GTK >= 2.8.0 + +Contact developers +------------------ + +Pavel Roschin diff -Nru geany-plugins-1.23+dfsg/defineformat/src/defineformat.c geany-plugins-1.24+dfsg/defineformat/src/defineformat.c --- geany-plugins-1.23+dfsg/defineformat/src/defineformat.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/defineformat/src/defineformat.c 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,263 @@ +/* defineformat.c + * + * Copyright 2013 Pavel Roschin + * + * 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., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + + +#ifdef HAVE_CONFIG_H + #include "config.h" /* for the gettext domain */ +#endif + +#include +#ifdef HAVE_LOCALE_H + #include +#endif + +#include + +#include +#include + +#include "Scintilla.h" +#include "SciLexer.h" + +/* #define DEBUG */ + +#ifdef DEBUG +#define dprintf(arg...) fprintf(stderr, arg) +#else +#define dprintf(...); +#endif + +#define SSM(s, m, w, l) scintilla_send_message(s, m, w, l) + +GeanyPlugin *geany_plugin; +GeanyData *geany_data; +GeanyFunctions *geany_functions; + +PLUGIN_VERSION_CHECK(216) +PLUGIN_SET_TRANSLATABLE_INFO( + LOCALEDIR, + GETTEXT_PACKAGE, + _("Define formatter"), + _("Automatically align backslash in multi-line defines"), + "0.1", + "Pavel Roschin ") + +static GArray *lines_stack = NULL; + +static gint +get_line_end(ScintillaObject *sci, gint line) +{ + gint end; + gchar ch; + end = sci_get_line_end_position(sci, line); + ch = sci_get_char_at(sci, end - 1); + while(ch == ' ' || ch == '\t') + { + end--; + ch = sci_get_char_at(sci, end - 1); + } + return end; +} + +static gint +get_indent_pos(ScintillaObject *sci, gint line) +{ + return (gint)SSM(sci, SCI_GETLINEINDENTPOSITION, (uptr_t)line, 0); +} + +static const gchar * +get_char_range(ScintillaObject *sci, gint start, gint length) +{ + return (const gchar *) SSM(sci, SCI_GETRANGEPOINTER, start, length); +} + +static gboolean +inside_define(ScintillaObject *sci, gint line, gboolean newline) +{ + gint lexer; + gint start_pos; + gint end_pos; + gchar end_char; + + lexer = sci_get_lexer(sci); + if(lexer != SCLEX_CPP) + return FALSE; + + end_pos = get_line_end(sci, line); + end_char = sci_get_char_at(sci, end_pos - 1); + if(end_char != '\\') + { + dprintf("End char is not \\, exit\n"); + return FALSE; + } + if(newline) + line--; + do { + line--; + end_pos = get_line_end(sci, line); + end_char = sci_get_char_at(sci, end_pos - 1); + } while(end_char == '\\' && line >= 0); + line++; + dprintf("Expecting define on line %d\n", line + 1); + start_pos = (gint)SSM(sci, SCI_GETLINEINDENTPOSITION, (uptr_t)line, 0); + end_pos = sci_get_line_end_position(sci, line); + if(start_pos == end_pos) + { + dprintf("line empty, exit\n"); + return FALSE; + } + const gchar *start_line = get_char_range(sci, start_pos, 7); + g_return_val_if_fail(NULL != start_line, FALSE); + if(0 != strncmp(start_line, "#define ", strlen("#define "))) + { + dprintf("Start line is not \"#define\", exit\n"); + return FALSE; + } + return TRUE; +} + +static void +define_format_newline(ScintillaObject *sci) +{ + gint end_pos; + gint line; + + line = sci_get_current_line(sci); + if(!inside_define(sci, line, TRUE)) + return; + line--; + end_pos = sci_get_line_end_position(sci, line); + sci_insert_text(sci, end_pos, "\\"); + line += 2; + dprintf("Added line: %d\n", line); + g_array_append_val(lines_stack, line); +} + +static void +define_format_line(ScintillaObject *sci, gint current_line) +{ + gint length; + gint first_line; + gint first_end; + gint max = geany_data->editor_prefs->long_line_column; + + if(!inside_define(sci, current_line, FALSE)) + return; + + first_line = current_line; + first_end = get_line_end(sci, first_line); + for (first_end--; sci_get_char_at(sci, first_end - 1) == ' '; first_end--) {} + SSM(sci, SCI_DELETERANGE, first_end, sci_get_line_end_position(sci, first_line) - first_end); + length = first_end - get_indent_pos(sci, first_line) + sci_get_line_indentation(sci, first_line); + for(; length < max - 1; length++, first_end++) + sci_insert_text(sci, first_end, " "); + sci_insert_text(sci, first_end, "\\"); +} + +static gboolean +editor_notify_cb(GObject *object, GeanyEditor *editor, SCNotification *nt, gpointer data) +{ + gint i = 0, val; + gint old_position = 0; + gint old_lposition = 0; + gint old_line = 0; + gint pos; + if(NULL == editor || NULL == editor->sci) + return FALSE; + if(nt->nmhdr.code == SCN_CHARADDED) + { + if('\n' == nt->ch) + define_format_newline(editor->sci); + } + if(nt->nmhdr.code == SCN_UPDATEUI) + { + if(g_array_index(lines_stack, gint, 0)) + { + /* save current position */ + old_line = sci_get_current_line(editor->sci); + old_lposition = sci_get_line_end_position(editor->sci, old_line) - sci_get_line_length(editor->sci, old_line); + old_position = sci_get_current_position(editor->sci); + sci_start_undo_action(editor->sci); + } + while((val = g_array_index(lines_stack, gint, i))) + { + i++; + define_format_line(editor->sci, val - 1); + dprintf("Removed from stack: %d\n", val); + } + if(i > 0) + { + sci_end_undo_action(editor->sci); + g_array_remove_range(lines_stack, 0, i); + /* restore current position */ + pos = sci_get_line_end_position(editor->sci, old_line) - sci_get_line_length(editor->sci, old_line); + sci_set_current_position(editor->sci, old_position + pos - old_lposition, FALSE); + } + } + if(nt->nmhdr.code == SCN_MODIFIED) + { + if(nt->modificationType & (SC_MOD_INSERTTEXT | SC_MOD_DELETETEXT)) + { + if(nt->modificationType & (SC_PERFORMED_UNDO | SC_PERFORMED_REDO)) + return FALSE; + gint line = sci_get_line_from_position(editor->sci, nt->position) + 1; + if(sci_get_char_at(editor->sci, get_line_end(editor->sci, line - 1) - 1) == '\\') + { + gboolean found = FALSE; + while((val = g_array_index(lines_stack, gint, i))) + { + if(val == line) + { + found = TRUE; + break; + } + i++; + } + if(!found) + { + dprintf("Added line: %d\n", line); + g_array_append_val(lines_stack, line); + } + } + } + } + return FALSE; +} + +PluginCallback plugin_callbacks[] = +{ + { "editor-notify", (GCallback) &editor_notify_cb, FALSE, NULL }, + { NULL, NULL, FALSE, NULL } +}; + +void plugin_init(GeanyData *data) +{ + lines_stack = g_array_new (TRUE, FALSE, sizeof(gint)); +} + +void plugin_cleanup(void) +{ + g_array_free(lines_stack, TRUE); +} + +void +plugin_help(void) +{ + utils_open_browser("http://plugins.geany.org/defineformat.html"); +} diff -Nru geany-plugins-1.23+dfsg/defineformat/src/Makefile.am geany-plugins-1.24+dfsg/defineformat/src/Makefile.am --- geany-plugins-1.23+dfsg/defineformat/src/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/defineformat/src/Makefile.am 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/vars.build.mk + +geanyplugins_LTLIBRARIES = defineformat.la + +defineformat_la_SOURCES = defineformat.c +defineformat_la_LIBADD = $(COMMONLIBS) + +include $(top_srcdir)/build/cppcheck.mk diff -Nru geany-plugins-1.23+dfsg/defineformat/src/Makefile.in geany-plugins-1.24+dfsg/defineformat/src/Makefile.in --- geany-plugins-1.23+dfsg/defineformat/src/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/defineformat/src/Makefile.in 2014-04-13 17:12:42.000000000 +0000 @@ -0,0 +1,802 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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 \ + *\\[\ \ ]*) \ + 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; \ + 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@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp +subdir = defineformat/src +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ + $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ + $(top_srcdir)/build/cppcheck.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ + $(top_srcdir)/build/geanydoc.m4 \ + $(top_srcdir)/build/geanyextrasel.m4 \ + $(top_srcdir)/build/geanygendoc.m4 \ + $(top_srcdir)/build/geanyinsertnum.m4 \ + $(top_srcdir)/build/geanylatex.m4 \ + $(top_srcdir)/build/geanylipsum.m4 \ + $(top_srcdir)/build/geanylua.m4 \ + $(top_srcdir)/build/geanymacro.m4 \ + $(top_srcdir)/build/geanyminiscript.m4 \ + $(top_srcdir)/build/geanynumberedbookmarks.m4 \ + $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ + $(top_srcdir)/build/geanysendmail.m4 \ + $(top_srcdir)/build/geanyvc.m4 \ + $(top_srcdir)/build/geniuspaste.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ + $(top_srcdir)/build/pretty-printer.m4 \ + $(top_srcdir)/build/scope.m4 \ + $(top_srcdir)/build/shiftcolumn.m4 \ + $(top_srcdir)/build/spellcheck.m4 \ + $(top_srcdir)/build/status.m4 \ + $(top_srcdir)/build/tableconvert.m4 \ + $(top_srcdir)/build/treebrowser.m4 \ + $(top_srcdir)/build/unittests.m4 \ + $(top_srcdir)/build/updatechecker.m4 \ + $(top_srcdir)/build/webhelper.m4 \ + $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ + $(top_srcdir)/build/cache/glib-gettext.m4 \ + $(top_srcdir)/build/cache/intltool.m4 \ + $(top_srcdir)/build/cache/libtool.m4 \ + $(top_srcdir)/build/cache/ltoptions.m4 \ + $(top_srcdir)/build/cache/ltsugar.m4 \ + $(top_srcdir)/build/cache/ltversion.m4 \ + $(top_srcdir)/build/cache/lt~obsolete.m4 \ + $(top_srcdir)/build/cache/nls.m4 \ + $(top_srcdir)/build/cache/pkg.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +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__installdirs = "$(DESTDIR)$(geanypluginsdir)" +LTLIBRARIES = $(geanyplugins_LTLIBRARIES) +am__DEPENDENCIES_1 = +am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +defineformat_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_defineformat_la_OBJECTS = defineformat.lo +defineformat_la_OBJECTS = $(am_defineformat_la_OBJECTS) +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 +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +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_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_CCLD_1 = +SOURCES = $(defineformat_la_SOURCES) +DIST_SOURCES = $(defineformat_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + 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 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ +COMMANDER_CFLAGS = @COMMANDER_CFLAGS@ +COMMANDER_LIBS = @COMMANDER_LIBS@ +CPP = @CPP@ +CPPCHECK = @CPPCHECK@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ +DEVHELP_LIBS = @DEVHELP_LIBS@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENCHANT_CFLAGS = @ENCHANT_CFLAGS@ +ENCHANT_LIBS = @ENCHANT_LIBS@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GEANYGENDOC_CFLAGS = @GEANYGENDOC_CFLAGS@ +GEANYGENDOC_LIBS = @GEANYGENDOC_LIBS@ +GEANY_CFLAGS = @GEANY_CFLAGS@ +GEANY_LIBS = @GEANY_LIBS@ +GEANY_VERSION = @GEANY_VERSION@ +GENIUSPASTE_CFLAGS = @GENIUSPASTE_CFLAGS@ +GENIUSPASTE_LIBS = @GENIUSPASTE_LIBS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GPGME_CFLAGS = @GPGME_CFLAGS@ +GPGME_CONFIG = @GPGME_CONFIG@ +GPGME_LIBS = @GPGME_LIBS@ +GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ +GREP = @GREP@ +GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ +GTKSPELL_LIBS = @GTKSPELL_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBMARKDOWN_CFLAGS = @LIBMARKDOWN_CFLAGS@ +LIBMARKDOWN_LIBS = @LIBMARKDOWN_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCALEDIR = @LOCALEDIR@ +LTLIBOBJS = @LTLIBOBJS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_LIBS = @LUA_LIBS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MARKDOWN_CFLAGS = @MARKDOWN_CFLAGS@ +MARKDOWN_LIBS = @MARKDOWN_LIBS@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +MULTITERM_CFLAGS = @MULTITERM_CFLAGS@ +MULTITERM_LIBS = @MULTITERM_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +RST2HTML = @RST2HTML@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +UPDATECHECKER_CFLAGS = @UPDATECHECKER_CFLAGS@ +UPDATECHECKER_LIBS = @UPDATECHECKER_LIBS@ +USE_NLS = @USE_NLS@ +VALAC = @VALAC@ +VERSION = @VERSION@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ +WEBHELPER_CFLAGS = @WEBHELPER_CFLAGS@ +WEBHELPER_LIBS = @WEBHELPER_LIBS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +geanypluginsdir = @geanypluginsdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AM_CFLAGS = \ + -DLOCALEDIR=\""$(LOCALEDIR)"\" \ + -DPREFIX=\""$(prefix)"\" \ + -DDOCDIR=\""$(docdir)"\" \ + -DGEANYPLUGINS_DATADIR=\""$(datadir)"\" \ + -DPKGDATADIR=\""$(pkgdatadir)"\" \ + -DLIBDIR=\""$(libdir)"\" \ + -DPKGLIBDIR=\""$(pkglibdir)"\" \ + $(GEANY_CFLAGS) \ + $(GP_CFLAGS) + +AM_LDFLAGS = -module -avoid-version +COMMONLIBS = \ + $(GEANY_LIBS) \ + $(INTLLIBS) + +geanyplugins_LTLIBRARIES = defineformat.la +defineformat_la_SOURCES = defineformat.c +defineformat_la_LIBADD = $(COMMONLIBS) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/vars.build.mk $(top_srcdir)/build/cppcheck.mk $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign defineformat/src/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign defineformat/src/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + 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/vars.build.mk $(top_srcdir)/build/cppcheck.mk: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(geanypluginsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(geanypluginsdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(geanypluginsdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(geanypluginsdir)"; \ + } + +uninstall-geanypluginsLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(geanypluginsdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(geanypluginsdir)/$$f"; \ + done + +clean-geanypluginsLTLIBRARIES: + -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) + @list='$(geanyplugins_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}; \ + } + +defineformat.la: $(defineformat_la_OBJECTS) $(defineformat_la_DEPENDENCIES) $(EXTRA_defineformat_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) -rpath $(geanypluginsdir) $(defineformat_la_OBJECTS) $(defineformat_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/defineformat.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@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 -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 -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +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 + +GTAGS: + 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 + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@HAVE_CPPCHECK_FALSE@check-local: +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(geanypluginsdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-geanypluginsLTLIBRARIES clean-generic clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-geanypluginsLTLIBRARIES + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-geanypluginsLTLIBRARIES + +.MAKE: check-am install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ + clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES + + +@HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) + +@HAVE_CPPCHECK_TRUE@check-local: check-cppcheck + +# 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. +.NOEXPORT: diff -Nru geany-plugins-1.23+dfsg/defineformat/wscript_build geany-plugins-1.24+dfsg/defineformat/wscript_build --- geany-plugins-1.23+dfsg/defineformat/wscript_build 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/defineformat/wscript_build 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - GeanyLipsum +# +# Copyright 2010 Enrico Tröger +# Copyright 2013 Frank Lanitz +# +# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ + +from build.wafutils import build_plugin + + +name = 'Defineformat' +includes = ['defineformat/src'] + +build_plugin(bld, name, includes=includes) diff -Nru geany-plugins-1.23+dfsg/depcomp geany-plugins-1.24+dfsg/depcomp --- geany-plugins-1.23+dfsg/depcomp 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/depcomp 2014-04-13 17:12:46.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-2013 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 geany-plugins-1.23+dfsg/devhelp/data/Makefile.in geany-plugins-1.24+dfsg/devhelp/data/Makefile.in --- geany-plugins-1.23+dfsg/devhelp/data/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/devhelp/data/Makefile.in 2014-04-13 17:12:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,16 +78,19 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(dist_plugindata_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.docs.mk +DIST_COMMON = $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindata_DATA) subdir = devhelp/data ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -73,12 +103,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -90,6 +123,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -105,12 +139,18 @@ 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 = \ @@ -147,12 +187,15 @@ } am__installdirs = "$(DESTDIR)$(plugindatadir)" DATA = $(dist_plugindata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -171,6 +214,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -206,6 +251,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -272,6 +320,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -417,11 +475,11 @@ @list='$(dist_plugindata_DATA)'; test -n "$(plugindatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(plugindatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -560,16 +618,17 @@ .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-dist_plugindataDATA \ - 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-dist_plugindataDATA + 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-dist_plugindataDATA 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-dist_plugindataDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru geany-plugins-1.23+dfsg/devhelp/devhelp/Makefile.in geany-plugins-1.24+dfsg/devhelp/devhelp/Makefile.in --- geany-plugins-1.23+dfsg/devhelp/devhelp/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/devhelp/devhelp/Makefile.in 2014-04-13 17:12:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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,14 +79,18 @@ build_triplet = @build@ host_triplet = @host@ subdir = devhelp/devhelp -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -72,12 +103,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -89,6 +123,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -124,10 +159,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 = libdevhelp_2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libdevhelp_2_la_CFLAGS) $(CFLAGS) $(libdevhelp_2_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 @@ -140,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 = $(libdevhelp_2_la_SOURCES) DIST_SOURCES = $(libdevhelp_2_la_SOURCES) am__can_run_installinfo = \ @@ -161,6 +205,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -169,6 +230,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -187,6 +250,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -222,6 +287,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -288,6 +356,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -468,12 +546,15 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_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='$(noinst_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}; \ + } + libdevhelp-2.la: $(libdevhelp_2_la_OBJECTS) $(libdevhelp_2_la_DEPENDENCIES) $(EXTRA_libdevhelp_2_la_DEPENDENCIES) $(AM_V_CCLD)$(libdevhelp_2_la_LINK) $(libdevhelp_2_la_OBJECTS) $(libdevhelp_2_la_LIBADD) $(LIBS) @@ -508,14 +589,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 +744,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 +764,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 +777,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 @@ -855,18 +936,19 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES 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-noinstLTLIBRARIES 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 dh-enum-types.h: dh-enum-types.h.template $(dh_headers) $(GLIB_MKENUMS) diff -Nru geany-plugins-1.23+dfsg/devhelp/Makefile.in geany-plugins-1.24+dfsg/devhelp/Makefile.in --- geany-plugins-1.23+dfsg/devhelp/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/devhelp/Makefile.in 2014-04-13 17:12:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - INSTALL NEWS +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog INSTALL NEWS README subdir = devhelp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -467,22 +545,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -497,57 +578,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 \ @@ -563,12 +599,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; \ @@ -580,15 +611,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 @@ -597,6 +624,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 @@ -760,22 +802,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/devhelp/src/Makefile.in geany-plugins-1.24+dfsg/devhelp/src/Makefile.in --- geany-plugins-1.23+dfsg/devhelp/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/devhelp/src/Makefile.in 2014-04-13 17:12:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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,17 +79,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp $(noinst_HEADERS) subdir = devhelp/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -145,9 +179,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 = devhelp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(devhelp_la_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 @@ -160,20 +207,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 = $(devhelp_la_SOURCES) DIST_SOURCES = $(devhelp_la_SOURCES) am__can_run_installinfo = \ @@ -182,6 +225,23 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac HEADERS = $(noinst_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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -190,6 +250,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -208,6 +270,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -243,6 +307,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -309,6 +376,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -456,6 +533,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -482,12 +560,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + devhelp.la: $(devhelp_la_OBJECTS) $(devhelp_la_DEPENDENCIES) $(EXTRA_devhelp_la_DEPENDENCIES) $(AM_V_CCLD)$(devhelp_la_LINK) -rpath $(geanypluginsdir) $(devhelp_la_OBJECTS) $(devhelp_la_LIBADD) $(LIBS) @@ -506,14 +587,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 $@ $< @@ -549,26 +630,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; \ @@ -580,15 +650,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 @@ -597,6 +663,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,24 +824,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/geanydoc/Makefile.in geany-plugins-1.24+dfsg/geanydoc/Makefile.in --- geany-plugins-1.23+dfsg/geanydoc/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanydoc/Makefile.in 2014-04-13 17:12:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - NEWS THANKS +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog NEWS README THANKS subdir = geanydoc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -467,22 +545,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -497,57 +578,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 \ @@ -563,12 +599,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; \ @@ -580,15 +611,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 @@ -597,6 +624,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 @@ -760,22 +802,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/geanydoc/README geany-plugins-1.24+dfsg/geanydoc/README --- geany-plugins-1.23+dfsg/geanydoc/README 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanydoc/README 2013-06-30 11:40:06.000000000 +0000 @@ -15,7 +15,7 @@ execute external program. Geanydoc is intended to be used for searching documentation API in different sources. -In order to use it you need Geany >= 0.16 or svn version. +In order to use it you need Geany >= 0.16. Usage ===== diff -Nru geany-plugins-1.23+dfsg/geanydoc/src/config.c geany-plugins-1.24+dfsg/geanydoc/src/config.c --- geany-plugins-1.23+dfsg/geanydoc/src/config.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanydoc/src/config.c 2014-04-12 14:28:39.000000000 +0000 @@ -111,12 +111,12 @@ gchar *key = g_strdup_printf("command%d", cmd_num); ret = utils_get_setting_string(config, lang, key, ""); g_free(key); - if (!NZV(ret)) + if (EMPTY(ret)) return ret; key = g_strdup_printf("command%d", cmd_num + 1); tmp = utils_get_setting_string(config, lang, key, ""); g_free(key); - if (NZV(tmp)) + if (! EMPTY(tmp)) *intern = TRUE; else *intern = utils_get_setting_boolean(config, lang, "internal", FALSE); diff -Nru geany-plugins-1.23+dfsg/geanydoc/src/geanydoc.c geany-plugins-1.24+dfsg/geanydoc/src/geanydoc.c --- geany-plugins-1.23+dfsg/geanydoc/src/geanydoc.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanydoc/src/geanydoc.c 2014-04-12 14:28:39.000000000 +0000 @@ -185,7 +185,7 @@ ftype = doc->file_type->name; command = config_get_command(ftype, cmd_num, &intern); - if (!NZV(command)) + if (EMPTY(command)) { g_free(command); return; @@ -201,7 +201,7 @@ if (intern) { g_spawn_command_line_sync(command, &tmp, NULL, NULL, NULL); - if (NZV(tmp)) + if (! EMPTY(tmp)) { show_output(tmp, "*DOC*", NULL, doc->file_type->id); } @@ -271,11 +271,11 @@ if (from != NULL) { - if (NZV(cmd0_txt)) + if (! EMPTY(cmd0_txt)) g_key_file_set_string(config, from, "command0", cmd0_txt); else g_key_file_remove_key(config, from, "command0", NULL); - if (NZV(cmd1_txt)) + if (! EMPTY(cmd1_txt)) g_key_file_set_string(config, from, "command1", cmd1_txt); else g_key_file_remove_key(config, from, "command1", NULL); diff -Nru geany-plugins-1.23+dfsg/geanydoc/src/Makefile.in geany-plugins-1.24+dfsg/geanydoc/src/Makefile.in --- geany-plugins-1.23+dfsg/geanydoc/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanydoc/src/Makefile.in 2014-04-13 17:12:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,17 +78,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp subdir = geanydoc/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -74,12 +104,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -91,6 +124,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -143,9 +177,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 = geanydoc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(geanydoc_la_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 @@ -158,20 +205,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 = $(geanydoc_la_SOURCES) DIST_SOURCES = $(geanydoc_la_SOURCES) am__can_run_installinfo = \ @@ -179,6 +222,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -187,6 +247,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -205,6 +267,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -240,6 +304,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -306,6 +373,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -436,6 +513,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -462,12 +540,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + geanydoc.la: $(geanydoc_la_OBJECTS) $(geanydoc_la_DEPENDENCIES) $(EXTRA_geanydoc_la_DEPENDENCIES) $(AM_V_CCLD)$(geanydoc_la_LINK) -rpath $(geanypluginsdir) $(geanydoc_la_OBJECTS) $(geanydoc_la_LIBADD) $(LIBS) @@ -485,14 +566,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 $@ $< @@ -521,26 +602,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; \ @@ -552,15 +622,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 @@ -569,6 +635,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 @@ -715,24 +796,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/geanydoc/tests/Makefile.am geany-plugins-1.24+dfsg/geanydoc/tests/Makefile.am --- geany-plugins-1.23+dfsg/geanydoc/tests/Makefile.am 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanydoc/tests/Makefile.am 2013-06-30 11:40:06.000000000 +0000 @@ -1,8 +1,8 @@ if UNITTESTS include $(top_srcdir)/build/vars.build.mk -INCLUDES = $(GEANY_CFLAGS) -DUNITTESTS TESTS=unittests noinst_PROGRAMS=unittests unittests_SOURCES = unittests.c -unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ +unittests_CFLAGS = $(GEANY_CFLAGS) -DUNITTESTS +unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ endif diff -Nru geany-plugins-1.23+dfsg/geanydoc/tests/Makefile.in geany-plugins-1.24+dfsg/geanydoc/tests/Makefile.in --- geany-plugins-1.23+dfsg/geanydoc/tests/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanydoc/tests/Makefile.in 2014-04-13 17:12:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,22 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp \ + $(top_srcdir)/test-driver @UNITTESTS_TRUE@TESTS = unittests$(EXEEXT) @UNITTESTS_TRUE@noinst_PROGRAMS = unittests$(EXEEXT) subdir = geanydoc/tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +106,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +126,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -109,13 +144,29 @@ CONFIG_CLEAN_VPATH_FILES = PROGRAMS = $(noinst_PROGRAMS) am__unittests_SOURCES_DIST = unittests.c -@UNITTESTS_TRUE@am_unittests_OBJECTS = unittests.$(OBJEXT) +@UNITTESTS_TRUE@am_unittests_OBJECTS = unittests-unittests.$(OBJEXT) unittests_OBJECTS = $(am_unittests_OBJECTS) am__DEPENDENCIES_1 = @UNITTESTS_TRUE@unittests_DEPENDENCIES = $(am__DEPENDENCIES_1) 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 = +unittests_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(unittests_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 @@ -128,20 +179,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 = $(unittests_SOURCES) DIST_SOURCES = $(am__unittests_SOURCES_DIST) am__can_run_installinfo = \ @@ -149,16 +196,237 @@ 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) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -177,6 +445,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -212,6 +482,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -278,6 +551,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -365,13 +648,13 @@ @UNITTESTS_TRUE@ $(GEANY_LIBS) \ @UNITTESTS_TRUE@ $(INTLLIBS) -@UNITTESTS_TRUE@INCLUDES = $(GEANY_CFLAGS) -DUNITTESTS @UNITTESTS_TRUE@unittests_SOURCES = unittests.c +@UNITTESTS_TRUE@unittests_CFLAGS = $(GEANY_CFLAGS) -DUNITTESTS @UNITTESTS_TRUE@unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/vars.build.mk $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -412,9 +695,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + unittests$(EXEEXT): $(unittests_OBJECTS) $(unittests_DEPENDENCIES) $(EXTRA_unittests_DEPENDENCIES) @rm -f unittests$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(unittests_OBJECTS) $(unittests_LDADD) $(LIBS) + $(AM_V_CCLD)$(unittests_LINK) $(unittests_OBJECTS) $(unittests_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -422,21 +706,21 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unittests.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unittests-unittests.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @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 $@ $< @@ -445,32 +729,35 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +unittests-unittests.o: unittests.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittests_CFLAGS) $(CFLAGS) -MT unittests-unittests.o -MD -MP -MF $(DEPDIR)/unittests-unittests.Tpo -c -o unittests-unittests.o `test -f 'unittests.c' || echo '$(srcdir)/'`unittests.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/unittests-unittests.Tpo $(DEPDIR)/unittests-unittests.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unittests.c' object='unittests-unittests.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittests_CFLAGS) $(CFLAGS) -c -o unittests-unittests.o `test -f 'unittests.c' || echo '$(srcdir)/'`unittests.c + +unittests-unittests.obj: unittests.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittests_CFLAGS) $(CFLAGS) -MT unittests-unittests.obj -MD -MP -MF $(DEPDIR)/unittests-unittests.Tpo -c -o unittests-unittests.obj `if test -f 'unittests.c'; then $(CYGPATH_W) 'unittests.c'; else $(CYGPATH_W) '$(srcdir)/unittests.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/unittests-unittests.Tpo $(DEPDIR)/unittests-unittests.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unittests.c' object='unittests-unittests.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittests_CFLAGS) $(CFLAGS) -c -o unittests-unittests.obj `if test -f 'unittests.c'; then $(CYGPATH_W) 'unittests.c'; else $(CYGPATH_W) '$(srcdir)/unittests.c'; fi` + mostlyclean-libtool: -rm -f *.lo 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; \ @@ -482,15 +769,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 @@ -499,102 +782,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; \ + else \ + 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 $$? +unittests.log: unittests$(EXEEXT) + @p='unittests$(EXEEXT)'; \ + b='unittests'; \ + $(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'`; \ @@ -651,6 +1019,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: @@ -734,9 +1105,9 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-generic clean-libtool clean-noinstPROGRAMS ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + 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-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -746,7 +1117,7 @@ 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 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru geany-plugins-1.23+dfsg/geanyextrasel/ChangeLog geany-plugins-1.24+dfsg/geanyextrasel/ChangeLog --- geany-plugins-1.23+dfsg/geanyextrasel/ChangeLog 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyextrasel/ChangeLog 2013-06-30 11:40:06.000000000 +0000 @@ -1,7 +1,11 @@ -2012-06-13 Dimitar Zhekov +2013-03-19 Dimitar Zhekov * src/extrasel.c: + Added "Toggle Rectangular/Stream". + +2012-06-13 Dimitar Zhekov + * src/extrasel.c: Fixed the prototype of on_column_mode_toggled(). Partially restored ignore_callback to avoid delay on document activation. @@ -9,7 +13,6 @@ 2012-06-13 Dimitar Zhekov * src/extrasel.c: - Fixed on_settings_change() prototype. Fixed on settings changed to reassign the selection keys for all documents, not the current document only. diff -Nru geany-plugins-1.23+dfsg/geanyextrasel/Makefile.in geany-plugins-1.24+dfsg/geanyextrasel/Makefile.in --- geany-plugins-1.23+dfsg/geanyextrasel/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyextrasel/Makefile.in 2014-04-13 17:12:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - NEWS +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog NEWS README subdir = geanyextrasel ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -467,22 +545,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -497,57 +578,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 \ @@ -563,12 +599,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; \ @@ -580,15 +611,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 @@ -597,6 +624,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 @@ -760,22 +802,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/geanyextrasel/README geany-plugins-1.24+dfsg/geanyextrasel/README --- geany-plugins-1.23+dfsg/geanyextrasel/README 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyextrasel/README 2013-06-30 11:40:06.000000000 +0000 @@ -3,12 +3,15 @@ About ----- -The Extra Selection adds the following functions: +The Extra Selection plugin adds the following functions to Geany: Goto matching brace and select (Select to Matching Brace). Goto line and select (Select to Line). +Toggle the current selection type between stream and rectangular +(without changing column mode, can be invoked while drag-selecting). + Ctrl-Shift-Alt-Left/Right/Home/End keys - same as Ctrl-Shift, but for rectangular selection. @@ -17,6 +20,8 @@ Selection with anchor instead of the Shift-movement keys. +-- + "Movement keys" refers to the arrows, Home, End, Page Up and Page Down. For more information, see the Usage section below. @@ -35,11 +40,11 @@ Usage ----- -Under Tools -> Extra Selection, there are 6 new items: "Column Mode", -"Select to Line" and "Select to Matching Brace", "Set Anchor", "Select to -Anchor" and "Rectangle Select to Anchor". Normally these should be bound -to keys, for example Alt-C, Alt-Shift-L, Ctrl-Shift-B, F12, Shift-F12 and -Alt-Shift-F12. Now: +Under Tools -> Extra Selection, there are 7 new items: "Column Mode", +"Select to Line", "Select to Matching Brace", "Toggle Rectangular/Stream", +"Set Anchor", "Select to Anchor" and "Rectangle Select to Anchor". +Normally these should be bound to keys, for example Alt-C, Alt-Shift-L, +Ctrl-Shift-B, Ctrl+2, F12, Shift-F12 and Alt-Shift-F12. Now: 1. Position the cursor on an opening brace and invoke "Select to Matching Brace". The cursor will move to the closing brace, and the braced area diff -Nru geany-plugins-1.23+dfsg/geanyextrasel/src/extrasel.c geany-plugins-1.24+dfsg/geanyextrasel/src/extrasel.c --- geany-plugins-1.23+dfsg/geanyextrasel/src/extrasel.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyextrasel/src/extrasel.c 2013-06-30 11:40:06.000000000 +0000 @@ -32,7 +32,7 @@ PLUGIN_VERSION_CHECK(189) PLUGIN_SET_INFO(_("Extra Selection"), _("Column mode, select to line / brace / anchor."), - "0.5", "Dimitar Toshkov Zhekov ") + "0.51", "Dimitar Toshkov Zhekov ") /* Keybinding(s) */ enum @@ -40,6 +40,7 @@ COLUMN_MODE_KB, GOTO_LINE_EXTEND_KB, BRACE_MATCH_EXTEND_KB, + CONVERT_SELECTION_KB, SET_ANCHOR_KB, ANCHOR_EXTEND_KB, ANCHOR_RECTEXTEND_KB, @@ -193,7 +194,7 @@ if (sci && sci_has_selection(sci) && sci_rectangle_selection(sci) && gtk_window_get_focus(GTK_WINDOW(widget)) == GTK_WIDGET(sci)) { - /* not exactly a bug, yet... */ + /* not exactly a bug, but... */ convert_selection(sci, FALSE); } break; @@ -372,6 +373,20 @@ on_brace_match_activate(NULL, NULL); } +static void on_convert_selection_activate(G_GNUC_UNUSED GtkMenuItem *menuitem, + G_GNUC_UNUSED gpointer gdata) +{ + ScintillaObject *sci = scintilla_get_current(); + + if (sci) + convert_selection(sci, !sci_rectangle_selection(sci)); +} + +static void on_convert_selection_key(G_GNUC_UNUSED guint key_id) +{ + on_convert_selection_activate(NULL, NULL); +} + /* Set anchor / select to anchor */ static void save_selection(ScintillaObject *sci) @@ -472,6 +487,11 @@ { NULL, NULL, FALSE, NULL } }; +static void on_extra_select_activate(G_GNUC_UNUSED GtkMenuItem *menuitem, gpointer gdata) +{ + gtk_widget_set_sensitive(GTK_WIDGET(gdata), sci_has_selection(scintilla_get_current())); +} + void plugin_init(G_GNUC_UNUSED GeanyData *data) { GtkContainer *menu; @@ -505,6 +525,13 @@ keybindings_set_item(plugin_key_group, BRACE_MATCH_EXTEND_KB, on_brace_match_key, 0, 0, "brace_match_extend", _("Select to matching brace"), item); + item = gtk_menu_item_new_with_mnemonic(_("_Toggle Stream/Rectangular")); + gtk_container_add(menu, item); + g_signal_connect(item, "activate", G_CALLBACK(on_convert_selection_activate), NULL); + keybindings_set_item(plugin_key_group, CONVERT_SELECTION_KB, on_convert_selection_key, + 0, 0, "convert_selection", _("Convert selection"), item); + g_signal_connect(main_menu_item, "activate", G_CALLBACK(on_extra_select_activate), item); + gtk_container_add(menu, gtk_separator_menu_item_new()); item = gtk_menu_item_new_with_mnemonic(_("_Set Anchor")); diff -Nru geany-plugins-1.23+dfsg/geanyextrasel/src/Makefile.in geany-plugins-1.24+dfsg/geanyextrasel/src/Makefile.in --- geany-plugins-1.23+dfsg/geanyextrasel/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyextrasel/src/Makefile.in 2014-04-13 17:12:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,17 +78,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp subdir = geanyextrasel/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -74,12 +104,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -91,6 +124,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -143,6 +177,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 @@ -155,20 +202,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 = $(geanyextrasel_la_SOURCES) DIST_SOURCES = $(geanyextrasel_la_SOURCES) am__can_run_installinfo = \ @@ -176,6 +219,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -184,6 +244,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -202,6 +264,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -237,6 +301,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -303,6 +370,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -428,6 +505,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -454,12 +532,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + geanyextrasel.la: $(geanyextrasel_la_OBJECTS) $(geanyextrasel_la_DEPENDENCIES) $(EXTRA_geanyextrasel_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) -rpath $(geanypluginsdir) $(geanyextrasel_la_OBJECTS) $(geanyextrasel_la_LIBADD) $(LIBS) @@ -476,14 +557,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 $@ $< @@ -498,26 +579,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; \ @@ -529,15 +599,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 @@ -546,6 +612,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 @@ -692,24 +773,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/geanygendoc/data/filetypes/Makefile.in geany-plugins-1.24+dfsg/geanygendoc/data/filetypes/Makefile.in --- geany-plugins-1.23+dfsg/geanygendoc/data/filetypes/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanygendoc/data/filetypes/Makefile.in 2014-04-13 17:12:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,16 +78,19 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(dist_filetypes_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.docs.mk +DIST_COMMON = $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_filetypes_DATA) subdir = geanygendoc/data/filetypes ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -73,12 +103,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -90,6 +123,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -105,12 +139,18 @@ 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 = \ @@ -147,12 +187,15 @@ } am__installdirs = "$(DESTDIR)$(filetypesdir)" DATA = $(dist_filetypes_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -171,6 +214,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -206,6 +251,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -272,6 +320,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -415,11 +473,11 @@ @list='$(dist_filetypes_DATA)'; test -n "$(filetypesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(filetypesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -558,16 +616,17 @@ .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-dist_filetypesDATA \ - 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-dist_filetypesDATA + 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-dist_filetypesDATA 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-dist_filetypesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru geany-plugins-1.23+dfsg/geanygendoc/data/Makefile.in geany-plugins-1.24+dfsg/geanygendoc/data/Makefile.in --- geany-plugins-1.23+dfsg/geanygendoc/data/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanygendoc/data/Makefile.in 2014-04-13 17:12:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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,14 +78,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = geanygendoc/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -71,12 +101,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -88,6 +121,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -103,21 +137,28 @@ 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;; \ @@ -125,9 +166,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 = $(SUBDIRS) @@ -162,6 +223,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -180,6 +243,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -215,6 +280,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -281,6 +349,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -394,22 +472,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; \ @@ -424,57 +505,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 \ @@ -490,12 +526,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; \ @@ -507,15 +538,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 @@ -524,6 +551,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 @@ -684,22 +726,20 @@ 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 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru geany-plugins-1.23+dfsg/geanygendoc/docs/Makefile.in geany-plugins-1.24+dfsg/geanygendoc/docs/Makefile.in --- geany-plugins-1.23+dfsg/geanygendoc/docs/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanygendoc/docs/Makefile.in 2014-04-13 17:12:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,17 +78,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(dist_plugindoc_DATA) $(dist_pluginhtmldoc_DATA) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/vars.docs.mk +DIST_COMMON = $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) \ + $(dist_pluginhtmldoc_DATA) subdir = geanygendoc/docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -74,12 +104,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -91,6 +124,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -106,12 +140,18 @@ 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 = \ @@ -149,12 +189,15 @@ am__installdirs = "$(DESTDIR)$(plugindocdir)" \ "$(DESTDIR)$(pluginhtmldocdir)" DATA = $(dist_plugindoc_DATA) $(dist_pluginhtmldoc_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -173,6 +216,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -208,6 +253,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -274,6 +322,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -444,11 +502,11 @@ @list='$(dist_pluginhtmldoc_DATA)'; test -n "$(pluginhtmldocdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(pluginhtmldocdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -589,16 +647,17 @@ .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-dist_plugindocDATA \ - install-dist_pluginhtmldocDATA 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-dist_plugindocDATA install-dist_pluginhtmldocDATA \ + 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-dist_plugindocDATA uninstall-dist_pluginhtmldocDATA diff -Nru geany-plugins-1.23+dfsg/geanygendoc/Makefile.in geany-plugins-1.24+dfsg/geanygendoc/Makefile.in --- geany-plugins-1.23+dfsg/geanygendoc/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanygendoc/Makefile.in 2014-04-13 17:12:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - INSTALL NEWS TODO +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog INSTALL NEWS README TODO subdir = geanygendoc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -467,22 +545,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -497,57 +578,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 \ @@ -563,12 +599,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; \ @@ -580,15 +611,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 @@ -597,6 +624,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 @@ -760,22 +802,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/geanygendoc/src/ggd.c geany-plugins-1.24+dfsg/geanygendoc/src/ggd.c --- geany-plugins-1.23+dfsg/geanygendoc/src/ggd.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanygendoc/src/ggd.c 2014-04-12 14:28:39.000000000 +0000 @@ -179,7 +179,7 @@ ctpl_environ_push_int (env, "returns", returns); /* get direct children tags */ children = ggd_tag_find_children (tag_array, tag, - FILETYPE_ID (doc->file_type), 0); + FILETYPE_ID (doc->file_type)); if (setting->merge_children) { CtplValue *v; @@ -546,7 +546,7 @@ if (setting && setting->autodoc_children) { tag_list = ggd_tag_find_children_filtered (tag_array, tag, FILETYPE_ID (doc->file_type), - 0, setting->matches); + setting->matches); } /* we assume that a parent always comes before any children, then simply add * it at the end */ diff -Nru geany-plugins-1.23+dfsg/geanygendoc/src/ggd-doc-type.c geany-plugins-1.24+dfsg/geanygendoc/src/ggd-doc-type.c --- geany-plugins-1.23+dfsg/geanygendoc/src/ggd-doc-type.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanygendoc/src/ggd-doc-type.c 2014-04-12 14:28:39.000000000 +0000 @@ -174,12 +174,13 @@ gint *nth_child) { GgdDocSetting *setting = NULL; - gchar *child_match = g_strdup (match); + gchar *child_match = NULL; g_return_val_if_fail (doctype != NULL, NULL); /*g_debug ("Resolving match \"%s\"...", child_match);*/ if (nth_child) (*nth_child) = 0; + child_match = g_strdup (match); setting = ggd_doc_type_get_setting (doctype, child_match); while (setting && setting->policy == GGD_POLICY_FORWARD) { gchar *parent_match = get_parent_match (child_match); diff -Nru geany-plugins-1.23+dfsg/geanygendoc/src/ggd-file-type-loader.c geany-plugins-1.24+dfsg/geanygendoc/src/ggd-file-type-loader.c --- geany-plugins-1.23+dfsg/geanygendoc/src/ggd-file-type-loader.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanygendoc/src/ggd-file-type-loader.c 2014-04-12 14:28:39.000000000 +0000 @@ -408,7 +408,7 @@ identifier = g_strdup (scanner->value.v_identifier); /*g_debug ("identifier is %s", identifier);*/ - switch (g_scanner_get_next_token (scanner)) { + switch ((guint) g_scanner_get_next_token (scanner)) { case '.': /* skip it */ break; case G_TOKEN_EQUAL_SIGN: diff -Nru geany-plugins-1.23+dfsg/geanygendoc/src/ggd-options.c geany-plugins-1.24+dfsg/geanygendoc/src/ggd-options.c --- geany-plugins-1.23+dfsg/geanygendoc/src/ggd-options.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanygendoc/src/ggd-options.c 2013-06-30 11:40:06.000000000 +0000 @@ -619,6 +619,7 @@ data = g_key_file_to_data (key_file, &data_length, error); if (data) { success = g_file_set_contents (filename, data, data_length, error); + g_free (data); } g_key_file_free (key_file); diff -Nru geany-plugins-1.23+dfsg/geanygendoc/src/ggd-options.h geany-plugins-1.24+dfsg/geanygendoc/src/ggd-options.h --- geany-plugins-1.23+dfsg/geanygendoc/src/ggd-options.h 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanygendoc/src/ggd-options.h 2013-06-30 11:40:06.000000000 +0000 @@ -29,6 +29,11 @@ G_BEGIN_DECLS GGD_BEGIN_PLUGIN_API +#if GTK_CHECK_VERSION(3, 0, 0) +# define GtkObject GtkWidget +# define GTK_OBJECT GTK_WIDGET +#endif + /** * GgdOptGroup: diff -Nru geany-plugins-1.23+dfsg/geanygendoc/src/ggd-tag-utils.c geany-plugins-1.24+dfsg/geanygendoc/src/ggd-tag-utils.c --- geany-plugins-1.23+dfsg/geanygendoc/src/ggd-tag-utils.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanygendoc/src/ggd-tag-utils.c 2014-04-12 14:28:39.000000000 +0000 @@ -424,69 +424,11 @@ return tag; } - -/* - * scope_child_matches: - * @a: parent scope - * @b: child scope - * @geany_ft: The Geany's file type identifier for which tags were generated - * @maxdepth: maximum sub-child level that matches, or < 0 for all to match - * - * Checks if scope @b is inside scope @a. @maxdepth make possible to only match - * child scope if it have less than @maxdepth parents before scope @a. - * E.g., with a maximum depth of 1, only direct children will match. - * - * Returns: %TRUE if matches, %FALSE otherwise. - */ -static gboolean -scope_child_matches (const gchar *a, - const gchar *b, - filetype_id geany_ft, - gint maxdepth) -{ - gboolean matches = FALSE; - - /*g_debug ("trying to match %s against %s", b, a);*/ - if (a && b) { - for (; *a && *b && *a == *b; a++, b++); - if (! *a /* we're at the end of the prefix and it matched */) { - const gchar *separator; - - separator = symbols_get_context_separator (geany_ft); - if (maxdepth < 0) { - if (! *b || strncmp (b, separator, strlen (separator)) == 0) { - matches = TRUE; - } - } else { - while (! matches && maxdepth >= 0) { - const gchar *tmp; - - tmp = strstr (b, separator); - if (tmp) { - b = &tmp[2]; - maxdepth --; - } else { - if (! *b) { - matches = TRUE; - } - break; - } - } - } - } - } - - return matches; -} - - /** * ggd_tag_find_children: * @tags: Array of tags that contains @parent * @parent: Tag for which get children * @geany_ft: The Geany's file type identifier for which tags were generated - * @depth: Maximum depth for children to be found (< 0 means infinite) - * Value != 0 aren't honored for now, see FIXME in function's body. * @filter: A logical OR of the TMTagTypes to match * * Finds children tags of a #TMTag that matches @matches. @@ -499,46 +441,23 @@ ggd_tag_find_children_filtered (const GPtrArray *tags, const TMTag *parent, filetype_id geany_ft, - gint depth, TMTagType filter) { GList *children = NULL; guint i; TMTag *el; - /*gchar *fake_scope;*/ g_return_val_if_fail (tags != NULL, NULL); g_return_val_if_fail (parent != NULL, NULL); - /*if (parent->atts.entry.scope) { - fake_scope = g_strconcat (parent->atts.entry.scope, - symbols_get_context_separator (geany_ft), - parent->name, NULL); - } else { - fake_scope = g_strdup (parent->name); - }*/ GGD_PTR_ARRAY_FOR (tags, i, el) { - /* FIXME: we definitely need a better way to determinate who is child of - * who and who is parent of who. - * On this side, it may find as children a tag that isn't the children, - * and simply getting children that comes after parent isn't a proper fix - * since the first possible parent will have all children. - * Crap. - * - * Hack by checking if the parent of the element is the same as the parent - * we search for children. It breaks depth >= 0, but as we don't use it for - * now it's OK. A little odd but it works. */ if (el->type & filter && - /*el->atts.entry.line >= parent->atts.entry.line &&*/ - /*scope_child_matches (fake_scope, el->atts.entry.scope, - geany_ft, depth) &&*/ ggd_tag_find_parent (tags, geany_ft, el) == parent) { children = g_list_insert_sorted_with_data (children, el, tag_cmp_by_line, GINT_TO_POINTER (GGD_SORT_ASC)); } } - /*g_free (fake_scope);*/ return children; } @@ -548,7 +467,6 @@ * @tags: Array of tags that contains @parent * @parent: Tag for which get children * @geany_ft: The Geany's file type identifier for which tags were generated - * @depth: Maximum depth for children to be found (< 0 means infinite) * * Finds children tags of a #TMTag. * The returned list of children is sorted in the order they appears @@ -559,9 +477,7 @@ GList * ggd_tag_find_children (const GPtrArray *tags, const TMTag *parent, - filetype_id geany_ft, - gint depth) + filetype_id geany_ft) { - return ggd_tag_find_children_filtered (tags, parent, geany_ft, - depth, tm_tag_max_t); + return ggd_tag_find_children_filtered (tags, parent, geany_ft, tm_tag_max_t); } diff -Nru geany-plugins-1.23+dfsg/geanygendoc/src/ggd-tag-utils.h geany-plugins-1.24+dfsg/geanygendoc/src/ggd-tag-utils.h --- geany-plugins-1.23+dfsg/geanygendoc/src/ggd-tag-utils.h 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanygendoc/src/ggd-tag-utils.h 2014-04-12 14:28:39.000000000 +0000 @@ -56,12 +56,10 @@ GList *ggd_tag_find_children_filtered (const GPtrArray *tags, const TMTag *parent, filetype_id geany_ft, - gint depth, TMTagType filter); GList *ggd_tag_find_children (const GPtrArray *tags, const TMTag *parent, - filetype_id geany_ft, - gint depth); + filetype_id geany_ft); gchar *ggd_tag_resolve_type_hierarchy (const GPtrArray *tags, filetype_id geany_ft, const TMTag *tag); diff -Nru geany-plugins-1.23+dfsg/geanygendoc/src/Makefile.in geany-plugins-1.24+dfsg/geanygendoc/src/Makefile.in --- geany-plugins-1.23+dfsg/geanygendoc/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanygendoc/src/Makefile.in 2014-04-13 17:12:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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,17 +79,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp $(noinst_HEADERS) subdir = geanygendoc/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -153,10 +187,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 = geanygendoc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(geanygendoc_la_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 @@ -169,20 +216,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 = $(geanygendoc_la_SOURCES) DIST_SOURCES = $(geanygendoc_la_SOURCES) am__can_run_installinfo = \ @@ -191,6 +234,23 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac HEADERS = $(noinst_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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -199,6 +259,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -217,6 +279,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -252,6 +316,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -318,6 +385,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -480,6 +557,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -506,12 +584,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + geanygendoc.la: $(geanygendoc_la_OBJECTS) $(geanygendoc_la_DEPENDENCIES) $(EXTRA_geanygendoc_la_DEPENDENCIES) $(AM_V_CCLD)$(geanygendoc_la_LINK) -rpath $(geanypluginsdir) $(geanygendoc_la_OBJECTS) $(geanygendoc_la_LIBADD) $(LIBS) @@ -539,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 $@ $< @@ -645,26 +726,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; \ @@ -676,15 +746,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 @@ -693,6 +759,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 @@ -839,24 +920,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/geanyinsertnum/ChangeLog geany-plugins-1.24+dfsg/geanyinsertnum/ChangeLog --- geany-plugins-1.23+dfsg/geanyinsertnum/ChangeLog 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyinsertnum/ChangeLog 2013-06-30 11:40:06.000000000 +0000 @@ -1,3 +1,30 @@ +2013-10-06 Dimitar Zhekov + + * src/insertnum.c: + Small improvements, increased the maximum number of lines + to 250000. + +2013-10-06 Dimitar Zhekov + + * src/insertnum.c: + Undefined GTK_COMPAT_H and fixed compilation with + Geany >= 2013-03-11 && gtk+ <= 2.22. Let's hope it won't + break anything. + +2013-04-06 Dimitar Zhekov + + * src/insertnum.c: + Fixed some space indentation. + Changes to use GtkGrid under GTK+ 3. + Defined GTK_COMPAT_H to avoid inclusion of gtkcompat.h and + defined the macros required for GTK+ 2/3 compatibility. + +2013-04-06 Quentin Glidic + + * src/insertnum.c: + Changes to compile with GTK+ 3: GtkComboBoxText and + gtk_widget_set_can_default(). + 2011-02-23 Dimitar Zhekov * src/insertnum.c: @@ -23,4 +50,4 @@ 2010-03-12 Dimitar Zhekov * src/insertnum.c: - Small changes to compile with GTK 2.8 / Win32. + Small changes to compile with GTK+ 2.8 / Win32. diff -Nru geany-plugins-1.23+dfsg/geanyinsertnum/Makefile.in geany-plugins-1.24+dfsg/geanyinsertnum/Makefile.in --- geany-plugins-1.23+dfsg/geanyinsertnum/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyinsertnum/Makefile.in 2014-04-13 17:12:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - NEWS +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog NEWS README subdir = geanyinsertnum ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -467,22 +545,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -497,57 +578,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 \ @@ -563,12 +599,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; \ @@ -580,15 +611,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 @@ -597,6 +624,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 @@ -760,22 +802,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/geanyinsertnum/README geany-plugins-1.24+dfsg/geanyinsertnum/README --- geany-plugins-1.23+dfsg/geanyinsertnum/README 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyinsertnum/README 2013-06-30 11:40:06.000000000 +0000 @@ -5,7 +5,7 @@ ----- This plugin replaces a (possibly zero-width) rectangular selection with integer numbers, using start/step/base etc. specified by the user. -For practical reasons, the number of lines is limited to 100000. +For practical reasons, the number of lines is limited to 250000. Lines shorter than the current selection are skipped. diff -Nru geany-plugins-1.23+dfsg/geanyinsertnum/src/insertnum.c geany-plugins-1.24+dfsg/geanyinsertnum/src/insertnum.c --- geany-plugins-1.23+dfsg/geanyinsertnum/src/insertnum.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyinsertnum/src/insertnum.c 2013-06-30 11:40:06.000000000 +0000 @@ -28,6 +28,13 @@ #include "geanyplugin.h" +#ifndef GTK_COMPAT_H +#define GtkComboBoxText GtkComboBox +#define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX +#define gtk_combo_box_text_new_with_entry gtk_combo_box_entry_new_text +#define gtk_combo_box_text_append_text gtk_combo_box_append_text +#endif + GeanyPlugin *geany_plugin; GeanyData *geany_data; GeanyFunctions *geany_functions; @@ -52,7 +59,7 @@ #define RANGE_MAX 2147483647 #define RANGE_LEN 11 #define RANGE_TOOLTIP "-2147483648..2147483647" -#define MAX_LINES 100000 +#define MAX_LINES 250000 typedef struct _InsertNumbersDialog { @@ -64,7 +71,6 @@ typedef gboolean (*entry_valid)(const gchar *text); -static GObject *tools1_menu = NULL; static GtkWidget *main_menu_item = NULL; static gint start_pos, start_line; static gint end_pos, end_line; @@ -108,7 +114,7 @@ static void update_display(void) { while (gtk_events_pending()) - gtk_main_iteration(); + gtk_main_iteration(); } #define sci_point_x_from_position(sci, position) \ @@ -141,7 +147,7 @@ /* lines shorter than the current selection are skipped */ for (line = start_line, i = 0; line <= end_line; line++, i++) { - if (sci_point_x_from_position(sci, + if (sci_point_x_from_position(sci, scintilla_send_message(sci, SCI_GETLINEENDPOSITION, line, 0)) >= xinsert) { line_pos[i] = sci_get_pos_at_line_sel_start(sci, line) - @@ -308,24 +314,26 @@ ui_widget_set_tooltip_text(entry, tooltip); } +#if !GTK_CHECK_VERSION(3, 0, 0) +#define GtkGrid GtkTable +#define GTK_GRID GTK_TABLE +#define gtk_grid_attach(grid, child, left, top, width, height) \ + gtk_table_attach_defaults(grid, child, left, left + width, top, top + height) +#define gtk_grid_set_row_spacing gtk_table_set_row_spacings +#define gtk_grid_set_column_spacing gtk_table_set_col_spacings +#endif + static void on_insert_numbers_activate(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer gdata) { InsertNumbersDialog d; GtkWidget *vbox, *label, *upper, *space, *button; - GtkTable *table; - GtkComboBox *combo; + GtkGrid *grid; + GtkComboBoxText *combo; const char *case_tip = _("For base 11 and above"); gchar *base_text; gint result; - if (!can_insert_numbers()) - { - if (!tools1_menu) - plugin_beep(); /* no visual feedback, so beep */ - return; - } - d.dialog = gtk_dialog_new_with_buttons(_("Insert Numbers"), GTK_WINDOW(geany->main_widgets->window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, @@ -333,63 +341,77 @@ vbox = ui_dialog_vbox_new(GTK_DIALOG(d.dialog)); gtk_box_set_spacing(GTK_BOX(vbox), 9); - table = GTK_TABLE(gtk_table_new(3, 6, FALSE)); - gtk_table_set_row_spacings(table, 6); - gtk_table_set_col_spacings(table, 6); - gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(table), TRUE, TRUE, 0); +#if GTK_CHECK_VERSION(3, 0, 0) + grid = GTK_GRID(gtk_grid_new()); +#else + grid = GTK_TABLE(gtk_table_new(3, 6, FALSE)); +#endif + gtk_grid_set_row_spacing(grid, 6); + gtk_grid_set_column_spacing(grid, 6); + gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(grid), TRUE, TRUE, 0); label = gtk_label_new_with_mnemonic(_("_Start:")); - gtk_table_attach_defaults(table, label, 0, 1, 0, 1); + gtk_grid_attach(grid, label, 0, 0, 1, 1); d.start = gtk_spin_button_new_with_range(RANGE_MIN, RANGE_MAX, 1); set_entry(d.start, RANGE_LEN, label, RANGE_TOOLTIP); - gtk_table_attach_defaults(table, d.start, 1, 3, 0, 1); + gtk_grid_attach(grid, d.start, 1, 0, 2, 1); label = gtk_label_new_with_mnemonic(_("S_tep:")); - gtk_table_attach_defaults(table, label, 3, 4, 0, 1); + gtk_grid_attach(grid, label, 3, 0, 1, 1); d.step = gtk_spin_button_new_with_range(RANGE_MIN, RANGE_MAX, 1); set_entry(d.step, RANGE_LEN, label, RANGE_TOOLTIP); - gtk_table_attach_defaults(table, d.step, 4, 6, 0, 1); + gtk_grid_attach(grid, d.step, 4, 0, 2, 1); label = gtk_label_new_with_mnemonic(_("_Base:")); - gtk_table_attach_defaults(table, label, 0, 1, 1, 2); - combo = GTK_COMBO_BOX(gtk_combo_box_entry_new_text()); + gtk_grid_attach(grid, label, 0, 1, 1, 1), + combo = GTK_COMBO_BOX_TEXT(gtk_combo_box_text_new_with_entry()); d.base = gtk_bin_get_child(GTK_BIN(combo)); set_entry(d.base, 2, label, "2..36"); g_signal_connect(d.base, "insert-text", G_CALLBACK(on_base_insert_text), NULL); - gtk_combo_box_append_text(combo, "2"); - gtk_combo_box_append_text(combo, "8"); - gtk_combo_box_append_text(combo, "10"); - gtk_combo_box_append_text(combo, "16"); - gtk_table_attach(table, GTK_WIDGET(combo), 1, 3, 1, 2, GTK_EXPAND | GTK_FILL, 0, 0, 0); + gtk_combo_box_text_append_text(combo, "2"); + gtk_combo_box_text_append_text(combo, "8"); + gtk_combo_box_text_append_text(combo, "10"); + gtk_combo_box_text_append_text(combo, "16"); +#if GTK_CHECK_VERSION(3, 0, 0) + gtk_grid_attach(grid, GTK_WIDGET(combo), 1, 1, 2, 1); + gtk_widget_set_hexpand(GTK_WIDGET(combo), TRUE); +#else + gtk_table_attach(grid, GTK_WIDGET(combo), 1, 3, 1, 2, GTK_EXPAND | GTK_FILL, 0, 0, 0); +#endif label = gtk_label_new(_("Letters:")); ui_widget_set_tooltip_text(label, case_tip); - gtk_table_attach_defaults(table, label, 3, 4, 1, 2); + gtk_grid_attach(grid, label, 3, 1, 1, 1); upper = gtk_radio_button_new_with_mnemonic(NULL, _("_Upper")); ui_widget_set_tooltip_text(upper, case_tip); - gtk_table_attach_defaults(table, upper, 4, 5, 1, 2); + gtk_grid_attach(grid, upper, 4, 1, 1, 1); d.lower = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(upper)); ui_widget_set_tooltip_text(label, case_tip); label = gtk_label_new_with_mnemonic(_("_Lower")); ui_widget_set_tooltip_text(label, case_tip); gtk_container_add(GTK_CONTAINER(d.lower), label); - gtk_table_attach_defaults(table, d.lower, 5, 6, 1, 2); + gtk_grid_attach(grid, d.lower, 5, 1, 1, 1); d.prefix = gtk_check_button_new_with_mnemonic(_("Base _prefix")); ui_widget_set_tooltip_text(d.prefix, _("0 for octal, 0x for hex, + for positive decimal")); - gtk_table_attach_defaults(table, d.prefix, 1, 3, 2, 3); + gtk_grid_attach(grid, d.prefix, 1, 2, 2, 1); label = gtk_label_new(_("Padding:")); - gtk_table_attach_defaults(table, label, 3, 4, 2, 3); + gtk_grid_attach(grid, label, 3, 2, 1, 1); space = gtk_radio_button_new_with_mnemonic(NULL, _("Sp_ace")); - gtk_table_attach_defaults(table, space, 4, 5, 2, 3); + gtk_grid_attach(grid, space, 4, 2, 1, 1); d.zero = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(space)); label = gtk_label_new_with_mnemonic(_("_Zero")); gtk_container_add(GTK_CONTAINER(d.zero), label); - gtk_table_attach_defaults(table, d.zero, 5, 6, 2, 3); + gtk_grid_attach(grid, d.zero, 5, 2, 1, 1); button = gtk_button_new_from_stock(GTK_STOCK_OK); g_signal_connect(button, "clicked", G_CALLBACK(on_insert_numbers_ok_clicked), &d); - gtk_box_pack_end(GTK_BOX(GTK_DIALOG(d.dialog)->action_area), button, TRUE, TRUE, 0); + gtk_box_pack_end(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(d.dialog))), button, + TRUE, TRUE, 0); +#if GTK_CHECK_VERSION(2, 18, 0) + gtk_widget_set_can_default(button, TRUE); +#else GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); +#endif gtk_widget_grab_default(button); gtk_spin_button_set_value(GTK_SPIN_BUTTON(d.start), start_value); @@ -418,7 +440,7 @@ { gboolean cancel = FALSE; - gtk_widget_set_sensitive(GTK_WIDGET(table), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(grid), FALSE); gtk_widget_set_sensitive(button, FALSE); update_display(); g_signal_connect(d.dialog, "response", @@ -435,10 +457,11 @@ static void on_insert_numbers_key(G_GNUC_UNUSED guint key_id) { - on_insert_numbers_activate(NULL, NULL); + if (can_insert_numbers()) + on_insert_numbers_activate(NULL, NULL); } -static void on_tools1_activate(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer gdata) +static void on_tools_show(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer gdata) { gtk_widget_set_sensitive(main_menu_item, can_insert_numbers()); } @@ -460,14 +483,8 @@ keybindings_set_item(plugin_key_group, INSERT_NUMBERS_KB, on_insert_numbers_key, 0, 0, "insert_numbers", _("Insert Numbers"), main_menu_item); - /* an "update-tools-menu" or something would have been nice */ - tools1_menu = G_OBJECT(g_object_get_data((gpointer) geany->main_widgets->window, - "tools1")); - if (tools1_menu) - { - plugin_signal_connect(geany_plugin, tools1_menu, "activate", FALSE, - (GCallback) on_tools1_activate, NULL); - } + plugin_signal_connect(geany_plugin, G_OBJECT(geany->main_widgets->tools_menu), "show", + FALSE, (GCallback) on_tools_show, NULL); } void plugin_cleanup(void) diff -Nru geany-plugins-1.23+dfsg/geanyinsertnum/src/Makefile.in geany-plugins-1.24+dfsg/geanyinsertnum/src/Makefile.in --- geany-plugins-1.23+dfsg/geanyinsertnum/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyinsertnum/src/Makefile.in 2014-04-13 17:12:42.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,17 +78,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp subdir = geanyinsertnum/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -74,12 +104,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -91,6 +124,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -143,6 +177,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 @@ -155,20 +202,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 = $(geanyinsertnum_la_SOURCES) DIST_SOURCES = $(geanyinsertnum_la_SOURCES) am__can_run_installinfo = \ @@ -176,6 +219,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -184,6 +244,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -202,6 +264,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -237,6 +301,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -303,6 +370,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -428,6 +505,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -454,12 +532,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + geanyinsertnum.la: $(geanyinsertnum_la_OBJECTS) $(geanyinsertnum_la_DEPENDENCIES) $(EXTRA_geanyinsertnum_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) -rpath $(geanypluginsdir) $(geanyinsertnum_la_OBJECTS) $(geanyinsertnum_la_LIBADD) $(LIBS) @@ -476,14 +557,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 $@ $< @@ -498,26 +579,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; \ @@ -529,15 +599,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 @@ -546,6 +612,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 @@ -692,24 +773,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/geanylatex/doc/Makefile.in geany-plugins-1.24+dfsg/geanylatex/doc/Makefile.in --- geany-plugins-1.23+dfsg/geanylatex/doc/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylatex/doc/Makefile.in 2014-04-13 17:12:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,16 +78,19 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.docs.mk +DIST_COMMON = $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) subdir = geanylatex/doc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -73,12 +103,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -90,6 +123,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -105,12 +139,18 @@ 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 = \ @@ -147,12 +187,15 @@ } am__installdirs = "$(DESTDIR)$(plugindocdir)" DATA = $(dist_plugindoc_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -171,6 +214,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -206,6 +251,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -272,6 +320,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -427,11 +485,11 @@ @list='$(dist_plugindoc_DATA)'; test -n "$(plugindocdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(plugindocdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -570,16 +628,17 @@ .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-dist_plugindocDATA \ - 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-dist_plugindocDATA + 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-dist_plugindocDATA 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-dist_plugindocDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru geany-plugins-1.23+dfsg/geanylatex/Makefile.in geany-plugins-1.24+dfsg/geanylatex/Makefile.in --- geany-plugins-1.23+dfsg/geanylatex/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylatex/Makefile.in 2014-04-13 17:12:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - INSTALL NEWS THANKS TODO +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog INSTALL NEWS README THANKS TODO subdir = geanylatex ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -467,22 +545,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -497,57 +578,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 \ @@ -563,12 +599,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; \ @@ -580,15 +611,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 @@ -597,6 +624,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 @@ -760,22 +802,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/geanylatex/src/geanylatex.c geany-plugins-1.24+dfsg/geanylatex/src/geanylatex.c --- geany-plugins-1.23+dfsg/geanylatex/src/geanylatex.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylatex/src/geanylatex.c 2014-04-12 14:28:39.000000000 +0000 @@ -1,7 +1,7 @@ /* * geanylatex.c - Plugin to let Geany better work together with LaTeX * - * Copyright 2007-2012 Frank Lanitz + * Copyright 2007-2013 Frank Lanitz * Copyright 2005-2009 Enrico Tröger * Copyright 2006-2009 Nick Treleaven * @@ -971,7 +971,7 @@ if (ref_string != NULL) g_free(ref_string); if (template_string != NULL) - g_free(template_string); + g_string_free(template_string, TRUE); } } @@ -1265,6 +1265,8 @@ tmp_dir = g_path_get_dirname(doc->real_path); dir = g_dir_open(tmp_dir, 0, NULL); + if(dir == NULL) + g_free(tmp_dir); g_return_if_fail(dir != NULL); foreach_dir(filename, dir) @@ -1275,6 +1277,7 @@ glatex_parse_bib_file(fullpath, textbox); g_free(fullpath); } + g_free(tmp_dir); g_dir_close(dir); model = gtk_combo_box_get_model(GTK_COMBO_BOX(textbox)); gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(model), @@ -1309,10 +1312,8 @@ } else { - if (ref_string != NULL) - g_free(ref_string); - if (template_string != NULL) - g_free(template_string); + g_free(ref_string); + g_free(template_string); } } @@ -1447,7 +1448,7 @@ break; } } - if (classoptions != NULL && NZV(orientation_string)) + if (classoptions != NULL && !EMPTY(orientation_string)) { classoptions = g_strconcat(classoptions, ",", orientation_string, NULL); g_free(orientation_string); @@ -1465,11 +1466,11 @@ classoptions = g_strconcat(draft, NULL); g_free(draft); } - if (classoptions != NULL && NZV(fontsize)) + if (classoptions != NULL && !EMPTY(fontsize)) { classoptions = g_strconcat(classoptions, ",", fontsize, NULL); } - else if (classoptions == NULL && NZV(fontsize)) + else if (classoptions == NULL && !EMPTY(fontsize)) { classoptions = g_strdup(fontsize); } @@ -1533,8 +1534,7 @@ if (template_int < LATEX_WIZARD_TEMPLATE_END || glatex_wizard.template_list == NULL) { - if (template_int == LATEX_WIZARD_TEMPLATE_DEFAULT && - documentclass_int == 3 && documentclass_int == 4) + if (template_int == LATEX_WIZARD_TEMPLATE_DEFAULT) code = g_string_new(TEMPLATE_LATEX); else if (documentclass_int == 3) code = g_string_new(TEMPLATE_LATEX_LETTER); @@ -1595,7 +1595,7 @@ break; } } - if (NZV(author)) + if (!EMPTY(author)) { gchar* author_string = NULL; if (documentclass_int == 3) @@ -1629,7 +1629,7 @@ g_free(author_string); } - if (NZV(date)) + if (!EMPTY(date)) { gchar *date_string = NULL; date_string = g_strconcat("\\date{", date, "}\n", NULL); diff -Nru geany-plugins-1.23+dfsg/geanylatex/src/latexutils.c geany-plugins-1.24+dfsg/geanylatex/src/latexutils.c --- geany-plugins-1.23+dfsg/geanylatex/src/latexutils.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylatex/src/latexutils.c 2014-04-12 14:28:39.000000000 +0000 @@ -64,7 +64,7 @@ pos = sci_get_position_from_line(doc->editor->sci, i); /* Building up package string and inserting it */ - if (NZV(options)) + if (!EMPTY(options)) { packagestring = g_strconcat("\\usepackage[", options, "]{", pkg, "}\n", NULL); diff -Nru geany-plugins-1.23+dfsg/geanylatex/src/Makefile.in geany-plugins-1.24+dfsg/geanylatex/src/Makefile.in --- geany-plugins-1.23+dfsg/geanylatex/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylatex/src/Makefile.in 2014-04-13 17:12:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,17 +78,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp subdir = geanylatex/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -74,12 +104,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -91,6 +124,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -147,6 +181,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 @@ -159,20 +206,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 = $(geanylatex_la_SOURCES) DIST_SOURCES = $(geanylatex_la_SOURCES) am__can_run_installinfo = \ @@ -180,6 +223,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -188,6 +248,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -206,6 +268,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -241,6 +305,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -307,6 +374,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -458,6 +535,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -484,12 +562,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + geanylatex.la: $(geanylatex_la_OBJECTS) $(geanylatex_la_DEPENDENCIES) $(EXTRA_geanylatex_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) -rpath $(geanypluginsdir) $(geanylatex_la_OBJECTS) $(geanylatex_la_LIBADD) $(LIBS) @@ -518,14 +599,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 $@ $< @@ -540,26 +621,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; \ @@ -571,15 +641,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 @@ -588,6 +654,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 @@ -734,24 +815,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/geanylatex/src/templates.c geany-plugins-1.24+dfsg/geanylatex/src/templates.c --- geany-plugins-1.23+dfsg/geanylatex/src/templates.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylatex/src/templates.c 2014-04-12 14:28:39.000000000 +0000 @@ -1,7 +1,7 @@ /* * templates.c * - * Copyright 2009-2012 Frank Lanitz + * Copyright 2009-2013 Frank Lanitz * * 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 @@ -81,6 +81,8 @@ g_slist_foreach(file_list, (GFunc)glatex_init_cutom_template_item, templates); g_slist_foreach(file_list, (GFunc) g_free, NULL); g_slist_free(file_list); + + g_free(tmp_basedir); return templates; } diff -Nru geany-plugins-1.23+dfsg/geanylipsum/Makefile.in geany-plugins-1.24+dfsg/geanylipsum/Makefile.in --- geany-plugins-1.23+dfsg/geanylipsum/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylipsum/Makefile.in 2014-04-13 17:12:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - INSTALL NEWS +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog INSTALL NEWS README subdir = geanylipsum ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -467,22 +545,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -497,57 +578,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 \ @@ -563,12 +599,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; \ @@ -580,15 +611,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 @@ -597,6 +624,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 @@ -760,22 +802,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/geanylipsum/src/geanylipsum.c geany-plugins-1.24+dfsg/geanylipsum/src/geanylipsum.c --- geany-plugins-1.23+dfsg/geanylipsum/src/geanylipsum.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylipsum/src/geanylipsum.c 2014-04-12 14:28:39.000000000 +0000 @@ -1,7 +1,7 @@ /* * geanylipsum.c * - * Copyright 2008-2011 Frank Lanitz + * Copyright 2008-2013 Frank Lanitz * * 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 @@ -39,16 +39,19 @@ GETTEXT_PACKAGE, _("GeanyLipsum"), _("Creating dummy text with Geany"), - "0.4.3", + "0.4.4", "Frank Lanitz ") static GtkWidget *main_menu_item = NULL; static gchar *lipsum = NULL; static const gchar *default_loremipsum = "\ -Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy\ -eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam\ -voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet \ -clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet."; +Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do\ +eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim\ +ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut\ +aliquip ex ea commodo consequat. Duis aute irure dolor in\ +reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla\ +pariatur. Excepteur sint occaecat cupidatat non proident, sunt in\ +culpa qui officia deserunt mollit anim id est laborum."; /* Doing some basic keybinding stuff */ @@ -120,8 +123,9 @@ g_free(missing_text); } for (i = 0; i < x; i++) + { insert_string(doc, lipsum); - + } sci_end_undo_action(doc->editor->sci); } } @@ -140,12 +144,9 @@ { GtkWidget *menu_lipsum = NULL; GKeyFile *config = g_key_file_new(); - GtkTooltips *tooltips = NULL; gchar *config_file = NULL; GeanyKeyGroup *key_group; - tooltips = gtk_tooltips_new(); - main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); config_file = g_strconcat(geany->app->configdir, @@ -161,8 +162,7 @@ /* Building menu entry */ menu_lipsum = gtk_image_menu_item_new_with_mnemonic(_("_Lipsum")); - gtk_tooltips_set_tip(tooltips, menu_lipsum, - _("Include Pseudotext to your code"), NULL); + gtk_widget_set_tooltip_text(menu_lipsum, _("Include Pseudotext to your code")); gtk_widget_show(menu_lipsum); g_signal_connect((gpointer) menu_lipsum, "activate", G_CALLBACK(lipsum_activated), NULL); diff -Nru geany-plugins-1.23+dfsg/geanylipsum/src/Makefile.in geany-plugins-1.24+dfsg/geanylipsum/src/Makefile.in --- geany-plugins-1.23+dfsg/geanylipsum/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylipsum/src/Makefile.in 2014-04-13 17:12:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,17 +78,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp subdir = geanylipsum/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -74,12 +104,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -91,6 +124,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -143,6 +177,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 @@ -155,20 +202,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 = $(geanylipsum_la_SOURCES) DIST_SOURCES = $(geanylipsum_la_SOURCES) am__can_run_installinfo = \ @@ -176,6 +219,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -184,6 +244,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -202,6 +264,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -237,6 +301,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -303,6 +370,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -428,6 +505,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -454,12 +532,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + geanylipsum.la: $(geanylipsum_la_OBJECTS) $(geanylipsum_la_DEPENDENCIES) $(EXTRA_geanylipsum_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) -rpath $(geanypluginsdir) $(geanylipsum_la_OBJECTS) $(geanylipsum_la_LIBADD) $(LIBS) @@ -476,14 +557,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 $@ $< @@ -498,26 +579,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; \ @@ -529,15 +599,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 @@ -546,6 +612,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 @@ -692,24 +773,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/geanylua/docs/Makefile.in geany-plugins-1.24+dfsg/geanylua/docs/Makefile.in --- geany-plugins-1.23+dfsg/geanylua/docs/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylua/docs/Makefile.in 2014-04-13 17:12:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,16 +78,19 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(dist_htmldoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.docs.mk +DIST_COMMON = $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_htmldoc_DATA) subdir = geanylua/docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -73,12 +103,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -90,6 +123,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -105,12 +139,18 @@ 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 = \ @@ -147,12 +187,15 @@ } am__installdirs = "$(DESTDIR)$(htmldocdir)" DATA = $(dist_htmldoc_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -171,6 +214,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -206,6 +251,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -272,6 +320,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -419,11 +477,11 @@ @list='$(dist_htmldoc_DATA)'; test -n "$(htmldocdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(htmldocdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -562,16 +620,17 @@ .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-dist_htmldocDATA \ - 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-dist_htmldocDATA + 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-dist_htmldocDATA 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-dist_htmldocDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru geany-plugins-1.23+dfsg/geanylua/examples/dialogs/Makefile.in geany-plugins-1.24+dfsg/geanylua/examples/dialogs/Makefile.in --- geany-plugins-1.23+dfsg/geanylua/examples/dialogs/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylua/examples/dialogs/Makefile.in 2014-04-13 17:12:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,16 +78,19 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(dist_dialogs_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.docs.mk +DIST_COMMON = $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_dialogs_DATA) subdir = geanylua/examples/dialogs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -73,12 +103,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -90,6 +123,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -105,12 +139,18 @@ 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 = \ @@ -147,12 +187,15 @@ } am__installdirs = "$(DESTDIR)$(dialogsdir)" DATA = $(dist_dialogs_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -171,6 +214,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -206,6 +251,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -272,6 +320,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -415,11 +473,11 @@ @list='$(dist_dialogs_DATA)'; test -n "$(dialogsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(dialogsdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -558,16 +616,17 @@ .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-dist_dialogsDATA \ - 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-dist_dialogsDATA + 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-dist_dialogsDATA 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-dist_dialogsDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru geany-plugins-1.23+dfsg/geanylua/examples/edit/Makefile.in geany-plugins-1.24+dfsg/geanylua/examples/edit/Makefile.in --- geany-plugins-1.23+dfsg/geanylua/examples/edit/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylua/examples/edit/Makefile.in 2014-04-13 17:12:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,16 +78,19 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(dist_edit_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.docs.mk +DIST_COMMON = $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_edit_DATA) subdir = geanylua/examples/edit ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -73,12 +103,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -90,6 +123,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -105,12 +139,18 @@ 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 = \ @@ -147,12 +187,15 @@ } am__installdirs = "$(DESTDIR)$(editdir)" DATA = $(dist_edit_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -171,6 +214,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -206,6 +251,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -272,6 +320,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -419,11 +477,11 @@ @list='$(dist_edit_DATA)'; test -n "$(editdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(editdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -562,16 +620,17 @@ .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-dist_editDATA 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-dist_editDATA + 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-dist_editDATA 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-dist_editDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru geany-plugins-1.23+dfsg/geanylua/examples/info/Makefile.in geany-plugins-1.24+dfsg/geanylua/examples/info/Makefile.in --- geany-plugins-1.23+dfsg/geanylua/examples/info/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylua/examples/info/Makefile.in 2014-04-13 17:12:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,16 +78,19 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(dist_exampleinfo_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.docs.mk +DIST_COMMON = $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_exampleinfo_DATA) subdir = geanylua/examples/info ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -73,12 +103,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -90,6 +123,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -105,12 +139,18 @@ 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 = \ @@ -147,12 +187,15 @@ } am__installdirs = "$(DESTDIR)$(exampleinfodir)" DATA = $(dist_exampleinfo_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -171,6 +214,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -206,6 +251,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -272,6 +320,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -418,11 +476,11 @@ @list='$(dist_exampleinfo_DATA)'; test -n "$(exampleinfodir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(exampleinfodir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -561,16 +619,17 @@ .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-dist_exampleinfoDATA \ - 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-dist_exampleinfoDATA + 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-dist_exampleinfoDATA 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-dist_exampleinfoDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru geany-plugins-1.23+dfsg/geanylua/examples/Makefile.in geany-plugins-1.24+dfsg/geanylua/examples/Makefile.in --- geany-plugins-1.23+dfsg/geanylua/examples/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylua/examples/Makefile.in 2014-04-13 17:12:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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,14 +78,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = geanylua/examples -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -71,12 +101,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -88,6 +121,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -103,21 +137,28 @@ 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;; \ @@ -125,9 +166,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 = $(SUBDIRS) @@ -162,6 +223,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -180,6 +243,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -215,6 +280,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -281,6 +349,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -400,22 +478,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; \ @@ -430,57 +511,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 \ @@ -496,12 +532,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; \ @@ -513,15 +544,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 @@ -530,6 +557,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 @@ -690,22 +732,20 @@ 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 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru geany-plugins-1.23+dfsg/geanylua/examples/scripting/Makefile.in geany-plugins-1.24+dfsg/geanylua/examples/scripting/Makefile.in --- geany-plugins-1.23+dfsg/geanylua/examples/scripting/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylua/examples/scripting/Makefile.in 2014-04-13 17:12:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,16 +78,19 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(dist_scripting_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.docs.mk +DIST_COMMON = $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_scripting_DATA) subdir = geanylua/examples/scripting ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -73,12 +103,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -90,6 +123,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -105,12 +139,18 @@ 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 = \ @@ -147,12 +187,15 @@ } am__installdirs = "$(DESTDIR)$(scriptingdir)" DATA = $(dist_scripting_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -171,6 +214,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -206,6 +251,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -272,6 +320,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -417,11 +475,11 @@ @list='$(dist_scripting_DATA)'; test -n "$(scriptingdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(scriptingdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -560,16 +618,17 @@ .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-dist_scriptingDATA \ - 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-dist_scriptingDATA + 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-dist_scriptingDATA 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-dist_scriptingDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru geany-plugins-1.23+dfsg/geanylua/examples/work/Makefile.in geany-plugins-1.24+dfsg/geanylua/examples/work/Makefile.in --- geany-plugins-1.23+dfsg/geanylua/examples/work/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylua/examples/work/Makefile.in 2014-04-13 17:12:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,16 +78,19 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(dist_work_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.docs.mk +DIST_COMMON = $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_work_DATA) subdir = geanylua/examples/work ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -73,12 +103,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -90,6 +123,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -105,12 +139,18 @@ 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 = \ @@ -147,12 +187,15 @@ } am__installdirs = "$(DESTDIR)$(workdir)" DATA = $(dist_work_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -171,6 +214,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -206,6 +251,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -272,6 +320,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -416,11 +474,11 @@ @list='$(dist_work_DATA)'; test -n "$(workdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(workdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -559,16 +617,17 @@ .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-dist_workDATA 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-dist_workDATA + 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-dist_workDATA 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-dist_workDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru geany-plugins-1.23+dfsg/geanylua/glspi_app.c geany-plugins-1.24+dfsg/geanylua/glspi_app.c --- geany-plugins-1.23+dfsg/geanylua/glspi_app.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylua/glspi_app.c 2013-06-30 11:40:06.000000000 +0000 @@ -4,8 +4,10 @@ * See the file "geanylua.c" for copyright information. */ +#define _BSD_SOURCE /* for stat() and lstat() */ #include #include +#include #include @@ -171,10 +173,7 @@ #ifdef G_OS_WIN32 #define lstat stat -#define realpath(src,dst) _fullpath((dst),(src),_MAX_PATH) #include -#else -#include #endif typedef int (*statfunc) (const char *fn, struct stat *st); @@ -252,7 +251,6 @@ - static gint glspi_fullpath(lua_State* L) { if (lua_gettop(L)>=1) { @@ -260,10 +258,10 @@ const gchar *fn=NULL; if (!lua_isstring(L,1)) { return FAIL_STRING_ARG(1); } fn=lua_tostring(L,1); - rp=realpath(fn,NULL); + rp=tm_get_real_path(fn); if (rp) { lua_pushstring(L,rp); - free(rp); + g_free(rp); return 1; } } @@ -443,7 +441,6 @@ #include #include -#include #define IsShift ( (My_Shift_L == ev->xkey.keycode) || (My_Shift_R == ev->xkey.keycode) ) @@ -489,13 +486,7 @@ return GDK_FILTER_CONTINUE; } -static void dosleep(void) -{ - struct timespec req, rem; - req.tv_sec=0; - req.tv_nsec=1000; - nanosleep(&req, &rem); -} +#define dosleep() g_usleep(1) #else #include @@ -582,7 +573,7 @@ gint pos=sci_get_position_from_line(doc->editor->sci, fvl+1); scintilla_send_message(doc->editor->sci,SCI_CALLTIPSHOW,pos+3, (sptr_t)prompt); } - gdk_window_add_filter(main_widgets->window->window, keygrab_cb, &km); + gdk_window_add_filter(gtk_widget_get_window(main_widgets->window), keygrab_cb, &km); do { while (gtk_events_pending()) { if (km.group==2) { break; } @@ -592,7 +583,7 @@ dosleep(); } while (km.group!=2); - gdk_window_remove_filter(main_widgets->window->window, keygrab_cb, &km); + gdk_window_remove_filter(gtk_widget_get_window(main_widgets->window), keygrab_cb, &km); if (prompt && doc && doc->is_valid) { sci_send_command(doc->editor->sci, SCI_CALLTIPCANCEL); } diff -Nru geany-plugins-1.23+dfsg/geanylua/glspi_dlg.c geany-plugins-1.24+dfsg/geanylua/glspi_dlg.c --- geany-plugins-1.23+dfsg/geanylua/glspi_dlg.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylua/glspi_dlg.c 2014-04-12 14:28:39.000000000 +0000 @@ -163,17 +163,17 @@ scroll=gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox),scroll); + gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),scroll); gtk_container_add(GTK_CONTAINER(scroll),tree); gtk_widget_set_size_request(tree, 320, 240); gtk_widget_show_all(dialog); gtk_window_set_resizable(GTK_WINDOW(dialog), TRUE); - gtk_signal_connect(GTK_OBJECT(tree), "button-press-event", - GTK_SIGNAL_FUNC(on_tree_clicked), dialog); - gtk_signal_connect(GTK_OBJECT(tree), "key-release-event", - GTK_SIGNAL_FUNC(on_tree_key_release), dialog); + g_signal_connect(G_OBJECT(tree), "button-press-event", + G_CALLBACK(on_tree_clicked), dialog); + g_signal_connect(G_OBJECT(tree), "key-release-event", + G_CALLBACK(on_tree_key_release), dialog); rv=glspi_dialog_run(GTK_DIALOG(dialog)); @@ -294,7 +294,7 @@ gtk_widget_grab_default(ok_btn); entry=gtk_entry_new(); if (arg2) { gtk_entry_set_text(GTK_ENTRY(entry), arg2); } - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), entry); + gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), entry); gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE); set_dialog_title(L,dialog); gtk_widget_set_size_request(entry, 320, -1); @@ -412,7 +412,7 @@ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); #if NEED_OVERWRITE_PROMPT - gtk_signal_connect(GTK_OBJECT(dlg),"response",G_CALLBACK(on_file_dlg_response),&accepted); + g_signal_connect(G_OBJECT(dlg),"response",G_CALLBACK(on_file_dlg_response),&accepted); #else gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dlg), TRUE); #endif @@ -425,9 +425,11 @@ if (name && *name) { if (g_path_is_absolute(name)) { fullname=g_strdup(name); - } else if (path) {fullname=g_build_filename(path,name,NULL);} - gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dlg), fullname); - if (save) gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dlg), name); + } else if (path) { + fullname=g_build_filename(path,name,NULL); + } + gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dlg), fullname); + if (save) { gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dlg), name); } } if (path && *path) { gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dlg), path); @@ -437,6 +439,7 @@ "failed to parse filter string at argument #3.\n"), LUA_MODULE_NAME); lua_error(L); + g_free(fullname); return NULL; } @@ -454,7 +457,7 @@ rv=gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dlg)); } gtk_widget_destroy(dlg); - if (fullname) {g_free(fullname);} + g_free(fullname); return rv; } @@ -479,10 +482,10 @@ if (argc >= 1) { if (lua_isstring(L,1)) { const gchar*tmp=lua_tostring(L,1); - if (strcasecmp(tmp,"save")==0) { + if (g_ascii_strcasecmp(tmp,"save")==0) { save=TRUE; } else - if ( (*tmp != '\0') && (strcasecmp(tmp,"open")!=0) ) { + if ( (*tmp != '\0') && (g_ascii_strcasecmp(tmp,"open")!=0) ) { lua_pushfstring(L, _("Error in module \"%s\" at function %s():\n" "expected string \"open\" or \"save\" for argument #1.\n"), LUA_MODULE_NAME, &__FUNCTION__[6]); diff -Nru geany-plugins-1.23+dfsg/geanylua/glspi_init.c geany-plugins-1.24+dfsg/geanylua/glspi_init.c --- geany-plugins-1.23+dfsg/geanylua/glspi_init.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylua/glspi_init.c 2013-06-30 11:40:06.000000000 +0000 @@ -151,7 +151,7 @@ p=strchr(label,'_'); if (p) { *p=' ';} p=strrchr(label, '.'); - if (p && (strcasecmp(p, ".lua")==0)) { + if (p && (g_ascii_strcasecmp(p, ".lua")==0)) { *p='\0'; } name=g_strdup_printf("lua_script_%d", i+1); @@ -321,7 +321,7 @@ g_return_if_fail(data && user_data); if (g_file_test(data,G_FILE_TEST_IS_REGULAR)) { gchar *dot = strrchr(data, '.'); - if ( dot && (((gpointer)dot)>data) && (strcasecmp(dot, ".lua")==0) ) { + if ( dot && (((gpointer)dot)>data) && (g_ascii_strcasecmp(dot, ".lua")==0) ) { GtkWidget *item; gchar*label=strrchr(data,DIR_SEP[0]); gchar *tmp=NULL; @@ -342,7 +342,7 @@ if (g_file_test(data,G_FILE_TEST_IS_DIR)) { gchar*label=strrchr(data,DIR_SEP[0]); if (label) { label++; } else { label=data; } - if ((strcasecmp(label,"events")!=0)&&(strcasecmp(label,"support")!=0)) { + if ((g_ascii_strcasecmp(label,"events")!=0)&&(g_ascii_strcasecmp(label,"support")!=0)) { label=g_strdup(label); fixup_label(label); new_menu(user_data, data, label); /* Recursive */ diff -Nru geany-plugins-1.23+dfsg/geanylua/glspi_run.c geany-plugins-1.24+dfsg/geanylua/glspi_run.c --- geany-plugins-1.23+dfsg/geanylua/glspi_run.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylua/glspi_run.c 2013-06-30 11:40:06.000000000 +0000 @@ -23,8 +23,8 @@ { GeanyDocument* doc=document_get_current(); if ( doc && doc->is_valid ) { - gdk_window_invalidate_rect(GTK_WIDGET(doc->editor->sci)->window, NULL, TRUE); - gdk_window_process_updates(GTK_WIDGET(doc->editor->sci)->window, TRUE); + gdk_window_invalidate_rect(gtk_widget_get_window(GTK_WIDGET(doc->editor->sci)), NULL, TRUE); + gdk_window_process_updates(gtk_widget_get_window(GTK_WIDGET(doc->editor->sci)), TRUE); } } @@ -209,8 +209,8 @@ } } if (si->counter > 100000) { - gdk_window_invalidate_rect(main_widgets->window->window, NULL, TRUE); - gdk_window_process_updates(main_widgets->window->window, TRUE); + gdk_window_invalidate_rect(gtk_widget_get_window(main_widgets->window), NULL, TRUE); + gdk_window_process_updates(gtk_widget_get_window(main_widgets->window), TRUE); si->counter=0; } else si->counter++; } diff -Nru geany-plugins-1.23+dfsg/geanylua/glspi_sci.c geany-plugins-1.24+dfsg/geanylua/glspi_sci.c --- geany-plugins-1.23+dfsg/geanylua/glspi_sci.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylua/glspi_sci.c 2013-06-30 11:40:06.000000000 +0000 @@ -337,49 +337,49 @@ static gint get_sci_nav_cmd(const gchar*str, gboolean fwd, gboolean sel, gboolean rect) { - if (strncasecmp(str, "char", 4) == 0) { + if (g_ascii_strncasecmp(str, "char", 4) == 0) { if (fwd) { return sel?(rect?SCI_CHARRIGHTRECTEXTEND:SCI_CHARRIGHTEXTEND):SCI_CHARRIGHT; } else { return sel?(rect?SCI_CHARLEFTRECTEXTEND:SCI_CHARLEFTEXTEND):SCI_CHARLEFT; } - } else if (strncasecmp(str, "word", 4) == 0) { + } else if (g_ascii_strncasecmp(str, "word", 4) == 0) { if (fwd) { return sel?SCI_WORDRIGHTEXTEND:SCI_WORDRIGHT; } else { return sel?SCI_WORDLEFTEXTEND:SCI_WORDLEFT; } - } else if (strncasecmp(str, "part", 4) == 0) { + } else if (g_ascii_strncasecmp(str, "part", 4) == 0) { if (fwd) { return sel?SCI_WORDPARTRIGHTEXTEND:SCI_WORDPARTRIGHT; } else { return sel?SCI_WORDPARTLEFTEXTEND:SCI_WORDPARTLEFT; } - } else if (strncasecmp(str, "edge", 4) == 0) { + } else if (g_ascii_strncasecmp(str, "edge", 4) == 0) { if (fwd) { return sel?(rect?SCI_LINEENDRECTEXTEND:SCI_LINEENDEXTEND):SCI_LINEEND; } else { return sel?(rect?SCI_HOMERECTEXTEND:SCI_HOMEEXTEND):SCI_HOME; } - } else if (strncasecmp(str, "line", 4) == 0) { + } else if (g_ascii_strncasecmp(str, "line", 4) == 0) { if (fwd) { return sel?(rect?SCI_LINEDOWNRECTEXTEND:SCI_LINEDOWNEXTEND):SCI_LINEDOWN; } else { return sel?(rect?SCI_LINEUPRECTEXTEND:SCI_LINEUPEXTEND):SCI_LINEUP; } - } else if (strncasecmp(str, "para", 4) == 0) { + } else if (g_ascii_strncasecmp(str, "para", 4) == 0) { if (fwd) { return sel?SCI_PARADOWNEXTEND:SCI_PARADOWN; } else { return sel?SCI_PARAUPEXTEND:SCI_PARAUP; } - } else if (strncasecmp(str, "page", 4) == 0) { + } else if (g_ascii_strncasecmp(str, "page", 4) == 0) { if (fwd) { return sel?(rect?SCI_PAGEDOWNRECTEXTEND:SCI_PAGEDOWNEXTEND):SCI_PAGEDOWN; } else { return sel?(rect?SCI_PAGEUPRECTEXTEND:SCI_PAGEUPEXTEND):SCI_PAGEUP; } - } else if (strncasecmp(str, "body", 4) == 0) { + } else if (g_ascii_strncasecmp(str, "body", 4) == 0) { if (fwd) { return sel?SCI_DOCUMENTENDEXTEND:SCI_DOCUMENTEND; } else { @@ -780,15 +780,15 @@ lua_rawgeti(L,4,i); if (lua_isstring(L, -1)) { const gchar*flagname=lua_tostring(L,-1); - if (strcasecmp(flagname, "matchcase")==0){ + if (g_ascii_strcasecmp(flagname, "matchcase")==0){ flags += SCFIND_MATCHCASE; - } else if (strcasecmp(flagname, "wholeword")==0) { + } else if (g_ascii_strcasecmp(flagname, "wholeword")==0) { flags += SCFIND_WHOLEWORD; - } else if (strcasecmp(flagname, "wordstart")==0) { + } else if (g_ascii_strcasecmp(flagname, "wordstart")==0) { flags += SCFIND_WORDSTART; - } else if (strcasecmp(flagname, "regexp")==0) { + } else if (g_ascii_strcasecmp(flagname, "regexp")==0) { flags += SCFIND_REGEXP; - } else if (strcasecmp(flagname, "posix")==0) { + } else if (g_ascii_strcasecmp(flagname, "posix")==0) { flags += SCFIND_POSIX; } else { lua_pushfstring(L, _("Error in module \"%s\" at function %s():\n" diff -Nru geany-plugins-1.23+dfsg/geanylua/gsdlg.c geany-plugins-1.24+dfsg/geanylua/gsdlg.c --- geany-plugins-1.23+dfsg/geanylua/gsdlg.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylua/gsdlg.c 2013-06-30 11:40:06.000000000 +0000 @@ -25,12 +25,12 @@ #include "gsdlg.h" #endif -#include #include -#ifdef G_OS_WIN32 -#define realpath(src,dst) _fullpath((dst),(src),_MAX_PATH) -#endif +#include "geanyplugin.h" +/* we need tm_get_real_path(), and we can't include glspi.h for those, so hack */ +extern GeanyFunctions *glspi_geany_functions; +#define geany_functions glspi_geany_functions #define TextKey "gsdlg_TextKey_bc4871f4e3478ab5234e28432460a6b8" @@ -63,14 +63,14 @@ gtk_text_buffer_set_text (tb, value, -1); } sw=gtk_scrolled_window_new(NULL, NULL); - gtk_widget_set_usize(sw, gdk_screen_get_width(gdk_screen_get_default())/3, + gtk_widget_set_size_request(sw, gdk_screen_get_width(gdk_screen_get_default())/3, gdk_screen_get_height(gdk_screen_get_default())/10); gtk_container_add(GTK_CONTAINER(sw),tv); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); frm=gtk_frame_new(label); gtk_frame_set_shadow_type(GTK_FRAME(frm), GTK_SHADOW_ETCHED_IN); gtk_container_add(GTK_CONTAINER(frm),sw); - gtk_container_add(GTK_CONTAINER(dlg->vbox),frm); + gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(dlg)),frm); g_object_set_data_full(G_OBJECT(tv), TextKey, g_strdup(key), g_free); } @@ -109,18 +109,18 @@ fn=gtk_entry_get_text(GTK_ENTRY(user_data)); if (fn && *fn) { if (g_file_test(fn,G_FILE_TEST_IS_REGULAR)) { - gchar *rp=realpath(fn,NULL); + gchar *rp=tm_get_real_path(fn); gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dlg), rp); - if (rp) free(rp); + if (rp) g_free(rp); } else { if (g_file_test(fn,G_FILE_TEST_IS_DIR)) { gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dlg), fn); } else { gchar *dn=g_path_get_dirname(fn); if (g_file_test(dn,G_FILE_TEST_IS_DIR)) { - gchar *rp=realpath(dn,NULL); + gchar *rp=tm_get_real_path(dn); gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dlg), rp); - if (rp) free(rp); + if (rp) g_free(rp); bn=g_path_get_basename(fn); g_signal_connect(G_OBJECT(dlg), "map", G_CALLBACK(file_dlg_map), bn); } @@ -159,7 +159,7 @@ frm=gtk_frame_new(label); gtk_frame_set_shadow_type(GTK_FRAME(frm), GTK_SHADOW_ETCHED_IN); gtk_container_add(GTK_CONTAINER(frm),hbox); - gtk_container_add(GTK_CONTAINER(dlg->vbox),frm); + gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(dlg)),frm); g_object_set_data_full(G_OBJECT(input), TextKey, g_strdup(key), g_free); } @@ -168,22 +168,24 @@ static void color_btn_clicked(GtkButton *button, gpointer user_data) { GtkWidget*dlg; + GtkColorSelectionDialog *csdlg; const gchar *cn=NULL; gint resp; GdkColor rgb; dlg=gtk_color_selection_dialog_new (_("Select Color")); + csdlg=GTK_COLOR_SELECTION_DIALOG(dlg); make_modal(dlg, gtk_widget_get_toplevel(GTK_WIDGET(user_data))); cn=gtk_entry_get_text(GTK_ENTRY(user_data)); if (cn && *cn && gdk_color_parse(cn,&rgb)) { gtk_color_selection_set_current_color( - GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(dlg)->colorsel), &rgb); + GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(csdlg)), &rgb); } resp=gtk_dialog_run(GTK_DIALOG(dlg)); if (resp == GTK_RESPONSE_OK) { gchar *rv=NULL; gtk_color_selection_get_current_color( - GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(dlg)->colorsel), &rgb); + GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(csdlg)), &rgb); rv=g_strdup_printf("#%2.2X%2.2X%2.2X",rgb.red/256,rgb.green/256,rgb.blue/256); gtk_entry_set_text(GTK_ENTRY(user_data), rv); g_free(rv); @@ -211,7 +213,7 @@ } gtk_box_pack_start(GTK_BOX(hbox), input,TRUE,TRUE,1); gtk_box_pack_start(GTK_BOX(hbox), btn,FALSE,FALSE,1); - gtk_container_add(GTK_CONTAINER(dlg->vbox),hbox); + gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(dlg)),hbox); g_object_set_data_full(G_OBJECT(input), TextKey, g_strdup(key), g_free); } @@ -259,7 +261,7 @@ } gtk_box_pack_start(GTK_BOX(hbox), input,TRUE,TRUE,1); gtk_box_pack_start(GTK_BOX(hbox), btn,FALSE,FALSE,1); - gtk_container_add(GTK_CONTAINER(dlg->vbox),hbox); + gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(dlg)),hbox); g_object_set_data_full(G_OBJECT(input), TextKey, g_strdup(key), g_free); } @@ -278,7 +280,7 @@ gtk_box_pack_start(GTK_BOX(hbox), label,FALSE,FALSE,1); gtk_box_pack_start(GTK_BOX(hbox), input,TRUE,TRUE,1); gtk_entry_set_visibility(GTK_ENTRY(input), !masked); - gtk_container_add(GTK_CONTAINER(dlg->vbox),hbox); + gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(dlg)),hbox); g_object_set_data_full(G_OBJECT(input), TextKey, g_strdup(key), g_free); } @@ -303,7 +305,7 @@ cb=gtk_check_button_new_with_label(label); g_object_set_data_full(G_OBJECT(cb),TextKey,g_strdup(key), g_free); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cb),value); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dlg)->vbox),cb); + gtk_container_add(GTK_CONTAINER(GTK_CONTAINER(gtk_dialog_get_content_area(dlg))),cb); } @@ -334,7 +336,7 @@ g_return_val_if_fail(dlg, NULL); kv.key=key; kv.type=type; - gtk_container_foreach(GTK_CONTAINER(GTK_DIALOG(dlg)->vbox),find_widget_by_key_cb,&kv); + gtk_container_foreach(GTK_CONTAINER(GTK_CONTAINER(gtk_dialog_get_content_area(dlg))),find_widget_by_key_cb,&kv); return kv.value; } @@ -371,7 +373,7 @@ frm=gtk_frame_new(label); vbox=gtk_vbox_new(FALSE,FALSE); gtk_container_add(GTK_CONTAINER(frm),vbox); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dlg)->vbox),frm); + gtk_container_add(GTK_CONTAINER(GTK_CONTAINER(gtk_dialog_get_content_area(dlg))),frm); } /* Frame holds keyname, vbox holds default value */ @@ -445,16 +447,16 @@ hbox=find_widget_by_key(dlg,GTK_TYPE_HBOX, key); if (hbox) { cw=g_object_get_data(G_OBJECT(hbox), DataKey); - gtk_label_set(GTK_LABEL(cw->label), label); + gtk_label_set_text(GTK_LABEL(cw->label), label); } else { hbox=gtk_hbox_new(FALSE,FALSE); cw=g_malloc0(sizeof(ComboWidgets)); g_object_set_data_full(G_OBJECT(hbox),DataKey,cw,g_free); - cw->combo=gtk_combo_box_new_text(); + cw->combo=gtk_combo_box_text_new(); cw->label=gtk_label_new(label); gtk_box_pack_start(GTK_BOX(hbox), cw->label,FALSE,FALSE,4); gtk_box_pack_start(GTK_BOX(hbox), cw->combo,TRUE,TRUE,1); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dlg)->vbox),hbox); + gtk_container_add(GTK_CONTAINER(GTK_CONTAINER(gtk_dialog_get_content_area(dlg))),hbox); } /* Hbox holds keyname, combo holds default value */ g_object_set_data_full(G_OBJECT(hbox), TextKey, g_strdup(key), g_free); @@ -481,7 +483,7 @@ values=g_object_steal_data(G_OBJECT(cw->combo), DataKey); values=g_slist_append(values, g_strdup(value)); g_object_set_data_full(G_OBJECT(cw->combo), DataKey, values, destroy_slist_and_data); - gtk_combo_box_append_text(GTK_COMBO_BOX(cw->combo), label); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cw->combo), label); defval=g_object_get_data(G_OBJECT(cw->combo), TextKey); if (value && defval && g_str_equal(value,defval)) { select_combo(cw->combo,value); @@ -496,7 +498,7 @@ GtkWidget *lab=NULL; g_return_if_fail(dlg); lab=gtk_label_new(text); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dlg)->vbox), lab); + gtk_container_add(GTK_CONTAINER(GTK_CONTAINER(gtk_dialog_get_content_area(dlg))), lab); gtk_misc_set_alignment(GTK_MISC(lab), 0.0f, 0.0f); } @@ -505,7 +507,7 @@ void gsdlg_hr(GtkDialog *dlg) { g_return_if_fail(dlg); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dlg)->vbox), gtk_hseparator_new()); + gtk_container_add(GTK_CONTAINER(GTK_CONTAINER(gtk_dialog_get_content_area(dlg))), gtk_hseparator_new()); } @@ -534,7 +536,7 @@ for (i=0; btns[i]; i++) { gtk_dialog_add_button(GTK_DIALOG(dlg),btns[i],i); } - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dlg)->vbox), 4); + gtk_box_set_spacing(GTK_BOX(GTK_CONTAINER(gtk_dialog_get_content_area(dlg))), 4); gtk_container_set_border_width(GTK_CONTAINER(dlg), 4); gtk_window_set_title(GTK_WINDOW(dlg),title); return dlg; @@ -605,7 +607,7 @@ if (gsdlg_run_hook) { gsdlg_run_hook(FALSE,user_data); } if (*btn<0) *btn=-1; results=g_hash_table_new_full(g_str_hash,g_str_equal,g_free,g_free); - gtk_container_foreach(GTK_CONTAINER(GTK_DIALOG(dlg)->vbox),widgets_foreach,results); + gtk_container_foreach(GTK_CONTAINER(GTK_CONTAINER(gtk_dialog_get_content_area(dlg))),widgets_foreach,results); gtk_widget_hide(GTK_WIDGET(dlg)); return results; } diff -Nru geany-plugins-1.23+dfsg/geanylua/Makefile.in geany-plugins-1.24+dfsg/geanylua/Makefile.in --- geany-plugins-1.23+dfsg/geanylua/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanylua/Makefile.in 2014-04-13 17:12:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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,20 +79,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/cppcheck.mk \ +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.build.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - INSTALL NEWS THANKS + $(top_srcdir)/build/vars.docs.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp \ + $(dist_plugindoc_DATA) AUTHORS COPYING ChangeLog INSTALL NEWS \ + README THANKS subdir = geanylua ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -78,12 +109,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -95,6 +129,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -149,6 +184,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 = geanylua_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(geanylua_la_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -165,6 +201,18 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libgeanylua_la_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 @@ -177,29 +225,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 = $(geanylua_la_SOURCES) $(libgeanylua_la_SOURCES) DIST_SOURCES = $(geanylua_la_SOURCES) $(libgeanylua_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;; \ @@ -208,9 +253,29 @@ DATA = $(dist_plugindoc_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) @@ -245,6 +310,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -263,6 +330,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -298,6 +367,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -364,6 +436,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -534,6 +616,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanyluaLTLIBRARIES: $(geanylua_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanylua_LTLIBRARIES)'; test -n "$(geanyluadir)" || list=; \ @@ -560,12 +643,15 @@ clean-geanyluaLTLIBRARIES: -test -z "$(geanylua_LTLIBRARIES)" || rm -f $(geanylua_LTLIBRARIES) - @list='$(geanylua_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='$(geanylua_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}; \ + } + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -592,14 +678,18 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + geanylua.la: $(geanylua_la_OBJECTS) $(geanylua_la_DEPENDENCIES) $(EXTRA_geanylua_la_DEPENDENCIES) $(AM_V_CCLD)$(geanylua_la_LINK) -rpath $(geanypluginsdir) $(geanylua_la_OBJECTS) $(geanylua_la_LIBADD) $(LIBS) + libgeanylua.la: $(libgeanylua_la_OBJECTS) $(libgeanylua_la_DEPENDENCIES) $(EXTRA_libgeanylua_la_DEPENDENCIES) $(AM_V_CCLD)$(libgeanylua_la_LINK) -rpath $(geanyluadir) $(libgeanylua_la_OBJECTS) $(libgeanylua_la_LIBADD) $(LIBS) @@ -625,14 +715,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 $@ $< @@ -739,22 +829,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -769,57 +862,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 \ @@ -835,12 +883,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; \ @@ -852,15 +895,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 @@ -869,6 +908,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 @@ -1042,31 +1096,33 @@ uninstall-geanyluaLTLIBRARIES \ uninstall-geanypluginsLTLIBRARIES -.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-am check-local clean \ - clean-geanyluaLTLIBRARIES clean-geanypluginsLTLIBRARIES \ - clean-generic 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-dist_plugindocDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-geanyluaLTLIBRARIES \ - install-geanypluginsLTLIBRARIES 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 \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am check-local clean clean-geanyluaLTLIBRARIES \ + clean-geanypluginsLTLIBRARIES clean-generic 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-dist_plugindocDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-geanyluaLTLIBRARIES install-geanypluginsLTLIBRARIES \ + 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-dist_plugindocDATA uninstall-geanyluaLTLIBRARIES \ uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/geanymacro/Makefile.in geany-plugins-1.24+dfsg/geanymacro/Makefile.in --- geany-plugins-1.23+dfsg/geanymacro/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanymacro/Makefile.in 2014-04-13 17:12:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - INSTALL NEWS THANKS +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog INSTALL NEWS README THANKS subdir = geanymacro ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -467,22 +545,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -497,57 +578,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 \ @@ -563,12 +599,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; \ @@ -580,15 +611,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 @@ -597,6 +624,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 @@ -760,22 +802,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/geanymacro/src/Makefile.in geany-plugins-1.24+dfsg/geanymacro/src/Makefile.in --- geany-plugins-1.23+dfsg/geanymacro/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanymacro/src/Makefile.in 2014-04-13 17:12:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,17 +78,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp subdir = geanymacro/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -74,12 +104,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -91,6 +124,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -143,6 +177,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 @@ -155,20 +202,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 = $(geanymacro_la_SOURCES) DIST_SOURCES = $(geanymacro_la_SOURCES) am__can_run_installinfo = \ @@ -176,6 +219,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -184,6 +244,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -202,6 +264,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -237,6 +301,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -303,6 +370,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -428,6 +505,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -454,12 +532,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + geanymacro.la: $(geanymacro_la_OBJECTS) $(geanymacro_la_DEPENDENCIES) $(EXTRA_geanymacro_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) -rpath $(geanypluginsdir) $(geanymacro_la_OBJECTS) $(geanymacro_la_LIBADD) $(LIBS) @@ -476,14 +557,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 $@ $< @@ -498,26 +579,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; \ @@ -529,15 +599,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 @@ -546,6 +612,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 @@ -692,24 +773,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/geanyminiscript/Makefile.in geany-plugins-1.24+dfsg/geanyminiscript/Makefile.in --- geany-plugins-1.23+dfsg/geanyminiscript/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyminiscript/Makefile.in 2014-04-13 17:12:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - INSTALL NEWS +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog INSTALL NEWS README subdir = geanyminiscript ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -467,22 +545,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -497,57 +578,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 \ @@ -563,12 +599,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; \ @@ -580,15 +611,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 @@ -597,6 +624,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 @@ -760,22 +802,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/geanyminiscript/README geany-plugins-1.24+dfsg/geanyminiscript/README --- geany-plugins-1.23+dfsg/geanyminiscript/README 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyminiscript/README 2013-06-30 11:40:06.000000000 +0000 @@ -11,16 +11,18 @@ gms is a Geany Mini-Script filter plugin -In order to use it you need Geany 0.15. +In order to use it you need Geany 0.15 or later. Features ======== This plugin is a tool to apply a script filter on :: + o the text selection, o the current document, o all documents of the current session. The filter type can be :: + o Unix shell script, o perl script, o python script, @@ -28,6 +30,7 @@ o awk script. The output can be :: + o the selection of the current document, o all the current document, o or a new document. @@ -47,6 +50,7 @@ Tools->Plugin Manager and set checkbox at gms plugin. You can configure the following options:: + o Shell path, o Perl path, o Python path, @@ -54,8 +58,8 @@ o Awk path, o user script . -After configuring, go to menu Tools->Plugin Manager and click to "Mini-script". -Geany opens a gms dialog box:: +After configuring, go to menu Tools->Plugin Manager and click to "Mini-script". Geany opens a gms dialog box:: + o With the combobox, you select the script type, o In the text view, you write the filter script. o In the input area, you select the filter input:: @@ -93,7 +97,7 @@ Download ======== -The current version is |(version)|, download it here http:// +The current version is |(version)| -- 2008-2009 by Pascal BURLOT diff -Nru geany-plugins-1.23+dfsg/geanyminiscript/src/gms_gui.c geany-plugins-1.24+dfsg/geanyminiscript/src/gms_gui.c --- geany-plugins-1.23+dfsg/geanyminiscript/src/gms_gui.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyminiscript/src/gms_gui.c 2014-04-12 14:28:39.000000000 +0000 @@ -56,7 +56,7 @@ #include "gms_debug.h" #include "gms.h" #include "gms_gui.h" - + /* * ***************************************************************************** * Local Macro and new local type definition @@ -82,7 +82,6 @@ GtkWidget *rb_ndoc ; /*!< radio button : the filter output is in the current document */ GtkWidget *e_script[GMS_NB_TYPE_SCRIPT] ; /*!< entry for script configuration */ - GtkTooltips *tips ; /*!< tips of button of the top bar */ PangoFontDescription *fontdesc; } gms_gui_t ; @@ -128,15 +127,15 @@ /**< \brief It's the information message about geany mini script */ const char *geany_info = N_("GMS : Geany Mini-Script filter Plugin\n" -"This plugin is a tool to apply a script filter on :\n" +"This plugin is a tool to apply a script filter on:\n" " o the text selection,\n" " o the current document,\n" " o all documents of the current session.\n" "\n" -"The filter type can be : \n" -" o Unix shell script, \n" -" o perl script, \n" -" o python script, \n" +"The filter type can be:\n" +" o Unix shell script,\n" +" o perl script,\n" +" o python script,\n" " o sed commands,\n" " o awk script.\n" "\n" @@ -200,7 +199,7 @@ if ( g_file_test( this->config_dir, G_FILE_TEST_EXISTS ) != TRUE ) g_mkdir( this->config_dir, 0755 ) ; - + if ( g_file_test( gms_pref->str, G_FILE_TEST_EXISTS ) != TRUE ) g_mkdir( gms_pref->str, 0755 ) ; @@ -250,7 +249,7 @@ { gms_private_t *this = GMS_PRIVATE(data) ; GtkWidget *p_dialog ; - + p_dialog = gtk_file_chooser_dialog_new (_("Load Mini-Script File"), GTK_WINDOW(this->mw) , GTK_FILE_CHOOSER_ACTION_OPEN, @@ -307,7 +306,7 @@ { gms_private_t *this = GMS_PRIVATE(data) ; GtkWidget *p_dialog ; - + p_dialog = gtk_file_chooser_dialog_new (_("Save Mini-Script File"), GTK_WINDOW(this->mw) , GTK_FILE_CHOOSER_ACTION_SAVE, @@ -355,7 +354,7 @@ GTK_BUTTONS_CLOSE, NULL); gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dlg), _(geany_info)); - + gtk_dialog_run(GTK_DIALOG(dlg)); GMS_FREE_WIDGET(dlg); } @@ -424,7 +423,7 @@ GTK_STOCK_EXECUTE,GTK_RESPONSE_APPLY, NULL ) ; - vb_dlg = GTK_BOX (GTK_DIALOG(this->w.dlg)->vbox) ; + vb_dlg = GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG(this->w.dlg))) ; if ( width > 800 ) width = 800 ; @@ -434,9 +433,7 @@ gtk_window_set_default_size( GTK_WINDOW(this->w.dlg) , width/2 , height/2 ) ; - - this->w.tips = gtk_tooltips_new (); - + /* Hbox : type de script */ hb_st = gtk_hbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (hb_st), 0); @@ -445,30 +442,30 @@ b_new = new_button_from_stock( mode_txt_icon, GTK_STOCK_CLEAR ) ; gtk_box_pack_start( GTK_BOX (hb_st), b_new, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (b_new), "clicked",G_CALLBACK (gms_cb_new), (gpointer) this ); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), b_new, _("Clear the mini-script window") , ""); + gtk_widget_set_tooltip_text(b_new, _("Clear the mini-script window")); b_open = new_button_from_stock( mode_txt_icon, GTK_STOCK_OPEN ) ; gtk_box_pack_start( GTK_BOX (hb_st), b_open, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (b_open), "clicked",G_CALLBACK (gms_cb_load), (gpointer) this ); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), b_open, _("Load a mini-script into this window"), ""); + gtk_widget_set_tooltip_text(b_open, _("Load a mini-script into this window")); b_save = new_button_from_stock( mode_txt_icon, GTK_STOCK_SAVE_AS ) ; gtk_box_pack_start( GTK_BOX (hb_st),b_save, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (b_save), "clicked",G_CALLBACK (gms_cb_save), (gpointer) this ); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), b_save, _("Save the mini-script into a file"), ""); + gtk_widget_set_tooltip_text(b_save, _("Save the mini-script into a file")); b_info = new_button_from_stock( mode_txt_icon, GTK_STOCK_INFO ) ; gtk_box_pack_end( GTK_BOX (hb_st), b_info, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (b_info), "clicked",G_CALLBACK (gms_cb_info), (gpointer) this ); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), b_info, _("Display a information about the mini-script plugin"), ""); + gtk_widget_set_tooltip_text(b_info, _("Display a information about the mini-script plugin")); - this->w.cb_st = gtk_combo_box_new_text() ; + this->w.cb_st = gtk_combo_box_text_new() ; for ( i=0;iw.cb_st), label_script_cmd[i] ) ; - gtk_combo_box_set_active(GTK_COMBO_BOX(this->w.cb_st), 0 ); + gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(this->w.cb_st), label_script_cmd[i] ) ; + gtk_combo_box_set_active(GTK_COMBO_BOX(this->w.cb_st), 0); gtk_box_pack_start(GTK_BOX(hb_st), this->w.cb_st, FALSE, FALSE, 0); - GTK_WIDGET_SET_FLAGS (this->w.cb_st, GTK_CAN_DEFAULT); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), this->w.cb_st, _("select the mini-script type"), ""); + gtk_widget_set_can_default(this->w.cb_st, TRUE); + gtk_widget_set_tooltip_text(this->w.cb_st, _("select the mini-script type")); /* Scroll Box : script */ sb_script = gtk_scrolled_window_new (NULL,NULL); @@ -501,7 +498,7 @@ * selection/current document/all documents of the current session */ f_rbi = gtk_frame_new (_("filter input") ); gtk_box_pack_start( GTK_BOX (hb_rb), f_rbi, FALSE, FALSE, 0); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), f_rbi, _("select the input of mini-script filter"), ""); + gtk_widget_set_tooltip_text(f_rbi, _("select the input of mini-script filter")); hb_rbi = gtk_hbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (hb_rbi), 0); @@ -520,7 +517,7 @@ * current document/ or new document */ f_rbo = gtk_frame_new (_("filter output") ); gtk_box_pack_start( GTK_BOX(hb_rb), f_rbo, FALSE, FALSE, 0); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), f_rbo, _("select the output of mini-script filter"), ""); + gtk_widget_set_tooltip_text(f_rbo, _("select the output of mini-script filter")); hb_rbo = gtk_hbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER(hb_rbo), 0); @@ -588,7 +585,7 @@ for ( i=0;iscript_cmd[i] ,flag) ; - + GMS_G_FREE( this ) ; } } diff -Nru geany-plugins-1.23+dfsg/geanyminiscript/src/Makefile.in geany-plugins-1.24+dfsg/geanyminiscript/src/Makefile.in --- geany-plugins-1.23+dfsg/geanyminiscript/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyminiscript/src/Makefile.in 2014-04-13 17:12:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,17 +78,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp subdir = geanyminiscript/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -74,12 +104,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -91,6 +124,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -143,6 +177,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 @@ -155,20 +202,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 = $(geanyminiscript_la_SOURCES) DIST_SOURCES = $(geanyminiscript_la_SOURCES) am__can_run_installinfo = \ @@ -176,6 +219,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -184,6 +244,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -202,6 +264,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -237,6 +301,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -303,6 +370,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -428,6 +505,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -454,12 +532,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + geanyminiscript.la: $(geanyminiscript_la_OBJECTS) $(geanyminiscript_la_DEPENDENCIES) $(EXTRA_geanyminiscript_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) -rpath $(geanypluginsdir) $(geanyminiscript_la_OBJECTS) $(geanyminiscript_la_LIBADD) $(LIBS) @@ -477,14 +558,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 $@ $< @@ -499,26 +580,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; \ @@ -530,15 +600,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 @@ -547,6 +613,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 @@ -693,24 +774,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/geanynumberedbookmarks/Makefile.in geany-plugins-1.24+dfsg/geanynumberedbookmarks/Makefile.in --- geany-plugins-1.23+dfsg/geanynumberedbookmarks/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanynumberedbookmarks/Makefile.in 2014-04-13 17:12:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - INSTALL NEWS THANKS +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog INSTALL NEWS README THANKS subdir = geanynumberedbookmarks ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -467,22 +545,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -497,57 +578,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 \ @@ -563,12 +599,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; \ @@ -580,15 +611,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 @@ -597,6 +624,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 @@ -760,22 +802,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/geanynumberedbookmarks/src/Makefile.in geany-plugins-1.24+dfsg/geanynumberedbookmarks/src/Makefile.in --- geany-plugins-1.23+dfsg/geanynumberedbookmarks/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanynumberedbookmarks/src/Makefile.in 2014-04-13 17:12:43.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,16 +78,19 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp subdir = geanynumberedbookmarks/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -73,12 +103,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -90,6 +123,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -143,6 +177,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 @@ -155,20 +202,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 = $(geanynumberedbookmarks_la_SOURCES) DIST_SOURCES = $(geanynumberedbookmarks_la_SOURCES) am__can_run_installinfo = \ @@ -176,6 +219,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -184,6 +244,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -202,6 +264,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -237,6 +301,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -303,6 +370,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -428,6 +505,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -454,12 +532,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + geanynumberedbookmarks.la: $(geanynumberedbookmarks_la_OBJECTS) $(geanynumberedbookmarks_la_DEPENDENCIES) $(EXTRA_geanynumberedbookmarks_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) -rpath $(geanypluginsdir) $(geanynumberedbookmarks_la_OBJECTS) $(geanynumberedbookmarks_la_LIBADD) $(LIBS) @@ -476,14 +557,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 $@ $< @@ -498,26 +579,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; \ @@ -529,15 +599,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 @@ -546,6 +612,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 @@ -690,20 +771,20 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru geany-plugins-1.23+dfsg/geanypg/Makefile.in geany-plugins-1.24+dfsg/geanypg/Makefile.in --- geany-plugins-1.23+dfsg/geanypg/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypg/Makefile.in 2014-04-13 17:12:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - NEWS +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog NEWS README subdir = geanypg ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -467,22 +545,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -497,57 +578,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 \ @@ -563,12 +599,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; \ @@ -580,15 +611,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 @@ -597,6 +624,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 @@ -760,22 +802,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/geanypg/src/Makefile.in geany-plugins-1.24+dfsg/geanypg/src/Makefile.in --- geany-plugins-1.23+dfsg/geanypg/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypg/src/Makefile.in 2014-04-13 17:12:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,17 +78,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp subdir = geanypg/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -74,12 +104,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -91,6 +124,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -147,9 +181,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 = geanypg_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(geanypg_la_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 @@ -162,20 +209,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 = $(geanypg_la_SOURCES) DIST_SOURCES = $(geanypg_la_SOURCES) am__can_run_installinfo = \ @@ -183,6 +226,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -191,6 +251,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -209,6 +271,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -244,6 +308,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -310,6 +377,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -453,6 +530,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -479,12 +557,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + geanypg.la: $(geanypg_la_OBJECTS) $(geanypg_la_DEPENDENCIES) $(EXTRA_geanypg_la_DEPENDENCIES) $(AM_V_CCLD)$(geanypg_la_LINK) -rpath $(geanypluginsdir) $(geanypg_la_OBJECTS) $(geanypg_la_LIBADD) $(LIBS) @@ -509,14 +590,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 $@ $< @@ -594,26 +675,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; \ @@ -625,15 +695,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 @@ -642,6 +708,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 @@ -788,24 +869,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/geanypg/src/pinentry.c geany-plugins-1.24+dfsg/geanypg/src/pinentry.c --- geany-plugins-1.23+dfsg/geanypg/src/pinentry.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypg/src/pinentry.c 2013-06-30 11:40:06.000000000 +0000 @@ -18,6 +18,10 @@ * MA 02110-1301, USA. */ +/* for fdopen() */ +#define _POSIX_SOURCE 1 +#define _POSIX_C_SOURCE 1 + #include "geanypg.h" static const char * geanypg_getname(const char * uid_hint) diff -Nru geany-plugins-1.23+dfsg/geanyprj/Makefile.in geany-plugins-1.24+dfsg/geanyprj/Makefile.in --- geany-plugins-1.23+dfsg/geanyprj/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyprj/Makefile.in 2014-04-13 17:12:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - NEWS THANKS TODO +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog NEWS README THANKS TODO subdir = geanyprj ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -467,22 +545,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -497,57 +578,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 \ @@ -563,12 +599,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; \ @@ -580,15 +611,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 @@ -597,6 +624,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 @@ -760,22 +802,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/geanyprj/README geany-plugins-1.24+dfsg/geanyprj/README --- geany-plugins-1.23+dfsg/geanyprj/README 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyprj/README 2013-06-30 11:40:06.000000000 +0000 @@ -132,8 +132,7 @@ Get the code from:: - svn checkout http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geany-plugins - + https://github.com/geany/geany-plugins 2007-2008 by Yura Siamashka yurand2(at)gmail(dot)com diff -Nru geany-plugins-1.23+dfsg/geanyprj/src/Makefile.in geany-plugins-1.24+dfsg/geanyprj/src/Makefile.in --- geany-plugins-1.23+dfsg/geanyprj/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyprj/src/Makefile.in 2014-04-13 17:12:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,17 +78,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp subdir = geanyprj/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -74,12 +104,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -91,6 +124,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -145,9 +179,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 = geanyprj_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(geanyprj_la_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 @@ -160,20 +207,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 = $(geanyprj_la_SOURCES) DIST_SOURCES = $(geanyprj_la_SOURCES) am__can_run_installinfo = \ @@ -181,6 +224,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -189,6 +249,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -207,6 +269,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -242,6 +306,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -308,6 +375,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -441,6 +518,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -467,12 +545,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + geanyprj.la: $(geanyprj_la_OBJECTS) $(geanyprj_la_DEPENDENCIES) $(EXTRA_geanyprj_la_DEPENDENCIES) $(AM_V_CCLD)$(geanyprj_la_LINK) -rpath $(geanypluginsdir) $(geanyprj_la_OBJECTS) $(geanyprj_la_LIBADD) $(LIBS) @@ -494,14 +575,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 $@ $< @@ -558,26 +639,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; \ @@ -589,15 +659,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 @@ -606,6 +672,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 @@ -752,24 +833,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/geanyprj/tests/Makefile.am geany-plugins-1.24+dfsg/geanyprj/tests/Makefile.am --- geany-plugins-1.23+dfsg/geanyprj/tests/Makefile.am 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyprj/tests/Makefile.am 2013-06-30 11:40:06.000000000 +0000 @@ -1,8 +1,8 @@ if UNITTESTS include $(top_srcdir)/build/vars.build.mk -INCLUDES = $(GEANY_CFLAGS) -I$(srcdir)/../src -DUNITTESTS TESTS=unittests check_PROGRAMS=unittests unittests_SOURCES = unittests.c ../src/utils.c -unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ +unittests_CFLAGS = $(GEANY_CFLAGS) -I$(srcdir)/../src -DUNITTESTS +unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ endif diff -Nru geany-plugins-1.23+dfsg/geanyprj/tests/Makefile.in geany-plugins-1.24+dfsg/geanyprj/tests/Makefile.in --- geany-plugins-1.23+dfsg/geanyprj/tests/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyprj/tests/Makefile.in 2014-04-13 17:12:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -50,18 +77,22 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp \ + $(top_srcdir)/test-driver @UNITTESTS_TRUE@TESTS = unittests$(EXEEXT) @UNITTESTS_TRUE@check_PROGRAMS = unittests$(EXEEXT) subdir = geanyprj/tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -74,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -91,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,14 +142,30 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__unittests_SOURCES_DIST = unittests.c ../src/utils.c -@UNITTESTS_TRUE@am_unittests_OBJECTS = unittests.$(OBJEXT) \ -@UNITTESTS_TRUE@ utils.$(OBJEXT) +@UNITTESTS_TRUE@am_unittests_OBJECTS = unittests-unittests.$(OBJEXT) \ +@UNITTESTS_TRUE@ unittests-utils.$(OBJEXT) unittests_OBJECTS = $(am_unittests_OBJECTS) am__DEPENDENCIES_1 = @UNITTESTS_TRUE@unittests_DEPENDENCIES = $(am__DEPENDENCIES_1) 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 = +unittests_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(unittests_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 @@ -127,20 +178,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 = $(unittests_SOURCES) DIST_SOURCES = $(am__unittests_SOURCES_DIST) am__can_run_installinfo = \ @@ -148,16 +195,237 @@ 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) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -176,6 +444,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -211,6 +481,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -277,6 +550,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -364,13 +647,13 @@ @UNITTESTS_TRUE@ $(GEANY_LIBS) \ @UNITTESTS_TRUE@ $(INTLLIBS) -@UNITTESTS_TRUE@INCLUDES = $(GEANY_CFLAGS) -I$(srcdir)/../src -DUNITTESTS @UNITTESTS_TRUE@unittests_SOURCES = unittests.c ../src/utils.c +@UNITTESTS_TRUE@unittests_CFLAGS = $(GEANY_CFLAGS) -I$(srcdir)/../src -DUNITTESTS @UNITTESTS_TRUE@unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/vars.build.mk $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -411,9 +694,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + unittests$(EXEEXT): $(unittests_OBJECTS) $(unittests_DEPENDENCIES) $(EXTRA_unittests_DEPENDENCIES) @rm -f unittests$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(unittests_OBJECTS) $(unittests_LDADD) $(LIBS) + $(AM_V_CCLD)$(unittests_LINK) $(unittests_OBJECTS) $(unittests_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -421,22 +705,22 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unittests.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unittests-unittests.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unittests-utils.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @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 $@ $< @@ -445,19 +729,33 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -utils.o: ../src/utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT utils.o -MD -MP -MF $(DEPDIR)/utils.Tpo -c -o utils.o `test -f '../src/utils.c' || echo '$(srcdir)/'`../src/utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utils.Tpo $(DEPDIR)/utils.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../src/utils.c' object='utils.o' libtool=no @AMDEPBACKSLASH@ +unittests-unittests.o: unittests.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittests_CFLAGS) $(CFLAGS) -MT unittests-unittests.o -MD -MP -MF $(DEPDIR)/unittests-unittests.Tpo -c -o unittests-unittests.o `test -f 'unittests.c' || echo '$(srcdir)/'`unittests.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/unittests-unittests.Tpo $(DEPDIR)/unittests-unittests.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unittests.c' object='unittests-unittests.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittests_CFLAGS) $(CFLAGS) -c -o unittests-unittests.o `test -f 'unittests.c' || echo '$(srcdir)/'`unittests.c + +unittests-unittests.obj: unittests.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittests_CFLAGS) $(CFLAGS) -MT unittests-unittests.obj -MD -MP -MF $(DEPDIR)/unittests-unittests.Tpo -c -o unittests-unittests.obj `if test -f 'unittests.c'; then $(CYGPATH_W) 'unittests.c'; else $(CYGPATH_W) '$(srcdir)/unittests.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/unittests-unittests.Tpo $(DEPDIR)/unittests-unittests.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unittests.c' object='unittests-unittests.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittests_CFLAGS) $(CFLAGS) -c -o unittests-unittests.obj `if test -f 'unittests.c'; then $(CYGPATH_W) 'unittests.c'; else $(CYGPATH_W) '$(srcdir)/unittests.c'; fi` + +unittests-utils.o: ../src/utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittests_CFLAGS) $(CFLAGS) -MT unittests-utils.o -MD -MP -MF $(DEPDIR)/unittests-utils.Tpo -c -o unittests-utils.o `test -f '../src/utils.c' || echo '$(srcdir)/'`../src/utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/unittests-utils.Tpo $(DEPDIR)/unittests-utils.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../src/utils.c' object='unittests-utils.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o utils.o `test -f '../src/utils.c' || echo '$(srcdir)/'`../src/utils.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittests_CFLAGS) $(CFLAGS) -c -o unittests-utils.o `test -f '../src/utils.c' || echo '$(srcdir)/'`../src/utils.c -utils.obj: ../src/utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT utils.obj -MD -MP -MF $(DEPDIR)/utils.Tpo -c -o utils.obj `if test -f '../src/utils.c'; then $(CYGPATH_W) '../src/utils.c'; else $(CYGPATH_W) '$(srcdir)/../src/utils.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utils.Tpo $(DEPDIR)/utils.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../src/utils.c' object='utils.obj' libtool=no @AMDEPBACKSLASH@ +unittests-utils.obj: ../src/utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittests_CFLAGS) $(CFLAGS) -MT unittests-utils.obj -MD -MP -MF $(DEPDIR)/unittests-utils.Tpo -c -o unittests-utils.obj `if test -f '../src/utils.c'; then $(CYGPATH_W) '../src/utils.c'; else $(CYGPATH_W) '$(srcdir)/../src/utils.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/unittests-utils.Tpo $(DEPDIR)/unittests-utils.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../src/utils.c' object='unittests-utils.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o utils.obj `if test -f '../src/utils.c'; then $(CYGPATH_W) '../src/utils.c'; else $(CYGPATH_W) '$(srcdir)/../src/utils.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittests_CFLAGS) $(CFLAGS) -c -o unittests-utils.obj `if test -f '../src/utils.c'; then $(CYGPATH_W) '../src/utils.c'; else $(CYGPATH_W) '$(srcdir)/../src/utils.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -465,26 +763,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; \ @@ -496,15 +783,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 @@ -513,102 +796,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; \ + else \ + 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 $(check_PROGRAMS) + @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 $$? +unittests.log: unittests$(EXEEXT) + @p='unittests$(EXEEXT)'; \ + b='unittests'; \ + $(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'`; \ @@ -666,6 +1034,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: @@ -749,9 +1120,9 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic 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 \ @@ -761,7 +1132,7 @@ 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 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru geany-plugins-1.23+dfsg/geanypy/AUTHORS geany-plugins-1.24+dfsg/geanypy/AUTHORS --- geany-plugins-1.23+dfsg/geanypy/AUTHORS 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/AUTHORS 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,2 @@ +Matthew Brush +Lex Trotman (Geany-Plugins port) diff -Nru geany-plugins-1.23+dfsg/geanypy/ChangeLog geany-plugins-1.24+dfsg/geanypy/ChangeLog --- geany-plugins-1.23+dfsg/geanypy/ChangeLog 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/ChangeLog 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1 @@ +Unused diff -Nru geany-plugins-1.23+dfsg/geanypy/COPYING geany-plugins-1.24+dfsg/geanypy/COPYING --- geany-plugins-1.23+dfsg/geanypy/COPYING 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/COPYING 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff -Nru geany-plugins-1.23+dfsg/geanypy/geany/console.py geany-plugins-1.24+dfsg/geanypy/geany/console.py --- geany-plugins-1.23+dfsg/geanypy/geany/console.py 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/geany/console.py 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,666 @@ +#!/usr/bin/env python +# +# pyconsole.py +# +# Copyright (C) 2004-2010 by Yevgen Muntyan +# Thanks to Geoffrey French for ideas. +# +# This file is part of medit. medit is free software; you can +# redistribute it and/or modify it under the terms of the +# GNU Lesser General Public License as published by the +# Free Software Foundation; either version 2.1 of the License, +# or (at your option) any later version. +# +# You should have received a copy of the GNU Lesser General Public +# License along with medit. If not, see . +# + +# This module 'runs' python interpreter in a TextView widget. +# The main class is Console, usage is: +# Console(locals=None, banner=None, completer=None, use_rlcompleter=True, start_script='') - +# it creates the widget and 'starts' interactive session; see the end of +# this file. If start_script is not empty, it pastes it as it was entered from keyboard. +# +# Console has "command" signal which is emitted when code is about to +# be executed. You may connect to it using console.connect or console.connect_after +# to get your callback ran before or after the code is executed. +# +# To modify output appearance, set attributes of console.stdout_tag and +# console.stderr_tag. +# +# Console may subclass a type other than gtk.TextView, to allow syntax highlighting and stuff, +# e.g.: +# console_type = pyconsole.ConsoleType(moo.TextView) +# console = console_type(use_rlcompleter=False, start_script="import moo\nimport gtk\n") +# +# This widget is not a replacement for real terminal with python running +# inside: GtkTextView is not a terminal. +# The use case is: you have a python program, you create this widget, +# and inspect your program interiors. + +import gtk +import gtk.gdk as gdk +import gobject +import pango +import gtk.keysyms as _keys +import code +import sys +import keyword +import re + +# commonprefix() from posixpath +def _commonprefix(m): + "Given a list of pathnames, returns the longest common leading component" + if not m: return '' + prefix = m[0] + for item in m: + for i in range(len(prefix)): + if prefix[:i+1] != item[:i+1]: + prefix = prefix[:i] + if i == 0: + return '' + break + return prefix + +class _ReadLine(object): + + class Output(object): + def __init__(self, console, tag_name): + object.__init__(self) + self.buffer = console.get_buffer() + self.tag_name = tag_name + def write(self, text): + pos = self.buffer.get_iter_at_mark(self.buffer.get_insert()) + self.buffer.insert_with_tags_by_name(pos, text, self.tag_name) + + class History(object): + def __init__(self): + object.__init__(self) + self.items = [''] + self.ptr = 0 + self.edited = {} + + def commit(self, text): + if text and self.items[-1] != text: + self.items.append(text) + self.ptr = 0 + self.edited = {} + + def get(self, dir, text): + if len(self.items) == 1: + return None + + if text != self.items[self.ptr]: + self.edited[self.ptr] = text + elif self.edited.has_key(self.ptr): + del self.edited[self.ptr] + + self.ptr = self.ptr + dir + if self.ptr >= len(self.items): + self.ptr = 0 + elif self.ptr < 0: + self.ptr = len(self.items) - 1 + + try: + return self.edited[self.ptr] + except KeyError: + return self.items[self.ptr] + + def __init__(self): + object.__init__(self) + + self.set_wrap_mode(gtk.WRAP_CHAR) + self.modify_font(pango.FontDescription("Monospace")) + + self.buffer = self.get_buffer() + self.buffer.connect("insert-text", self.on_buf_insert) + self.buffer.connect("delete-range", self.on_buf_delete) + self.buffer.connect("mark-set", self.on_buf_mark_set) + self.do_insert = False + self.do_delete = False + + self.stdout_tag = self.buffer.create_tag("stdout", foreground="#006000") + self.stderr_tag = self.buffer.create_tag("stderr", foreground="#B00000") + self._stdout = _ReadLine.Output(self, "stdout") + self._stderr = _ReadLine.Output(self, "stderr") + + self.cursor = self.buffer.create_mark("cursor", + self.buffer.get_start_iter(), + False) + insert = self.buffer.get_insert() + self.cursor.set_visible(True) + insert.set_visible(False) + + self.ps = '' + self.in_raw_input = False + self.run_on_raw_input = None + self.tab_pressed = 0 + self.history = _ReadLine.History() + self.nonword_re = re.compile("[^\w\._]") + + def freeze_undo(self): + try: self.begin_not_undoable_action() + except: pass + + def thaw_undo(self): + try: self.end_not_undoable_action() + except: pass + + def raw_input(self, ps=None): + if ps: + self.ps = ps + else: + self.ps = '' + + iter = self.buffer.get_iter_at_mark(self.buffer.get_insert()) + + if ps: + self.freeze_undo() + self.buffer.insert(iter, self.ps) + self.thaw_undo() + + self.__move_cursor_to(iter) + self.scroll_to_mark(self.cursor, 0.2) + + self.in_raw_input = True + + if self.run_on_raw_input: + run_now = self.run_on_raw_input + self.run_on_raw_input = None + self.buffer.insert_at_cursor(run_now + '\n') + + def on_buf_mark_set(self, buffer, iter, mark): + if mark is not buffer.get_insert(): + return + start = self.__get_start() + end = self.__get_end() + if iter.compare(self.__get_start()) >= 0 and \ + iter.compare(self.__get_end()) <= 0: + buffer.move_mark_by_name("cursor", iter) + self.scroll_to_mark(self.cursor, 0.2) + + def __insert(self, iter, text): + self.do_insert = True + self.buffer.insert(iter, text) + self.do_insert = False + + def on_buf_insert(self, buf, iter, text, len): + if not self.in_raw_input or self.do_insert or not len: + return + buf.stop_emission("insert-text") + lines = text.splitlines() + need_eol = False + for l in lines: + if need_eol: + self._commit() + iter = self.__get_cursor() + else: + cursor = self.__get_cursor() + if iter.compare(self.__get_start()) < 0: + iter = cursor + elif iter.compare(self.__get_end()) > 0: + iter = cursor + else: + self.__move_cursor_to(iter) + need_eol = True + self.__insert(iter, l) + self.__move_cursor(0) + + def __delete(self, start, end): + self.do_delete = True + self.buffer.delete(start, end) + self.do_delete = False + + def on_buf_delete(self, buf, start, end): + if not self.in_raw_input or self.do_delete: + return + + buf.stop_emission("delete-range") + + start.order(end) + line_start = self.__get_start() + line_end = self.__get_end() + + if start.compare(line_end) > 0: + return + if end.compare(line_start) < 0: + return + + self.__move_cursor(0) + + if start.compare(line_start) < 0: + start = line_start + if end.compare(line_end) > 0: + end = line_end + self.__delete(start, end) + + def do_key_press_event(self, event, parent_type): + if not self.in_raw_input: + return parent_type.do_key_press_event(self, event) + + tab_pressed = self.tab_pressed + self.tab_pressed = 0 + handled = True + + state = event.state & (gdk.SHIFT_MASK | + gdk.CONTROL_MASK | + gdk.MOD1_MASK) + keyval = event.keyval + + if not state: + if keyval == _keys.Return: + self._commit() + elif keyval == _keys.Up: + self.__history(-1) + elif keyval == _keys.Down: + self.__history(1) + elif keyval == _keys.Left: + self.__move_cursor(-1) + elif keyval == _keys.Right: + self.__move_cursor(1) + elif keyval == _keys.Home: + self.__move_cursor(-10000) + elif keyval == _keys.End: + self.__move_cursor(10000) + elif keyval == _keys.Tab: + cursor = self.__get_cursor() + if cursor.starts_line(): + handled = False + else: + cursor.backward_char() + if cursor.get_char().isspace(): + handled = False + else: + self.tab_pressed = tab_pressed + 1 + self.__complete() + else: + handled = False + elif state == gdk.CONTROL_MASK: + if keyval == _keys.u: + start = self.__get_start() + end = self.__get_cursor() + self.__delete(start, end) + else: + handled = False + else: + handled = False + + if not handled: + return parent_type.do_key_press_event(self, event) + else: + return True + + def __history(self, dir): + text = self._get_line() + new_text = self.history.get(dir, text) + if not new_text is None: + self.__replace_line(new_text) + self.__move_cursor(0) + self.scroll_to_mark(self.cursor, 0.2) + + def __get_cursor(self): + return self.buffer.get_iter_at_mark(self.cursor) + def __get_start(self): + iter = self.__get_cursor() + iter.set_line_offset(len(self.ps)) + return iter + def __get_end(self): + iter = self.__get_cursor() + if not iter.ends_line(): + iter.forward_to_line_end() + return iter + + def __get_text(self, start, end): + return self.buffer.get_text(start, end, False) + + def __move_cursor_to(self, iter): + self.buffer.place_cursor(iter) + self.buffer.move_mark_by_name("cursor", iter) + + def __move_cursor(self, howmany): + iter = self.__get_cursor() + end = self.__get_cursor() + if not end.ends_line(): + end.forward_to_line_end() + line_len = end.get_line_offset() + move_to = iter.get_line_offset() + howmany + move_to = min(max(move_to, len(self.ps)), line_len) + iter.set_line_offset(move_to) + self.__move_cursor_to(iter) + + def __delete_at_cursor(self, howmany): + iter = self.__get_cursor() + end = self.__get_cursor() + if not end.ends_line(): + end.forward_to_line_end() + line_len = end.get_line_offset() + erase_to = iter.get_line_offset() + howmany + if erase_to > line_len: + erase_to = line_len + elif erase_to < len(self.ps): + erase_to = len(self.ps) + end.set_line_offset(erase_to) + self.__delete(iter, end) + + def __get_width(self): + if not (self.flags() & gtk.REALIZED): + return 80 + layout = pango.Layout(self.get_pango_context()) + letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" + layout.set_text(letters) + pix_width = layout.get_pixel_size()[0] + return self.allocation.width * len(letters) / pix_width + + def __print_completions(self, completions): + line_start = self.__get_text(self.__get_start(), self.__get_cursor()) + line_end = self.__get_text(self.__get_cursor(), self.__get_end()) + iter = self.buffer.get_end_iter() + self.__move_cursor_to(iter) + self.__insert(iter, "\n") + + width = max(self.__get_width(), 4) + max_width = max([len(s) for s in completions]) + n_columns = max(int(width / (max_width + 1)), 1) + col_width = int(width / n_columns) + total = len(completions) + col_length = total / n_columns + if total % n_columns: + col_length = col_length + 1 + col_length = max(col_length, 1) + + if col_length == 1: + n_columns = total + col_width = width / total + + for i in range(col_length): + for j in range(n_columns): + ind = i + j*col_length + if ind < total: + if j == n_columns - 1: + n_spaces = 0 + else: + n_spaces = col_width - len(completions[ind]) + self.__insert(iter, completions[ind] + " " * n_spaces) + self.__insert(iter, "\n") + + self.__insert(iter, "%s%s%s" % (self.ps, line_start, line_end)) + iter.set_line_offset(len(self.ps) + len(line_start)) + self.__move_cursor_to(iter) + self.scroll_to_mark(self.cursor, 0.2) + + def __complete(self): + text = self.__get_text(self.__get_start(), self.__get_cursor()) + start = '' + word = text + nonwords = self.nonword_re.findall(text) + if nonwords: + last = text.rfind(nonwords[-1]) + len(nonwords[-1]) + start = text[:last] + word = text[last:] + + completions = self.complete(word) + + if completions: + prefix = _commonprefix(completions) + if prefix != word: + start_iter = self.__get_start() + start_iter.forward_chars(len(start)) + end_iter = start_iter.copy() + end_iter.forward_chars(len(word)) + self.__delete(start_iter, end_iter) + self.__insert(end_iter, prefix) + elif self.tab_pressed > 1: + self.freeze_undo() + self.__print_completions(completions) + self.thaw_undo() + self.tab_pressed = 0 + + def complete(self, text): + return None + + def _get_line(self): + start = self.__get_start() + end = self.__get_end() + return self.buffer.get_text(start, end, False) + + def __replace_line(self, new_text): + start = self.__get_start() + end = self.__get_end() + self.__delete(start, end) + self.__insert(end, new_text) + + def _commit(self): + end = self.__get_cursor() + if not end.ends_line(): + end.forward_to_line_end() + text = self._get_line() + self.__move_cursor_to(end) + self.freeze_undo() + self.__insert(end, "\n") + self.in_raw_input = False + self.history.commit(text) + self.do_raw_input(text) + self.thaw_undo() + + def do_raw_input(self, text): + pass + + +class _Console(_ReadLine, code.InteractiveInterpreter): + def __init__(self, locals=None, banner=None, + completer=None, use_rlcompleter=True, + start_script=None): + _ReadLine.__init__(self) + + + code.InteractiveInterpreter.__init__(self, locals) + self.locals["__console__"] = self + + self.start_script = start_script + self.completer = completer + self.banner = banner + + if not self.completer and use_rlcompleter: + try: + import rlcompleter + self.completer = rlcompleter.Completer() + except ImportError: + pass + + self.ps1 = ">>> " + self.ps2 = "... " + self.__start() + self.run_on_raw_input = start_script + self.raw_input(self.ps1) + + def __start(self): + self.cmd_buffer = "" + + self.freeze_undo() + self.thaw_undo() + self.buffer.set_text("") + + if self.banner: + iter = self.buffer.get_start_iter() + self.buffer.insert_with_tags_by_name(iter, self.banner, "stdout") + if not iter.starts_line(): + self.buffer.insert(iter, "\n") + + def clear(self, start_script=None): + if start_script is None: + start_script = self.start_script + else: + self.start_script = start_script + + self.__start() + self.run_on_raw_input = start_script + + def do_raw_input(self, text): + if self.cmd_buffer: + cmd = self.cmd_buffer + "\n" + text + else: + cmd = text + + saved_stdout, saved_stderr = sys.stdout, sys.stderr + sys.stdout, sys.stderr = self._stdout, self._stderr + + if self.runsource(cmd): + self.cmd_buffer = cmd + ps = self.ps2 + else: + self.cmd_buffer = '' + ps = self.ps1 + + sys.stdout, sys.stderr = saved_stdout, saved_stderr + self.raw_input(ps) + + def do_command(self, code): + try: + eval(code, self.locals) +# In GeanyPy console, we don't want to exit the process on SystemExit +# except SystemExit: +# raise + except: + self.showtraceback() + + def runcode(self, code): + if gtk.pygtk_version[1] < 8: + self.do_command(code) + else: + self.emit("command", code) + + def exec_command(self, command): + if self._get_line(): + self._commit() + self.buffer.insert_at_cursor(command) + self._commit() + + def complete_attr(self, start, end): + try: + obj = eval(start, self.locals) + strings = dir(obj) + + if end: + completions = {} + for s in strings: + if s.startswith(end): + completions[s] = None + completions = completions.keys() + else: + completions = strings + + completions.sort() + return [start + "." + s for s in completions] + except: + return None + + def complete(self, text): + if self.completer: + completions = [] + i = 0 + try: + while 1: + s = self.completer.complete(text, i) + if s: + completions.append(s) + i = i + 1 + else: + completions.sort() + return completions + except NameError: + return None + + dot = text.rfind(".") + if dot >= 0: + return self.complete_attr(text[:dot], text[dot+1:]) + + completions = {} + strings = keyword.kwlist + + if self.locals: + strings.extend(self.locals.keys()) + + try: strings.extend(eval("globals()", self.locals).keys()) + except: pass + + try: + exec "import __builtin__" in self.locals + strings.extend(eval("dir(__builtin__)", self.locals)) + except: + pass + + for s in strings: + if s.startswith(text): + completions[s] = None + completions = completions.keys() + completions.sort() + return completions + + +def ReadLineType(t=gtk.TextView): + class readline(t, _ReadLine): + def __init__(self, *args, **kwargs): + t.__init__(self) + _ReadLine.__init__(self, *args, **kwargs) + def do_key_press_event(self, event): + return _ReadLine.do_key_press_event(self, event, t) + gobject.type_register(readline) + return readline + +def ConsoleType(t=gtk.TextView): + class console_type(t, _Console): + __gsignals__ = { + 'command' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (object,)), + 'key-press-event' : 'override' + } + + def __init__(self, *args, **kwargs): + if gtk.pygtk_version[1] < 8: + gobject.GObject.__init__(self) + else: + t.__init__(self) + _Console.__init__(self, *args, **kwargs) + + def do_command(self, code): + return _Console.do_command(self, code) + + def do_key_press_event(self, event): + return _Console.do_key_press_event(self, event, t) + + if gtk.pygtk_version[1] < 8: + gobject.type_register(console_type) + + return console_type + +ReadLine = ReadLineType() +Console = ConsoleType() + +def _create_widget(start_script): + + console = Console(banner="Geany Python Console", + use_rlcompleter=False, + start_script=start_script) + return console + +def _make_window(start_script="import geany\n"): + window = gtk.Window() + window.set_title("Python Console") + swin = gtk.ScrolledWindow() + swin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_ALWAYS) + window.add(swin) + console = _create_widget(start_script) + swin.add(console) + window.set_default_size(500, 400) + window.show_all() + + if not gtk.main_level(): + window.connect("destroy", gtk.main_quit) + gtk.main() + + return console + +if __name__ == '__main__': + import sys + import os + sys.path.insert(0, os.getcwd()) + _make_window(sys.argv[1:] and '\n'.join(sys.argv[1:]) + '\n' or None) diff -Nru geany-plugins-1.23+dfsg/geanypy/geany/__init__.py geany-plugins-1.24+dfsg/geanypy/geany/__init__.py --- geany-plugins-1.23+dfsg/geanypy/geany/__init__.py 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/geany/__init__.py 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,69 @@ +""" +Package file that exposes some of Geany's guts as its own attibutes. Any +objects where it only makes sense to have one instance of are initialed here +and set as attributes. + +You can sort of think of this file as the GeanyData struct from the C API, +though no real attempt is made to mimic that structure here. +""" + +import app +import console +import dialogs +import document +import editor +import encoding +import filetypes +import highlighting +import loader +import main +import manager +import msgwindow +import navqueue +import prefs +import project +import scintilla +import search +import templates +import ui_utils + +from app import App +from prefs import Prefs, ToolPrefs +from main import is_realized, locale_init, reload_configuration +from signalmanager import SignalManager +from ui_utils import MainWidgets, InterfacePrefs +from search import SearchPrefs +from templates import TemplatePrefs + + +__all__ = [ "Plugin", + "is_realized", + "locale_init", + "reload_configuration", + "main_widgets", + "interface_prefs", + "app", + "general_prefs", + "search_prefs", + "template_prefs", + "tool_prefs", + "signals" ] + +# Geany's application data fields +app = App() + +# Import GTK+ widgets that are part of Geany's UI +main_widgets = MainWidgets() + +# Preferences +general_prefs = Prefs() # GeanyData->prefs but name clashes with module +interface_prefs = InterfacePrefs() +search_prefs = SearchPrefs() +template_prefs = TemplatePrefs() +tool_prefs = ToolPrefs() + +# GObject to connect signal handlers on and which emits signals. +signals = SignalManager() + +import plugin +from plugin import Plugin diff -Nru geany-plugins-1.23+dfsg/geanypy/geany/loader.py geany-plugins-1.24+dfsg/geanypy/geany/loader.py --- geany-plugins-1.23+dfsg/geanypy/geany/loader.py 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/geany/loader.py 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,172 @@ +import os +import imp +from collections import namedtuple +import geany + +PluginInfo = namedtuple('PluginInfo', 'filename, name, version, description, author, cls') + + +class PluginLoader(object): + + plugins = {} + + def __init__(self, plugin_dirs): + + self.plugin_dirs = plugin_dirs + + self.available_plugins = [] + for plugin in self.iter_plugin_info(): + self.available_plugins.append(plugin) + + self.restore_loaded_plugins() + + + def update_loaded_plugins_file(self): + for path in self.plugin_dirs: + if os.path.isdir(path): + try: + state_file = os.path.join(path, '.loaded_plugins') + with open(state_file, 'w') as f: + for plugfn in self.plugins: + f.write("%s\n" % plugfn) + except IOError as err: + if err.errno == 13: #perms + pass + else: + raise + + + def restore_loaded_plugins(self): + loaded_plugins = [] + for path in reversed(self.plugin_dirs): + state_file = os.path.join(path, ".loaded_plugins") + if os.path.exists(state_file): + for line in open(state_file): + line = line.strip() + if line not in loaded_plugins: + loaded_plugins.append(line) + for filename in loaded_plugins: + self.load_plugin(filename) + + + def load_all_plugins(self): + + for plugin_info in self.iter_plugin_info(): + if plugin_filename.endswith('test.py'): # hack for testing + continue + plug = self.load_plugin(plugin_info.filename) + if plug: + print("Loaded plugin: %s" % plugin_info.filename) + print(" Name: %s v%s" % (plug.name, plug.version)) + print(" Desc: %s" % plug.description) + print(" Author: %s" % plug.author) + + + def unload_all_plugins(self): + + for plugin in self.plugins: + self.unload_plugin(plugin) + + + def reload_all_plugins(self): + + self.unload_all_plugins() + self.load_all_plugins() + + + def iter_plugin_info(self): + + for d in self.plugin_dirs: + if os.path.isdir(d): + for current_file in os.listdir(d): + #check inside folders inside the plugins dir so we can load .py files here as plugins + current_path=os.path.abspath(os.path.join(d, current_file)) + if os.path.isdir(current_path): + for plugin_folder_file in os.listdir(current_path): + if plugin_folder_file.endswith('.py'): + #loop around results if its fails to load will never reach yield + for p in self.load_plugin_info(current_path,plugin_folder_file): + yield p + + #not a sub directory so if it ends with .py lets just attempt to load it as a plugin + if current_file.endswith('.py'): + #loop around results if its fails to load will never reach yield + for p in self.load_plugin_info(d,current_file): + yield p + + def load_plugin_info(self,d,f): + filename = os.path.abspath(os.path.join(d, f)) + if filename.endswith("test.py"): + pass + text = open(filename).read() + module_name = os.path.basename(filename)[:-3] + try: + module = imp.load_source(module_name, filename) + except ImportError as exc: + print "Error: failed to import settings module ({})".format(exc) + module=None + if module: + for k, v in module.__dict__.iteritems(): + if k == geany.Plugin.__name__: + continue + try: + if issubclass(v, geany.Plugin): + inf = PluginInfo( + filename, + getattr(v, '__plugin_name__'), + getattr(v, '__plugin_version__', ''), + getattr(v, '__plugin_description__', ''), + getattr(v, '__plugin_author__', ''), + v) + yield inf + + except TypeError: + continue + + + def load_plugin(self, filename): + + for avail in self.available_plugins: + if avail.filename == filename: + inst = avail.cls() + self.plugins[filename] = inst + self.update_loaded_plugins_file() + geany.ui_utils.set_statusbar('GeanyPy: plugin activated: %s' % + inst.name, True) + return inst + + + def unload_plugin(self, filename): + + try: + plugin = self.plugins[filename] + name = plugin.name + plugin.cleanup() + del self.plugins[filename] + self.update_loaded_plugins_file() + geany.ui_utils.set_statusbar('GeanyPy: plugin deactivated: %s' % + name, True) + except KeyError: + print("Unable to unload plugin '%s': it's not loaded" % filename) + + + def reload_plugin(self, filename): + + if filename in self.plugins: + self.unload_plugin(filename) + self.load_plugin(filename) + + + def plugin_has_help(self, filename): + + for plugin_info in self.iter_plugin_info(): + if plugin_info.filename == filename: + return hasattr(plugin_info.cls, 'show_help') + + + def plugin_has_configure(self, filename): + + try: + return hasattr(self.plugins[filename], 'show_configure') + except KeyError: + return None diff -Nru geany-plugins-1.23+dfsg/geanypy/geany/Makefile.am geany-plugins-1.24+dfsg/geanypy/geany/Makefile.am --- geany-plugins-1.23+dfsg/geanypy/geany/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/geany/Makefile.am 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,18 @@ +geanypy_sources = __init__.py \ + console.py \ + manager.py \ + loader.py \ + plugin.py \ + signalmanager.py +geanypy_objects = $(geanypy_sources:.py=.pyc) +geanypydir = $(libdir)/geany/geanypy/geany +geanypy_DATA = $(geanypy_sources) $(geanypy_objects) + +EXTRA_DIST = $(geanypy_sources) +CLEANFILES = $(geanypy_objects) + +.SUFFIXES = .pyc .py + +.py.pyc: + $(AM_V_GEN) \ + $(PYTHON) -c "from py_compile import compile; compile('$<', '$@')" diff -Nru geany-plugins-1.23+dfsg/geanypy/geany/Makefile.in geany-plugins-1.24+dfsg/geanypy/geany/Makefile.in --- geany-plugins-1.23+dfsg/geanypy/geany/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/geany/Makefile.in 2014-04-13 17:12:44.000000000 +0000 @@ -0,0 +1,640 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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 \ + *\\[\ \ ]*) \ + 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; \ + 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@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = geanypy/geany +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ + $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ + $(top_srcdir)/build/cppcheck.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ + $(top_srcdir)/build/geanydoc.m4 \ + $(top_srcdir)/build/geanyextrasel.m4 \ + $(top_srcdir)/build/geanygendoc.m4 \ + $(top_srcdir)/build/geanyinsertnum.m4 \ + $(top_srcdir)/build/geanylatex.m4 \ + $(top_srcdir)/build/geanylipsum.m4 \ + $(top_srcdir)/build/geanylua.m4 \ + $(top_srcdir)/build/geanymacro.m4 \ + $(top_srcdir)/build/geanyminiscript.m4 \ + $(top_srcdir)/build/geanynumberedbookmarks.m4 \ + $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ + $(top_srcdir)/build/geanysendmail.m4 \ + $(top_srcdir)/build/geanyvc.m4 \ + $(top_srcdir)/build/geniuspaste.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ + $(top_srcdir)/build/pretty-printer.m4 \ + $(top_srcdir)/build/scope.m4 \ + $(top_srcdir)/build/shiftcolumn.m4 \ + $(top_srcdir)/build/spellcheck.m4 \ + $(top_srcdir)/build/status.m4 \ + $(top_srcdir)/build/tableconvert.m4 \ + $(top_srcdir)/build/treebrowser.m4 \ + $(top_srcdir)/build/unittests.m4 \ + $(top_srcdir)/build/updatechecker.m4 \ + $(top_srcdir)/build/webhelper.m4 \ + $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ + $(top_srcdir)/build/cache/glib-gettext.m4 \ + $(top_srcdir)/build/cache/intltool.m4 \ + $(top_srcdir)/build/cache/libtool.m4 \ + $(top_srcdir)/build/cache/ltoptions.m4 \ + $(top_srcdir)/build/cache/ltsugar.m4 \ + $(top_srcdir)/build/cache/ltversion.m4 \ + $(top_srcdir)/build/cache/lt~obsolete.m4 \ + $(top_srcdir)/build/cache/nls.m4 \ + $(top_srcdir)/build/cache/pkg.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +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_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 = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +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__installdirs = "$(DESTDIR)$(geanypydir)" +DATA = $(geanypy_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ +COMMANDER_CFLAGS = @COMMANDER_CFLAGS@ +COMMANDER_LIBS = @COMMANDER_LIBS@ +CPP = @CPP@ +CPPCHECK = @CPPCHECK@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ +DEVHELP_LIBS = @DEVHELP_LIBS@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENCHANT_CFLAGS = @ENCHANT_CFLAGS@ +ENCHANT_LIBS = @ENCHANT_LIBS@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GEANYGENDOC_CFLAGS = @GEANYGENDOC_CFLAGS@ +GEANYGENDOC_LIBS = @GEANYGENDOC_LIBS@ +GEANY_CFLAGS = @GEANY_CFLAGS@ +GEANY_LIBS = @GEANY_LIBS@ +GEANY_VERSION = @GEANY_VERSION@ +GENIUSPASTE_CFLAGS = @GENIUSPASTE_CFLAGS@ +GENIUSPASTE_LIBS = @GENIUSPASTE_LIBS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GPGME_CFLAGS = @GPGME_CFLAGS@ +GPGME_CONFIG = @GPGME_CONFIG@ +GPGME_LIBS = @GPGME_LIBS@ +GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ +GREP = @GREP@ +GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ +GTKSPELL_LIBS = @GTKSPELL_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBMARKDOWN_CFLAGS = @LIBMARKDOWN_CFLAGS@ +LIBMARKDOWN_LIBS = @LIBMARKDOWN_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCALEDIR = @LOCALEDIR@ +LTLIBOBJS = @LTLIBOBJS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_LIBS = @LUA_LIBS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MARKDOWN_CFLAGS = @MARKDOWN_CFLAGS@ +MARKDOWN_LIBS = @MARKDOWN_LIBS@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +MULTITERM_CFLAGS = @MULTITERM_CFLAGS@ +MULTITERM_LIBS = @MULTITERM_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +RST2HTML = @RST2HTML@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +UPDATECHECKER_CFLAGS = @UPDATECHECKER_CFLAGS@ +UPDATECHECKER_LIBS = @UPDATECHECKER_LIBS@ +USE_NLS = @USE_NLS@ +VALAC = @VALAC@ +VERSION = @VERSION@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ +WEBHELPER_CFLAGS = @WEBHELPER_CFLAGS@ +WEBHELPER_LIBS = @WEBHELPER_LIBS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +geanypluginsdir = @geanypluginsdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +geanypy_sources = __init__.py \ + console.py \ + manager.py \ + loader.py \ + plugin.py \ + signalmanager.py + +geanypy_objects = $(geanypy_sources:.py=.pyc) +geanypydir = $(libdir)/geany/geanypy/geany +geanypy_DATA = $(geanypy_sources) $(geanypy_objects) +EXTRA_DIST = $(geanypy_sources) +CLEANFILES = $(geanypy_objects) +.SUFFIXES = .pyc .py +all: all-am + +.SUFFIXES: +.SUFFIXES: .py .pyc +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign geanypy/geany/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign geanypy/geany/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-geanypyDATA: $(geanypy_DATA) + @$(NORMAL_INSTALL) + @list='$(geanypy_DATA)'; test -n "$(geanypydir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(geanypydir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(geanypydir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(geanypydir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(geanypydir)" || exit $$?; \ + done + +uninstall-geanypyDATA: + @$(NORMAL_UNINSTALL) + @list='$(geanypy_DATA)'; test -n "$(geanypydir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(geanypydir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(geanypydir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-geanypyDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-geanypyDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic 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-geanypyDATA 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-geanypyDATA + + +.py.pyc: + $(AM_V_GEN) \ + $(PYTHON) -c "from py_compile import compile; compile('$<', '$@')" + +# 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. +.NOEXPORT: diff -Nru geany-plugins-1.23+dfsg/geanypy/geany/manager.py geany-plugins-1.24+dfsg/geanypy/geany/manager.py --- geany-plugins-1.23+dfsg/geanypy/geany/manager.py 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/geany/manager.py 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,179 @@ +import gtk +import gobject +import glib +from htmlentitydefs import name2codepoint +from loader import PluginLoader + + +class PluginManager(gtk.Dialog): + + def __init__(self, plugin_dirs=[]): + gtk.Dialog.__init__(self, title="Plugin Manager") + self.loader = PluginLoader(plugin_dirs) + + self.set_default_size(400, 450) + self.set_has_separator(True) + icon = self.render_icon(gtk.STOCK_PREFERENCES, gtk.ICON_SIZE_MENU) + self.set_icon(icon) + + self.connect("response", lambda w,d: self.hide()) + + vbox = gtk.VBox(False, 12) + vbox.set_border_width(12) + + lbl = gtk.Label("Choose plugins to load or unload:") + lbl.set_alignment(0.0, 0.5) + vbox.pack_start(lbl, False, False, 0) + + sw = gtk.ScrolledWindow() + sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) + sw.set_shadow_type(gtk.SHADOW_ETCHED_IN) + vbox.pack_start(sw, True, True, 0) + + self.treeview = gtk.TreeView() + sw.add(self.treeview) + + vbox.show_all() + + self.get_content_area().add(vbox) + + action_area = self.get_action_area() + action_area.set_spacing(0) + action_area.set_homogeneous(False) + + btn = gtk.Button(stock=gtk.STOCK_CLOSE) + btn.set_border_width(6) + btn.connect("clicked", lambda x: self.response(gtk.RESPONSE_CLOSE)) + action_area.pack_start(btn, False, True, 0) + btn.show() + + self.btn_help = gtk.Button(stock=gtk.STOCK_HELP) + self.btn_help.set_border_width(6) + self.btn_help.set_no_show_all(True) + action_area.pack_start(self.btn_help, False, True, 0) + action_area.set_child_secondary(self.btn_help, True) + + self.btn_prefs = gtk.Button(stock=gtk.STOCK_PREFERENCES) + self.btn_prefs.set_border_width(6) + self.btn_prefs.set_no_show_all(True) + action_area.pack_start(self.btn_prefs, False, True, 0) + action_area.set_child_secondary(self.btn_prefs, True) + + action_area.show() + + self.load_plugins_list() + + + def on_help_button_clicked(self, button, treeview, model): + path = treeview.get_cursor()[0] + iter = model.get_iter(path) + filename = model.get_value(iter, 2) + for plugin in self.loader.available_plugins: + if plugin.filename == filename: + plugin.cls.show_help() + break + else: + print("Plugin does not support help function") + + + def on_preferences_button_clicked(self, button, treeview, model): + path = treeview.get_cursor()[0] + iter = model.get_iter(path) + filename = model.get_value(iter, 2) + try: + self.loader.plugins[filename].show_configure() + except KeyError: + print("Plugin is not loaded, can't run configure function") + + + def activate_plugin(self, filename): + self.loader.load_plugin(filename) + + + def deactivate_plugin(self, filename): + self.loader.unload_plugin(filename) + + + def load_plugins_list(self): + liststore = gtk.ListStore(gobject.TYPE_BOOLEAN, str, str) + + self.btn_help.connect("clicked", + self.on_help_button_clicked, self.treeview, liststore) + + self.btn_prefs.connect("clicked", + self.on_preferences_button_clicked, self.treeview, liststore) + + self.treeview.set_model(liststore) + self.treeview.set_headers_visible(False) + self.treeview.set_grid_lines(True) + + check_renderer = gtk.CellRendererToggle() + check_renderer.set_radio(False) + check_renderer.connect('toggled', self.on_plugin_load_toggled, liststore) + text_renderer = gtk.CellRendererText() + + check_column = gtk.TreeViewColumn(None, check_renderer, active=0) + text_column = gtk.TreeViewColumn(None, text_renderer, markup=1) + + self.treeview.append_column(check_column) + self.treeview.append_column(text_column) + + self.treeview.connect('row-activated', + self.on_row_activated, check_renderer, liststore) + self.treeview.connect('cursor-changed', + self.on_selected_plugin_changed, liststore) + + self.load_sorted_plugins_info(liststore) + + + def load_sorted_plugins_info(self, list_store): + + plugin_info_list = list(self.loader.iter_plugin_info()) + #plugin_info_list.sort(key=lambda pi: pi[1]) + + for plugin_info in plugin_info_list: + + lbl = str('%s %s\n%s\n' + + 'Author: %s\n' + + 'Filename: %s') % ( + glib.markup_escape_text(plugin_info.name), + glib.markup_escape_text(plugin_info.version), + glib.markup_escape_text(plugin_info.description), + glib.markup_escape_text(plugin_info.author), + glib.markup_escape_text(plugin_info.filename)) + + loaded = plugin_info.filename in self.loader.plugins + + list_store.append([loaded, lbl, plugin_info.filename]) + + + def on_selected_plugin_changed(self, treeview, model): + + path = treeview.get_cursor()[0] + iter = model.get_iter(path) + filename = model.get_value(iter, 2) + active = model.get_value(iter, 0) + + if self.loader.plugin_has_configure(filename): + self.btn_prefs.set_visible(True) + else: + self.btn_prefs.set_visible(False) + + if self.loader.plugin_has_help(filename): + self.btn_help.set_visible(True) + else: + self.btn_help.set_visible(False) + + + def on_plugin_load_toggled(self, cell, path, model): + active = not cell.get_active() + iter = model.get_iter(path) + model.set_value(iter, 0, active) + if active: + self.activate_plugin(model.get_value(iter, 2)) + else: + self.deactivate_plugin(model.get_value(iter, 2)) + + + def on_row_activated(self, tvw, path, view_col, cell, model): + self.on_plugin_load_toggled(cell, path, model) diff -Nru geany-plugins-1.23+dfsg/geanypy/geany/plugin.py geany-plugins-1.24+dfsg/geanypy/geany/plugin.py --- geany-plugins-1.23+dfsg/geanypy/geany/plugin.py 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/geany/plugin.py 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,123 @@ +""" +All plugins need to import this module and inherit from the Plugin class. A +basic plugin could look something like this: + + import geany + from geany.plugin import Plugin + + class OpenNewDocumentPlugin(Plugin): + + __plugin_name__ = "Open new document plugin" + + _doc = None + + def __init__(self): + Plugin.__init__(self) + print "About to open a new document" + self.open_document('/path/to/some/file') + + def open_document(self, filename): + self._doc = geany.document.open(filename) + + def close_document(self): + self._doc.close() + self._doc = None + + def cleanup(self): + if self._doc is not None: + self._doc.close() + +The guts of the API are exposed to plugins through the `geany` package and +its modules. + +Plugins should be placed in either the system plugin directory (something +like /usr/local/share/geany/geanypy/plugins) or in their personal plugin +directory (something like ~/.config/geany/plugins/geanypy/plugins). Only +files with a `.py` extension will be loaded. +""" + + +class Plugin(object): + """ + Base class for all plugins. All plugins must inherit from this in order + to be properly detected. + """ + + # Child classes should implement these (at least __plugin__name__) + #__plugin_name__ = None + #__plugin_description__ = None + #__plugin_version__ = None + #__plugin_author__ = None + + + _events = { + "document-open": [], + # TODO: add more events here + } + + + def __init__(self): + """ + When the plugin is loaded its __init__() function will be called + so that's a good place to put plugin initialization code. + """ + + + + def cleanup(self): + """ + When the plugin is unloaded the cleanup() function will be called, so + it's a good place to put and clean-up/tear-down code. + """ + pass + + + @property + def __plugin_name__(self): + """ + Plugins must implement a __plugin_name__ attribute that returns the + string name of the plugin. + """ + raise NotImplementedError( + "Plugin's must implement the __plugin_name__ attribute.") + + + @property + def name(self): + """ + Get plugin's name. + """ + return self.__plugin_name__ + + + @property + def description(self): + """ + Get plugin's description. + """ + if hasattr(self, '__plugin_description__'): + return self.__plugin_description__ + else: + return "" + + + @property + def version(self): + """ + Get plugin's version. + """ + if hasattr(self, '__plugin_version__'): + return self.__plugin_version__ + else: + return "" + + + @property + def author(self): + """ + Get plugin's author. + """ + if hasattr(self, '__plugin_author__'): + return self.__plugin_author__ + else: + return "" diff -Nru geany-plugins-1.23+dfsg/geanypy/geany/signalmanager.py geany-plugins-1.24+dfsg/geanypy/geany/signalmanager.py --- geany-plugins-1.23+dfsg/geanypy/geany/signalmanager.py 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/geany/signalmanager.py 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,58 @@ +""" +A simple analog of `GeanyObject` in the C API, that is, an object to emit +all signals on. The signals are emitted from the C code in signalmanager.c, +where the Geany types get wrapped in PyObject types. +""" + +import gobject + + +class SignalManager(gobject.GObject): + """ + Manages callback functions for events emitted by Geany's internal GObject. + """ + __gsignals__ = { + 'build-start': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, + ()), + 'document-activate': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, + (gobject.TYPE_PYOBJECT,)), + 'document-before-save': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, + (gobject.TYPE_PYOBJECT,)), + 'document-close': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, + (gobject.TYPE_PYOBJECT,)), + 'document-filetype-set': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, + (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)), + 'document-new': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, + (gobject.TYPE_PYOBJECT,)), + 'document-open': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, + (gobject.TYPE_PYOBJECT,)), + 'document-reload': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, + (gobject.TYPE_PYOBJECT,)), + 'document-save': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, + (gobject.TYPE_PYOBJECT,)), + 'editor-notify': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_BOOLEAN, + (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)), + 'geany-startup-complete': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, + ()), + 'project-close': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, + ()), + 'project-dialog-confirmed': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, + (gobject.TYPE_PYOBJECT,)), + 'project-dialog-open': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, + (gobject.TYPE_PYOBJECT,)), + 'project-dialog-close': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, + (gobject.TYPE_PYOBJECT,)), + 'project-open': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, + (gobject.TYPE_PYOBJECT,)), + 'project-save': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, + (gobject.TYPE_PYOBJECT,)), + 'update-editor-menu': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, + (gobject.TYPE_STRING, gobject.TYPE_INT, + gobject.TYPE_PYOBJECT)), + } # __gsignals__ + + def __init__(self): + self.__gobject_init__() + +gobject.type_register(SignalManager) + diff -Nru geany-plugins-1.23+dfsg/geanypy/m4/ax_python_library.m4 geany-plugins-1.24+dfsg/geanypy/m4/ax_python_library.m4 --- geany-plugins-1.23+dfsg/geanypy/m4/ax_python_library.m4 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/m4/ax_python_library.m4 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,26 @@ +# Copyright (c) 2011 Colomban Wendling +# +# AX_PYTHON_LIBRARY([action-if-found], [action-if-not-found]) +# +# Tries to locate Python DSO path. It requires $PYTHON to be set + +AC_DEFUN([AX_PYTHON_LIBRARY],[ + AC_REQUIRE([AX_PYTHON_DEVEL]) + + AC_MSG_CHECKING([for Python DSO location]) + + ax_python_library=`cat << EOD | $PYTHON - 2>/dev/null +from distutils.sysconfig import get_config_vars +from os.path import join as path_join + +cvars = get_config_vars() +# support multiarch-enabled distributions like Ubuntu +if not 'MULTIARCH' in cvars.keys(): + cvars[['MULTIARCH']] = '' +print(path_join(cvars[['LIBDIR']], cvars[['MULTIARCH']], cvars[['LDLIBRARY']])) +EOD` + + AC_SUBST([PYTHON_LIBRARY], [$ax_python_library]) + AC_MSG_RESULT([$PYTHON_LIBRARY]) + AS_IF([test -z "$ax_python_library"], [$2], [$1]) +]) diff -Nru geany-plugins-1.23+dfsg/geanypy/Makefile.am geany-plugins-1.24+dfsg/geanypy/Makefile.am --- geany-plugins-1.23+dfsg/geanypy/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/Makefile.am 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,4 @@ +include $(top_srcdir)/build/vars.auxfiles.mk +#ACLOCAL_AMFLAGS += -I geanypy/m4 +SUBDIRS = src geany plugins +plugin = geanypy diff -Nru geany-plugins-1.23+dfsg/geanypy/Makefile.in geany-plugins-1.24+dfsg/geanypy/Makefile.in --- geany-plugins-1.23+dfsg/geanypy/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/Makefile.in 2014-04-13 17:12:44.000000000 +0000 @@ -0,0 +1,826 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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 \ + *\\[\ \ ]*) \ + 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; \ + 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@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog NEWS README +subdir = geanypy +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ + $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ + $(top_srcdir)/build/cppcheck.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ + $(top_srcdir)/build/geanydoc.m4 \ + $(top_srcdir)/build/geanyextrasel.m4 \ + $(top_srcdir)/build/geanygendoc.m4 \ + $(top_srcdir)/build/geanyinsertnum.m4 \ + $(top_srcdir)/build/geanylatex.m4 \ + $(top_srcdir)/build/geanylipsum.m4 \ + $(top_srcdir)/build/geanylua.m4 \ + $(top_srcdir)/build/geanymacro.m4 \ + $(top_srcdir)/build/geanyminiscript.m4 \ + $(top_srcdir)/build/geanynumberedbookmarks.m4 \ + $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ + $(top_srcdir)/build/geanysendmail.m4 \ + $(top_srcdir)/build/geanyvc.m4 \ + $(top_srcdir)/build/geniuspaste.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ + $(top_srcdir)/build/pretty-printer.m4 \ + $(top_srcdir)/build/scope.m4 \ + $(top_srcdir)/build/shiftcolumn.m4 \ + $(top_srcdir)/build/spellcheck.m4 \ + $(top_srcdir)/build/status.m4 \ + $(top_srcdir)/build/tableconvert.m4 \ + $(top_srcdir)/build/treebrowser.m4 \ + $(top_srcdir)/build/unittests.m4 \ + $(top_srcdir)/build/updatechecker.m4 \ + $(top_srcdir)/build/webhelper.m4 \ + $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ + $(top_srcdir)/build/cache/glib-gettext.m4 \ + $(top_srcdir)/build/cache/intltool.m4 \ + $(top_srcdir)/build/cache/libtool.m4 \ + $(top_srcdir)/build/cache/ltoptions.m4 \ + $(top_srcdir)/build/cache/ltsugar.m4 \ + $(top_srcdir)/build/cache/ltversion.m4 \ + $(top_srcdir)/build/cache/lt~obsolete.m4 \ + $(top_srcdir)/build/cache/nls.m4 \ + $(top_srcdir)/build/cache/pkg.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +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_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 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__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__installdirs = "$(DESTDIR)$(plugindocdir)" +DATA = $(dist_plugindoc_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +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) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ +COMMANDER_CFLAGS = @COMMANDER_CFLAGS@ +COMMANDER_LIBS = @COMMANDER_LIBS@ +CPP = @CPP@ +CPPCHECK = @CPPCHECK@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ +DEVHELP_LIBS = @DEVHELP_LIBS@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENCHANT_CFLAGS = @ENCHANT_CFLAGS@ +ENCHANT_LIBS = @ENCHANT_LIBS@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GEANYGENDOC_CFLAGS = @GEANYGENDOC_CFLAGS@ +GEANYGENDOC_LIBS = @GEANYGENDOC_LIBS@ +GEANY_CFLAGS = @GEANY_CFLAGS@ +GEANY_LIBS = @GEANY_LIBS@ +GEANY_VERSION = @GEANY_VERSION@ +GENIUSPASTE_CFLAGS = @GENIUSPASTE_CFLAGS@ +GENIUSPASTE_LIBS = @GENIUSPASTE_LIBS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GPGME_CFLAGS = @GPGME_CFLAGS@ +GPGME_CONFIG = @GPGME_CONFIG@ +GPGME_LIBS = @GPGME_LIBS@ +GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ +GREP = @GREP@ +GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ +GTKSPELL_LIBS = @GTKSPELL_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBMARKDOWN_CFLAGS = @LIBMARKDOWN_CFLAGS@ +LIBMARKDOWN_LIBS = @LIBMARKDOWN_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCALEDIR = @LOCALEDIR@ +LTLIBOBJS = @LTLIBOBJS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_LIBS = @LUA_LIBS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MARKDOWN_CFLAGS = @MARKDOWN_CFLAGS@ +MARKDOWN_LIBS = @MARKDOWN_LIBS@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +MULTITERM_CFLAGS = @MULTITERM_CFLAGS@ +MULTITERM_LIBS = @MULTITERM_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +RST2HTML = @RST2HTML@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +UPDATECHECKER_CFLAGS = @UPDATECHECKER_CFLAGS@ +UPDATECHECKER_LIBS = @UPDATECHECKER_LIBS@ +USE_NLS = @USE_NLS@ +VALAC = @VALAC@ +VERSION = @VERSION@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ +WEBHELPER_CFLAGS = @WEBHELPER_CFLAGS@ +WEBHELPER_LIBS = @WEBHELPER_LIBS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +geanypluginsdir = @geanypluginsdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugindocdir = $(docdir)/$(plugin) +htmldocdir = $(plugindocdir) +plugindatadir = $(pkgdatadir)/$(plugin) +pluginlibdir = $(pkglibdir)/$(plugin) +examplesdir = $(plugindatadir) +dist_plugindoc_DATA = \ + README \ + ChangeLog \ + NEWS \ + COPYING \ + AUTHORS \ + $(AUXFILES) + +EXTRA_DIST = \ + wscript_build \ + wscript_configure + +#ACLOCAL_AMFLAGS += -I geanypy/m4 +SUBDIRS = src geany plugins +plugin = geanypy +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/vars.auxfiles.mk $(top_srcdir)/build/vars.docs.mk $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign geanypy/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign geanypy/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + 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/vars.auxfiles.mk $(top_srcdir)/build/vars.docs.mk: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-dist_plugindocDATA: $(dist_plugindoc_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_plugindoc_DATA)'; test -n "$(plugindocdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindocdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindocdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindocdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindocdir)" || exit $$?; \ + done + +uninstall-dist_plugindocDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_plugindoc_DATA)'; test -n "$(plugindocdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(plugindocdir)'; $(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. +$(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//`; \ + 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; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +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 + +GTAGS: + 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 + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile $(DATA) +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(plugindocdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: install-dist_plugindocDATA + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-dist_plugindocDATA + +.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-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-dist_plugindocDATA 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 \ + uninstall-dist_plugindocDATA + + +# 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. +.NOEXPORT: diff -Nru geany-plugins-1.23+dfsg/geanypy/NEWS geany-plugins-1.24+dfsg/geanypy/NEWS --- geany-plugins-1.23+dfsg/geanypy/NEWS 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/NEWS 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1 @@ +UnNEWSed diff -Nru geany-plugins-1.23+dfsg/geanypy/plugins/console.py geany-plugins-1.24+dfsg/geanypy/plugins/console.py --- geany-plugins-1.23+dfsg/geanypy/plugins/console.py 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/plugins/console.py 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,313 @@ +import os +from ConfigParser import SafeConfigParser +import geany +import geany.console +import gobject +import gtk +import gtk.gdk as gdk +import pango + + +WIDGET_STATES = [ gtk.STATE_NORMAL, gtk.STATE_ACTIVE, gtk.STATE_PRELIGHT, + gtk.STATE_SELECTED, gtk.STATE_INSENSITIVE ] + + +class ConsolePlugin(geany.Plugin): + + __plugin_name__ = "Python Console" + __plugin_description__ = ("Installs a Python console that allows you " + + "to use the Geany API.") + __plugin_version__ = "0.01" + __plugin_author__ = "Matthew Brush " + + _font = "Monospace 9" + _bg = "#FFFFFF" + _fg = "#000000" + _banner = ("Geany Python Console\n You can access the Geany Python " + + "API by importing the `geany' module.\n") + _use_rl_completer = True + + _builder = None + + def __init__(self): + geany.Plugin.__init__(self) + self.load_config() + self.install_console() + + + def cleanup(self): + #self.save_config() + self.on_save_config_timeout() # do it now + self.uninstall_console() + + + def load_config(self): + self.cfg_path = os.path.join(geany.app.configdir, "plugins", "pyconsole.conf") + self.cfg = SafeConfigParser() + self.cfg.read(self.cfg_path) + + + def save_config(self): + gobject.idle_add(self.on_save_config_timeout) + + + def on_save_config_timeout(self, data=None): + self.cfg.write(open(self.cfg_path, 'w')) + return False + + + def install_console(self): + + # load general settings + self.banner = self.banner + self.use_rl_completer = self.use_rl_completer + + self.swin = gtk.ScrolledWindow() + self.swin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_ALWAYS) + self.console = geany.console.Console(banner = self.banner, + use_rlcompleter = self.use_rl_completer) + self.console.connect("populate-popup", self.on_console_populate_popup) + + # apply appearance settings + self.font = self.font + self.bg = self.bg + self.fg = self.fg + + self.swin.add(self.console) + geany.main_widgets.message_window_notebook.append_page(self.swin, + gtk.Label("Python")) + + self.swin.show_all() + self.save_config() + + def uninstall_console(self): + self.swin.destroy() + + + def _get_font(self): + if self.cfg.has_section('appearances'): + if self.cfg.has_option('appearances', 'font'): + return self.cfg.get('appearances', 'font') + return self._font + def _set_font(self, font): + self._font = font + font_desc = pango.FontDescription(font) + self.console.modify_font(font_desc) + if not self.cfg.has_section('appearances'): + self.cfg.add_section('appearances') + self.cfg.set('appearances', 'font', self._font) + self.save_config() + font = property(_get_font, _set_font) + + + def _get_bg(self): + if self.cfg.has_section('appearances'): + if self.cfg.has_option('appearances', 'bg_color'): + return self.cfg.get('appearances', 'bg_color') + return self._bg + def _set_bg(self, bg): + self._bg = bg + color = gdk.color_parse(self._bg) + for state in WIDGET_STATES: + self.console.modify_bg(state, color) + self.console.modify_base(state, color) + if not self.cfg.has_section('appearances'): + self.cfg.add_section('appearances') + self.cfg.set('appearances', 'bg_color', self._bg) + self.save_config() + bg = property(_get_bg, _set_bg) + + + def _get_fg(self): + if self.cfg.has_section('appearances'): + if self.cfg.has_option('appearances', 'fg_color'): + return self.cfg.get('appearances', 'fg_color') + return self._fg + def _set_fg(self, fg): + self._fg = fg + color = gdk.color_parse(self._fg) + for state in WIDGET_STATES: + self.console.modify_fg(state, color) + self.console.modify_text(state, color) + if not self.cfg.has_section('appearances'): + self.cfg.add_section('appearances') + self.cfg.set('appearances', 'fg_color', self._fg) + self.save_config() + fg = property(_get_fg, _set_fg) + + + def _get_banner(self): + if self.cfg.has_section('general'): + if self.cfg.has_option('general', 'banner'): + return self.cfg.get('general', 'banner') + return self._banner + def _set_banner(self, banner): + self._banner = banner + if not self.cfg.has_section('general'): + self.cfg.add_section('general') + self.cfg.set('general', 'banner', self._banner) + self.save_config() + banner = property(_get_banner, _set_banner) + + + def _get_use_rl_completer(self): + if self.cfg.has_section('general'): + if self.cfg.has_option('general', 'use_rl_completer'): + return self.cfg.getboolean('general', 'use_rl_completer') + return self._use_rl_completer + def _set_use_rl_completer(self, use_rl_completer): + self._use_rl_completer = use_rl_completer + if not self.cfg.has_section('general'): + self.cfg.add_section('general') + self.cfg.set('general', 'use_rl_completer', + str(self._use_rl_completer).lower()) + self.save_config() + use_rl_completer = property(_get_use_rl_completer, _set_use_rl_completer) + + + def on_console_populate_popup(self, textview, menu, data=None): + item = gtk.SeparatorMenuItem() + item.show() + menu.append(item) + item = gtk.ImageMenuItem(stock_id=gtk.STOCK_PREFERENCES) + item.show() + menu.append(item) + item.connect("activate", lambda w,d=None: self.show_configure()) + + + def on_banner_changed(self, text_buf, data=None): + self.banner = text_buf.get_text(text_buf.get_start_iter(), text_buf.get_end_iter()) + + def on_use_rl_completer_toggled(self, chk_btn, data=None): + self.use_rl_completer = chk_btn.get_active() + + def on_font_changed(self, font_btn, data=None): + self.font = font_btn.get_font_name() + + def on_fg_color_changed(self, clr_btn, data=None): + self.fg = clr_btn.get_color().to_string() + + def on_bg_color_changed(self, clr_btn, data=None): + self.bg = clr_btn.get_color().to_string() + + + def show_configure(self): + dialog = gtk.Dialog("Configure Python Console", + geany.main_widgets.window, + gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + (gtk.STOCK_CLOSE, gtk.RESPONSE_ACCEPT)) + + dialog.set_has_separator(True) + + content_area = dialog.get_content_area() + content_area.set_border_width(6) + + vbox = gtk.VBox(spacing=6) + vbox.set_border_width(6) + + lbl = gtk.Label() + lbl.set_use_markup(True) + lbl.set_markup("General") + + fra_general = gtk.Frame("") + fra_general.set_shadow_type(gtk.SHADOW_NONE) + fra_general.set_label_widget(lbl) + + al_general = gtk.Alignment(0.0, 0.0, 1.0, 1.0) + al_general.set_padding(0, 0, 12, 0) + fra_general.add(al_general) + + tbl = gtk.Table(3, 2, False) + tbl.set_row_spacings(6) + tbl.set_col_spacings(6) + tbl.set_border_width(6) + + lbl = gtk.Label("Banner:") + lbl.set_alignment(0.0, 0.0) + + tvw = gtk.TextView() + tvw.get_buffer().set_text(self.banner) + tvw.get_buffer().connect("changed", self.on_banner_changed) + + swin = gtk.ScrolledWindow() + swin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) + swin.set_shadow_type(gtk.SHADOW_ETCHED_IN) + swin.add(tvw) + + tbl.attach(lbl, 0, 1, 0, 1, gtk.FILL, gtk.FILL, 0, 0) + tbl.attach(swin, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.EXPAND | gtk.FILL, 0, 0) + + lbl = gtk.Label("") + lbl.set_alignment(0.0, 0.5) + + check = gtk.CheckButton("Use Readline") + if self.use_rl_completer: + check.set_active(True) + check.connect("toggled", self.on_use_rl_completer_toggled) + + tbl.attach(lbl, 0, 1, 1, 2, gtk.FILL, gtk.FILL, 0, 0) + tbl.attach(check, 1, 2, 1, 2, gtk.FILL, gtk.FILL, 0, 0) + + lbl = gtk.Label("") + lbl.set_alignment(0.0, 0.5) + lbl.set_use_markup(True) + lbl.set_markup('' + + 'Note: General settings will be applied when console is reloaded.' + + '') + tbl.attach(lbl, 0, 2, 2, 3, gtk.FILL, gtk.FILL, 0, 0) + + al_general.add(tbl) + + lbl = gtk.Label() + lbl.set_use_markup(True) + lbl.set_markup("Appearances") + + fra_appearances = gtk.Frame("") + fra_appearances.set_shadow_type(gtk.SHADOW_NONE) + fra_appearances.set_label_widget(lbl) + + al_appearances = gtk.Alignment(0.0, 0.0, 1.0, 1.0) + al_appearances.set_padding(0, 0, 12, 0) + fra_appearances.add(al_appearances) + + tbl = gtk.Table(3, 2, False) + tbl.set_row_spacings(6) + tbl.set_col_spacings(6) + tbl.set_border_width(6) + + lbl = gtk.Label("Font:") + lbl.set_alignment(0.0, 0.5) + + btn = gtk.FontButton(self.font) + btn.connect("font-set", self.on_font_changed) + + tbl.attach(lbl, 0, 1, 0, 1, gtk.FILL, gtk.FILL, 0, 0) + tbl.attach(btn, 1, 2, 0, 1, gtk.FILL | gtk.EXPAND, gtk.FILL, 0, 0) + + lbl = gtk.Label("FG Color:") + lbl.set_alignment(0.0, 0.5) + + btn = gtk.ColorButton(gdk.color_parse(self.fg)) + btn.connect("color-set", self.on_fg_color_changed) + + tbl.attach(lbl, 0, 1, 1, 2, gtk.FILL, gtk.FILL, 0, 0) + tbl.attach(btn, 1, 2, 1, 2, gtk.FILL | gtk.EXPAND, gtk.FILL, 0, 0) + + lbl = gtk.Label("BG Color:") + lbl.set_alignment(0.0, 0.5) + + btn = gtk.ColorButton(gdk.color_parse(self.bg)) + btn.connect("color-set", self.on_bg_color_changed) + + tbl.attach(lbl, 0, 1, 2, 3, gtk.FILL, gtk.FILL, 0, 0) + tbl.attach(btn, 1, 2, 2, 3, gtk.FILL | gtk.EXPAND, gtk.FILL, 0, 0) + + al_appearances.add(tbl) + + vbox.pack_start(fra_general, True, True, 0) + vbox.pack_start(fra_appearances, False, True, 0) + content_area.pack_start(vbox, True, True, 0) + content_area.show_all() + + dialog.run() + dialog.destroy() diff -Nru geany-plugins-1.23+dfsg/geanypy/plugins/demo.py geany-plugins-1.24+dfsg/geanypy/plugins/demo.py --- geany-plugins-1.23+dfsg/geanypy/plugins/demo.py 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/plugins/demo.py 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,18 @@ +import geany + + +class DemoPlugin(geany.Plugin): + + __plugin_name__ = "Demo Plugin" + __plugin_version__ = "0.01" + __plugin_description__ = "A Sample plugin" + __plugin_author__ = "Matthew Brush " + + def __init__(self): + geany.Plugin.__init__(self) + print("Demo plugin initializing") + doc = geany.document.new_file() + doc.editor.scintilla.set_text("Hello from the Demo plugin") + + def cleanup(self): + print("Demo plugin cleaning up") diff -Nru geany-plugins-1.23+dfsg/geanypy/plugins/hello.py geany-plugins-1.24+dfsg/geanypy/plugins/hello.py --- geany-plugins-1.23+dfsg/geanypy/plugins/hello.py 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/plugins/hello.py 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,21 @@ +import gtk +import geany + +class HelloWorld(geany.Plugin): + + __plugin_name__ = "HelloWorld" + __plugin_version__ = "1.0" + __plugin_description__ = "Just another tool to say hello world" + __plugin_author__ = "John Doe " + + def __init__(self): + self.menu_item = gtk.MenuItem("Hello World") + self.menu_item.show() + geany.main_widgets.tools_menu.append(self.menu_item) + self.menu_item.connect("activate", self.on_hello_item_clicked) + + def cleanup(self): + self.menu_item.destroy() + + def on_hello_item_clicked(widget, data): + geany.dialogs.show_msgbox("Hello World") diff -Nru geany-plugins-1.23+dfsg/geanypy/plugins/Makefile.am geany-plugins-1.24+dfsg/geanypy/plugins/Makefile.am --- geany-plugins-1.23+dfsg/geanypy/plugins/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/plugins/Makefile.am 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,4 @@ +geanypy_plugins = demo.py hello.py console.py +geanypydir = $(datadir)/geany/geanypy/plugins +geanypy_DATA = $(geanypy_plugins) +EXTRA_DIST = $(geanypy_plugins) diff -Nru geany-plugins-1.23+dfsg/geanypy/plugins/Makefile.in geany-plugins-1.24+dfsg/geanypy/plugins/Makefile.in --- geany-plugins-1.23+dfsg/geanypy/plugins/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/plugins/Makefile.in 2014-04-13 17:12:44.000000000 +0000 @@ -0,0 +1,625 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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 \ + *\\[\ \ ]*) \ + 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; \ + 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@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = geanypy/plugins +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ + $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ + $(top_srcdir)/build/cppcheck.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ + $(top_srcdir)/build/geanydoc.m4 \ + $(top_srcdir)/build/geanyextrasel.m4 \ + $(top_srcdir)/build/geanygendoc.m4 \ + $(top_srcdir)/build/geanyinsertnum.m4 \ + $(top_srcdir)/build/geanylatex.m4 \ + $(top_srcdir)/build/geanylipsum.m4 \ + $(top_srcdir)/build/geanylua.m4 \ + $(top_srcdir)/build/geanymacro.m4 \ + $(top_srcdir)/build/geanyminiscript.m4 \ + $(top_srcdir)/build/geanynumberedbookmarks.m4 \ + $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ + $(top_srcdir)/build/geanysendmail.m4 \ + $(top_srcdir)/build/geanyvc.m4 \ + $(top_srcdir)/build/geniuspaste.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ + $(top_srcdir)/build/pretty-printer.m4 \ + $(top_srcdir)/build/scope.m4 \ + $(top_srcdir)/build/shiftcolumn.m4 \ + $(top_srcdir)/build/spellcheck.m4 \ + $(top_srcdir)/build/status.m4 \ + $(top_srcdir)/build/tableconvert.m4 \ + $(top_srcdir)/build/treebrowser.m4 \ + $(top_srcdir)/build/unittests.m4 \ + $(top_srcdir)/build/updatechecker.m4 \ + $(top_srcdir)/build/webhelper.m4 \ + $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ + $(top_srcdir)/build/cache/glib-gettext.m4 \ + $(top_srcdir)/build/cache/intltool.m4 \ + $(top_srcdir)/build/cache/libtool.m4 \ + $(top_srcdir)/build/cache/ltoptions.m4 \ + $(top_srcdir)/build/cache/ltsugar.m4 \ + $(top_srcdir)/build/cache/ltversion.m4 \ + $(top_srcdir)/build/cache/lt~obsolete.m4 \ + $(top_srcdir)/build/cache/nls.m4 \ + $(top_srcdir)/build/cache/pkg.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +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_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 = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +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__installdirs = "$(DESTDIR)$(geanypydir)" +DATA = $(geanypy_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ +COMMANDER_CFLAGS = @COMMANDER_CFLAGS@ +COMMANDER_LIBS = @COMMANDER_LIBS@ +CPP = @CPP@ +CPPCHECK = @CPPCHECK@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ +DEVHELP_LIBS = @DEVHELP_LIBS@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENCHANT_CFLAGS = @ENCHANT_CFLAGS@ +ENCHANT_LIBS = @ENCHANT_LIBS@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GEANYGENDOC_CFLAGS = @GEANYGENDOC_CFLAGS@ +GEANYGENDOC_LIBS = @GEANYGENDOC_LIBS@ +GEANY_CFLAGS = @GEANY_CFLAGS@ +GEANY_LIBS = @GEANY_LIBS@ +GEANY_VERSION = @GEANY_VERSION@ +GENIUSPASTE_CFLAGS = @GENIUSPASTE_CFLAGS@ +GENIUSPASTE_LIBS = @GENIUSPASTE_LIBS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GPGME_CFLAGS = @GPGME_CFLAGS@ +GPGME_CONFIG = @GPGME_CONFIG@ +GPGME_LIBS = @GPGME_LIBS@ +GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ +GREP = @GREP@ +GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ +GTKSPELL_LIBS = @GTKSPELL_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBMARKDOWN_CFLAGS = @LIBMARKDOWN_CFLAGS@ +LIBMARKDOWN_LIBS = @LIBMARKDOWN_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCALEDIR = @LOCALEDIR@ +LTLIBOBJS = @LTLIBOBJS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_LIBS = @LUA_LIBS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MARKDOWN_CFLAGS = @MARKDOWN_CFLAGS@ +MARKDOWN_LIBS = @MARKDOWN_LIBS@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +MULTITERM_CFLAGS = @MULTITERM_CFLAGS@ +MULTITERM_LIBS = @MULTITERM_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +RST2HTML = @RST2HTML@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +UPDATECHECKER_CFLAGS = @UPDATECHECKER_CFLAGS@ +UPDATECHECKER_LIBS = @UPDATECHECKER_LIBS@ +USE_NLS = @USE_NLS@ +VALAC = @VALAC@ +VERSION = @VERSION@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ +WEBHELPER_CFLAGS = @WEBHELPER_CFLAGS@ +WEBHELPER_LIBS = @WEBHELPER_LIBS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +geanypluginsdir = @geanypluginsdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +geanypy_plugins = demo.py hello.py console.py +geanypydir = $(datadir)/geany/geanypy/plugins +geanypy_DATA = $(geanypy_plugins) +EXTRA_DIST = $(geanypy_plugins) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign geanypy/plugins/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign geanypy/plugins/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-geanypyDATA: $(geanypy_DATA) + @$(NORMAL_INSTALL) + @list='$(geanypy_DATA)'; test -n "$(geanypydir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(geanypydir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(geanypydir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(geanypydir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(geanypydir)" || exit $$?; \ + done + +uninstall-geanypyDATA: + @$(NORMAL_UNINSTALL) + @list='$(geanypy_DATA)'; test -n "$(geanypydir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(geanypydir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(geanypydir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-geanypyDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-geanypyDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic 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-geanypyDATA 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-geanypyDATA + + +# 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. +.NOEXPORT: diff -Nru geany-plugins-1.23+dfsg/geanypy/README geany-plugins-1.24+dfsg/geanypy/README --- geany-plugins-1.23+dfsg/geanypy/README 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/README 2014-04-13 13:33:33.000000000 +0000 @@ -0,0 +1,80 @@ +GeanyPy +======= + +Write Geany plugins in Python! + +Provides most of the standard Geany C API for Python. + +**Please note:** GeanyPy here in geany-plugins is based on the upstream +at https://github.com/codebrainz/geanypy which is still under +development, however it is useful as is. Parts of the existing API +which mirror the Geany C API will probably not change unless the Geany API +changes, however new API may be added. Also documentation is needed, +contributions are welcome. + +How it works +------------ + +In the ``src/`` directory is a normal Geany plugin (``plugin.c``) which loads the +Python interpreter. It then loads some C Python modules (``dialogs.c``, +``documents.c``, etc.) that interface with Geany's C API. After that, it loads +the ``geany`` Python module which is just glue/sugar-coating to make the C +module more "Pythonic". + +To write a plugin, inherit from the ``geany.Plugin`` class and implmenent the +required members (see ``geany/plugin.py`` documentation comments). Then put the +plugin in a searched plugin path. Currently two locations are search for +plugins. The first is ``PREFIX/share/geany/geanypy/plugins`` and the recommended +location is under your personal Geany directory (usually +``~/.config/geany/plugins/geanypy/plugins``). To load or unload plugins, click +the Python Plugin Manager item under the Tools menu which will appear when you +activate GeanyPy through Geany's regular plugin manager. + +When the GeanyPy plugin is loaded, it has an option to add a new tab to +the notebook in the message window area that contains an interactive +Python shell with the ``geany`` module pre-imported. You can tinker +around with API with this console, for example:: + + + import geany + + doc = geany.document.open_file("/some/file/here") + + print(doc.file_name) + print(doc.file_type.display_name) + + geany.dialogs.show_msgbox("Hello World") + + geany.main_widgets.window.set_title("Hello Window") + + def on_document_open(doc): + print("Document '%s' was opened" % doc.file_name) + + geany.signals.connect('document-open', on_document_open) + + +Dependencies +------------ + +To build GeanyPy you need the following dependencies: + +* Python 2.6 or 2.7 and development files. +* Geany 1.24+ and development files +* PyGTK 2.0 and development files + +Running on Windows +------------------ + +Not currently supported for the geany-plugins version, see upstream +https://github.com/codebrainz/geanypy. + +Upstream developed by Matthew Brush. + +Geany-plugins version maintained by elextr@lists.geany.org + +Known Bugs +---------- + +* There is an issue with re-loading GeanyPy twice in the same session. If +you unload the GeanyPy plugin you should restart Geany to avoid a potential +crash. diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-app.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-app.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-app.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-app.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,113 @@ +#include "geanypy.h" + + +typedef struct +{ + PyObject_HEAD + GeanyApp *app; +} App; + + +static void +App_dealloc(App *self) +{ + g_return_if_fail(self != NULL); + self->ob_type->tp_free((PyObject *) self); +} + + +static int +App_init(App *self) +{ + g_return_val_if_fail(self != NULL, -1); + g_return_val_if_fail(geany_data, -1); + self->app = geany_data->app; + return 0; +} + + +static PyObject * +App_get_property(App *self, const gchar *prop_name) +{ + g_return_val_if_fail(self != NULL, NULL); + g_return_val_if_fail(prop_name != NULL, NULL); + + if (!self->app) + { + PyErr_SetString(PyExc_RuntimeError, + "App instance not initialized properly"); + return NULL; + } + + if (g_str_equal(prop_name, "configdir") && self->app->configdir) + return PyString_FromString(self->app->configdir); +#if ENABLE_PRIVATE + else if (g_str_equal(prop_name, "datadir") && self->app->datadir) + return PyString_FromString(self->app->datadir); + else if (g_str_equal(prop_name, "docdir") && self->app->docdir) + return PyString_FromString(self->app->docdir); +#endif + else if (g_str_equal(prop_name, "debug_mode") && self->app->debug_mode) + { + if (self->app->debug_mode) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + else if (g_str_equal(prop_name, "project") && self->app->project) + return (PyObject *) GEANYPY_NEW(Project); + + Py_RETURN_NONE; +} +GEANYPY_PROPS_READONLY(App); + + +static PyGetSetDef App_getseters[] = { + GEANYPY_GETSETDEF(App, "configdir", + "User configuration directory, usually ~/.config/geany. "), +#ifdef ENABLE_PRIVATE + GEANYPY_GETSETDEF(App, "datadir", "Geany's data directory."), + GEANYPY_GETSETDEF(App, "docdir", "Geany's documentation directory."), +#endif + GEANYPY_GETSETDEF(App, "debug_mode", + "True if debug messages should be printed."), + GEANYPY_GETSETDEF(App, "project", + "Currently active project or None if none is open."), + { NULL } +}; + + +static PyTypeObject AppType = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "geany.app.App", /* tp_name */ + sizeof(App), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor) App_dealloc, /* tp_dealloc */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* tp_print - tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + "Wrapper around a GeanyApp structure.", /* tp_doc */ + 0, 0, 0, 0, 0, 0, 0, 0, /* tp_traverse - tp_members */ + App_getseters, /* tp_getset */ + 0, 0, 0, 0, 0, /* tp_base - tp_dictoffset */ + (initproc) App_init, /* tp_init */ + 0, 0, /* tp_alloc - tp_new */ +}; + + +static PyMethodDef AppModule_methods[] = { { NULL } }; + + +PyMODINIT_FUNC initapp(void) +{ + PyObject *m; + + AppType.tp_new = PyType_GenericNew; + if (PyType_Ready(&AppType) < 0) + return; + + m = Py_InitModule3("app", AppModule_methods, "Application information"); + + Py_INCREF(&AppType); + PyModule_AddObject(m, "App", (PyObject *) &AppType); +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-dialogs.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-dialogs.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-dialogs.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-dialogs.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,131 @@ +#include "geanypy.h" + + +static PyObject * +Dialogs_show_input(PyObject *self, PyObject *args, PyObject *kwargs) +{ + const gchar *title=NULL, *label_text=NULL, *default_text=NULL, *result=NULL; + PyObject *py_win_obj = NULL; + PyGObject *py_win_gobj; + GtkWindow *win; + static gchar *kwlist[] = { "title", "parent", "label_text", "default_text", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "|zOzz", kwlist, + &title, &py_win_obj, &label_text, &default_text)) + { + if (title == NULL) + title = ""; + + if (py_win_obj != NULL && py_win_obj != Py_None) + { + py_win_gobj = (PyGObject *) py_win_obj; + win = GTK_WINDOW((GObject *) py_win_gobj->obj); + } + else + win = GTK_WINDOW(geany->main_widgets->window); + + result = dialogs_show_input(title, win, label_text, default_text); + if (result != NULL) + return PyString_FromString(result); + } + + Py_RETURN_NONE; +} + + +static PyObject * +Dialogs_show_input_numeric(PyObject *self, PyObject *args, PyObject *kwargs) +{ + const gchar *title=NULL, *label_text = NULL; + gdouble value = 0.0, min = 0.0, max = 0.0, step = 0.0; + static gchar *kwlist[] = { "title", "label_text", "value", "minimum", + "maximum", "step", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "|zzdddd", kwlist, + &title, &label_text, &value, &min, &max, &step)) + { + if (title == NULL) + title = ""; + + if (label_text == NULL) + label_text = ""; + + if (dialogs_show_input_numeric(title, label_text, &value, min, max, step)) + return PyFloat_FromDouble(value); + } + + Py_RETURN_NONE; +} + + +static PyObject * +Dialogs_show_msgbox(PyObject *self, PyObject *args, PyObject *kwargs) +{ + gchar *text = NULL; + gint msgtype = (gint) GTK_MESSAGE_INFO; + static gchar *kwlist[] = { "text", "msgtype", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s|i", kwlist, &text, &msgtype)) + { + if (text != NULL) + { + dialogs_show_msgbox((GtkMessageType) msgtype, "%s", text); + Py_RETURN_TRUE; + } + } + Py_RETURN_NONE; +} + + +static PyObject * +Dialogs_show_question(PyObject *self, PyObject *args, PyObject *kwargs) +{ + gchar *text = NULL; + static gchar *kwlist[] = { "text", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &text)) + { + if (text != NULL) + { + if (dialogs_show_question("%s", text)) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + } + Py_RETURN_NONE; +} + + +static PyObject * +Dialogs_show_save_as(PyObject *self) +{ + if (dialogs_show_save_as()) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; +} + + +static +PyMethodDef DialogsModule_methods[] = { + { "show_input", (PyCFunction) Dialogs_show_input, METH_KEYWORDS, + "Asks the user for input." }, + { "show_input_numeric", (PyCFunction) Dialogs_show_input_numeric, METH_KEYWORDS, + "Shows an input box to enter a numerical value." }, + { "show_msgbox", (PyCFunction) Dialogs_show_msgbox, METH_KEYWORDS, + "Shows a message box of the specified type. See " + "gtk.MESSAGE_TYPE_* constants."}, + { "show_question", (PyCFunction) Dialogs_show_question, METH_KEYWORDS, + "Shows a question message box with Yes/No buttons." }, + { "show_save_as", (PyCFunction) Dialogs_show_save_as, METH_NOARGS, + "Shows the Save As dialog for the current notebook." }, + { NULL } +}; + + +PyMODINIT_FUNC initdialogs(void) +{ + Py_InitModule3("dialogs", DialogsModule_methods, + "Wrappers around Geany's dialog functions."); +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-document.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-document.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-document.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-document.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,562 @@ +#include "geanypy.h" + + +static void +Document_dealloc(Document *self) +{ + self->ob_type->tp_free((PyObject *) self); +} + + +static int +Document_init(Document *self) +{ + self->doc = NULL; + return 0; +} + + +static PyObject * +Document_get_property(Document *self, const gchar *prop_name) +{ + g_return_val_if_fail(self != NULL, NULL); + g_return_val_if_fail(prop_name != NULL, NULL); + + if (!self->doc) + { + PyErr_SetString(PyExc_RuntimeError, + "Document instance not initialized properly"); + return NULL; + } + + if (!DOC_VALID(self->doc)) + { + PyErr_SetString(PyExc_RuntimeError, "Document is invalid"); + return NULL; + } + + if (g_str_equal(prop_name, "basename_for_display")) + { + PyObject *py_str = NULL; + gchar *res_string; + res_string = document_get_basename_for_display(self->doc, -1); + if (!res_string) + { + PyErr_SetString(PyExc_RuntimeError, + "Geany API failed to return a string"); + Py_RETURN_NONE; + } + py_str = PyString_FromString(res_string); + g_free(res_string); + return py_str; + } + else if (g_str_equal(prop_name, "notebook_page")) + return Py_BuildValue("i", document_get_notebook_page(self->doc)); + else if (g_str_equal(prop_name, "status_color")) + { + const GdkColor *color = document_get_status_color(self->doc); + if (!color) + Py_RETURN_NONE; + return Py_BuildValue("iii", color->red, color->green, color->blue); + } + else if (g_str_equal(prop_name, "editor") && self->doc->editor) + { + Editor *editor; + if (self->doc->editor != NULL) + { + editor = Editor_create_new_from_geany_editor(self->doc->editor); + return (PyObject *) editor; + } + Py_RETURN_NONE; + } + else if (g_str_equal(prop_name, "encoding") && self->doc->encoding) + return PyString_FromString(self->doc->encoding); + else if (g_str_equal(prop_name, "file_name") && self->doc->file_name) + return PyString_FromString(self->doc->file_name); + else if (g_str_equal(prop_name, "file_type") && self->doc->file_type) + return (PyObject *) Filetype_create_new_from_geany_filetype(self->doc->file_type); + else if (g_str_equal(prop_name, "has_bom")) + { + if (self->doc->has_bom) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + else if (g_str_equal(prop_name, "has_tags")) + { + if (self->doc->has_tags) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + else if (g_str_equal(prop_name, "index")) + return Py_BuildValue("i", self->doc->index); + else if (g_str_equal(prop_name, "is_valid")) + { + if (self->doc->is_valid) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + else if (g_str_equal(prop_name, "readonly")) + { + if (self->doc->readonly) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + else if (g_str_equal(prop_name, "real_path")) + { + if (self->doc->real_path) + return PyString_FromString(self->doc->real_path); + Py_RETURN_NONE; + } + else if (g_str_equal(prop_name, "text_changed")) + { + if (self->doc->changed) + Py_RETURN_NONE; + else + Py_RETURN_NONE; + } + + Py_RETURN_NONE; +} + + +static int +Document_set_property(Document *self, PyObject *value, const gchar *prop_name) +{ + g_return_val_if_fail(self != NULL, -1); + g_return_val_if_fail(value != NULL, -1); + g_return_val_if_fail(prop_name != NULL, -1); + + if (!self->doc) + { + PyErr_SetString(PyExc_RuntimeError, + "Document instance not initialized properly"); + return -1; + } + + if (g_str_equal(prop_name, "encoding")) + { + gchar *encoding = PyString_AsString(value); + if (encoding) + { + document_set_encoding(self->doc, encoding); + return 0; + } + } + else if (g_str_equal(prop_name, "filetype")) + { + Filetype *filetype = (Filetype *) value; + if (filetype->ft) + { + document_set_filetype(self->doc, filetype->ft); + return 0; + } + } + else if (g_str_equal(prop_name, "text_changed")) + { + long v = PyInt_AsLong(value); + if (v == -1 && PyErr_Occurred()) + { + PyErr_Print(); + return -1; + } + document_set_text_changed(self->doc, (gboolean) v); + return 0; + } + + PyErr_SetString(PyExc_AttributeError, "can't set property"); + return -1; +} + + +static PyObject* +Document_close(Document *self) +{ + if (document_close(self->doc)) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; +} + + +static PyObject* +Document_reload_file(Document *self, PyObject *args, PyObject *kwargs) +{ + gchar *forced_enc = NULL; + static gchar *kwlist[] = { "forced_enc", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "|z", kwlist, &forced_enc)) + { + if (document_reload_file(self->doc, forced_enc)) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + + Py_RETURN_NONE; +} + + +static PyObject* +Document_rename_file(Document *self, PyObject *args, PyObject *kwargs) +{ + gchar *new_fn = NULL; + static gchar *kwlist[] = { "new_filename", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &new_fn)) + { + if (new_fn != NULL) + document_rename_file(self->doc, new_fn); + } + + if (DOC_VALID(self->doc) && self->doc->file_name == new_fn) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + + Py_RETURN_NONE; +} + + +static PyObject* +Document_save_file(Document *self, PyObject *args, PyObject *kwargs) +{ + gboolean result; + gint force = 0; + static gchar *kwlist[] = { "force", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "|i", kwlist, &force)) + { + result = document_save_file(self->doc, (gboolean) force); + if (result) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + Py_RETURN_NONE; +} + + +static PyObject* +Document_save_file_as(Document *self, PyObject *args, PyObject *kwargs) +{ + gboolean result; + gchar *filename = NULL; + static gchar *kwlist[] = { "new_filename", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &filename)) + { + if (filename != NULL) + { + result = document_save_file_as(self->doc, filename); + if (result) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + } + Py_RETURN_NONE; +} + + +static PyMethodDef Document_methods[] = { + { "close", (PyCFunction)Document_close, METH_NOARGS, + "Closes the document." }, + { "reload_file", (PyCFunction)Document_reload_file, METH_KEYWORDS, + "Reloads the document with the specified file encoding or None " + "to auto-detect the file encoding." }, + { "rename_file", (PyCFunction)Document_rename_file, METH_KEYWORDS, + "Renames the document's file." }, + { "save_file", (PyCFunction)Document_save_file, METH_KEYWORDS, + "Saves the document's file." }, + { "save_file_as", (PyCFunction)Document_save_file_as, METH_KEYWORDS, + "Saves the document with a new filename, detecting the filetype." }, + { NULL } +}; + + +static PyGetSetDef Document_getseters[] = { + GEANYPY_GETSETDEF(Document, "editor", + "The editor associated with the document."), + GEANYPY_GETSETDEF(Document, "encoding", + "The encoding of the document."), + GEANYPY_GETSETDEF(Document, "file_name", + "The document's filename."), + GEANYPY_GETSETDEF(Document, "file_type", + "The filetype for this document."), + GEANYPY_GETSETDEF(Document, "has_bom", + "Internally used flag to indicate whether the file of this document " + "has a byte-order-mark."), + GEANYPY_GETSETDEF(Document, "has_tags", + "Whether this document supports source code symbols (tags) to " + "show in the sidebar."), + GEANYPY_GETSETDEF(Document, "index", + "Index of the document."), + GEANYPY_GETSETDEF(Document, "is_valid", + "General flag to represent this document is active and all properties " + "are set correctly."), + GEANYPY_GETSETDEF(Document, "readonly", + "Whether this document is read-only."), + GEANYPY_GETSETDEF(Document, "real_path", + "The link-dereferenced filename of the document."), + GEANYPY_GETSETDEF(Document, "basename_for_display", + "Returns the basename of the document's file."), + GEANYPY_GETSETDEF(Document, "notebook_page", + "Gets the notebook page index for the document."), + GEANYPY_GETSETDEF(Document, "status_color", + "Gets the status color of the document or None for default."), + GEANYPY_GETSETDEF(Document, "text_changed", + "Whether the document has been changed since it was last saved."), + { NULL }, +}; + + + +static PyTypeObject DocumentType = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "geany.document.Document", /* tp_name */ + sizeof(Document), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor) Document_dealloc, /* tp_dealloc */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* tp_print - tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + "Wrapper around a GeanyDocument structure.",/* tp_doc */ + 0, 0, 0, 0, 0, 0, /* tp_traverse - tp_iternext */ + Document_methods, /* tp_methods */ + 0, /* tp_members */ + Document_getseters, /* tp_getset */ + 0, 0, 0, 0, 0, /* tp_base - tp_dictoffset */ + (initproc) Document_init, /* tp_init */ + 0, 0, /* tp_alloc - tp_new */ + +}; + + +static PyObject* +Document_find_by_filename(PyObject *self, PyObject *args, PyObject *kwargs) +{ + gchar *fn; + GeanyDocument *doc; + static gchar *kwlist[] = { "filename", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &fn)) + { + doc = document_find_by_filename(fn); + if (DOC_VALID(doc)) + return (PyObject *) Document_create_new_from_geany_document(doc); + } + Py_RETURN_NONE; +} + + +static PyObject* +Document_find_by_real_path(PyObject *self, PyObject *args, PyObject *kwargs) +{ + gchar *fn; + GeanyDocument *doc; + static gchar *kwlist[] = { "real_path", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &fn)) + { + doc = document_find_by_real_path(fn); + if (DOC_VALID(doc)) + return (PyObject *) Document_create_new_from_geany_document(doc); + } + Py_RETURN_NONE; +} + + +static PyObject* +Document_get_current(PyObject *self) +{ + GeanyDocument *doc; + + doc = document_get_current(); + if (DOC_VALID(doc)) + return (PyObject *) Document_create_new_from_geany_document(doc); + Py_RETURN_NONE; +} + + +static PyObject* +Document_get_from_page(PyObject *self, PyObject *args, PyObject *kwargs) +{ + gint page_num; + GeanyDocument *doc; + static gchar *kwlist[] = { "page_num", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &page_num)) + { + doc = document_get_from_page(page_num); + if (DOC_VALID(doc)) + return (PyObject *) Document_create_new_from_geany_document(doc); + } + Py_RETURN_NONE; +} + + +static PyObject* +Document_get_from_index(PyObject *self, PyObject *args, PyObject *kwargs) +{ + gint idx; + GeanyDocument *doc; + static gchar *kwlist[] = { "index", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &idx)) + { + doc = document_index(idx); + if (DOC_VALID(doc)) + return (PyObject *) Document_create_new_from_geany_document(doc); + } + Py_RETURN_NONE; +} + + +static PyObject* +Document_new_file(PyObject *self, PyObject *args, PyObject *kwargs) +{ + gchar *filename = NULL, *initial_text = NULL; + Filetype *filetype = NULL; + PyObject *py_ft = NULL; + GeanyDocument *doc; + GeanyFiletype *ft = NULL; + static gchar *kwlist[] = { "filename", "filetype", "initial_text", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "|zOz", kwlist, + &filename, &py_ft, &initial_text)) + { + if (py_ft != NULL && py_ft != Py_None) + { + filetype = (Filetype *) py_ft; + if (filetype->ft != NULL) + ft = filetype->ft; + } + doc = document_new_file(filename, ft, initial_text); + if (DOC_VALID(doc)) + return (PyObject *) Document_create_new_from_geany_document(doc); + } + Py_RETURN_NONE; +} + + +static PyObject* +Document_open_file(PyObject *self, PyObject *args, PyObject *kwargs) +{ + gint read_only = 0; + gchar *filename = NULL, *forced_encoding = NULL; + GeanyDocument *doc; + GeanyFiletype *ft = NULL; + Filetype *filetype = NULL; + PyObject *py_ft = NULL; + static gchar *kwlist[] = { "filename", "read_only", "filetype", + "forced_enc", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s|iOz", kwlist, &filename, + &read_only, &py_ft, &forced_encoding)) + { + if (py_ft != NULL && py_ft != Py_None) + { + filetype = (Filetype *) py_ft; + if (filetype->ft != NULL) + ft = filetype->ft; + } + doc = document_open_file(filename, read_only, ft, forced_encoding); + if (DOC_VALID(doc)) + return (PyObject *) Document_create_new_from_geany_document(doc); + } + Py_RETURN_NONE; +} + + +static PyObject* +Document_remove_page(PyObject *self, PyObject *args, PyObject *kwargs) +{ + guint page_num; + static gchar *kwlist[] = { "page_num", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &page_num)) + { + if (document_remove_page(page_num)) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + Py_RETURN_NONE; +} + + +static PyObject * +Document_get_documents_list(PyObject *module) +{ + guint i; + GeanyDocument *doc; + PyObject *list; + + list = PyList_New(0); + + for (i = 0; i < geany_data->documents_array->len; i++) + { + doc = g_ptr_array_index(geany_data->documents_array, i); + if (DOC_VALID(doc)) + { + PyList_Append(list, + (PyObject *) Document_create_new_from_geany_document(doc)); + } + } + + return list; +} + + +static +PyMethodDef DocumentModule_methods[] = { + { "find_by_filename", (PyCFunction) Document_find_by_filename, METH_KEYWORDS, + "Finds a document with the given filename." }, + { "find_by_real_path", (PyCFunction) Document_find_by_real_path, METH_KEYWORDS, + "Finds a document whose real path matches the given filename." }, + { "get_current", (PyCFunction) Document_get_current, METH_NOARGS, + "Finds the current document."}, + { "get_from_page", (PyCFunction) Document_get_from_page, METH_KEYWORDS, + "Finds the document for the given notebook page." }, + { "index", (PyCFunction) Document_get_from_index, METH_KEYWORDS, + "Finds the document with the given index." }, + { "new_file", (PyCFunction) Document_new_file, METH_KEYWORDS, + "Creates a new document." }, + { "open_file", (PyCFunction) Document_open_file, METH_KEYWORDS, + "Opens a new document specified by the given filename." }, + { "remove_page", (PyCFunction) Document_remove_page, METH_KEYWORDS, + "Removes the given notebook tab page and clears all related " + "information in the documents list." }, + { "get_documents_list", (PyCFunction) Document_get_documents_list, METH_NOARGS, + "Returns a sequence of valid documents." }, + { NULL } +}; + + +PyMODINIT_FUNC initdocument(void) +{ + PyObject *m; + + DocumentType.tp_new = PyType_GenericNew; + if (PyType_Ready(&DocumentType) < 0) + return; + + m = Py_InitModule3("document", DocumentModule_methods, + "Document information and management."); + + Py_INCREF(&DocumentType); + PyModule_AddObject(m, "Document", (PyObject *)&DocumentType); +} + + +Document *Document_create_new_from_geany_document(GeanyDocument *doc) +{ + Document *self; + self = (Document *) PyObject_CallObject((PyObject *) &DocumentType, NULL); + self->doc = doc; + return self; +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-document.h geany-plugins-1.24+dfsg/geanypy/src/geanypy-document.h --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-document.h 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-document.h 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,12 @@ +#ifndef GEANYPY_DOCUMENT_H__ +#define GEANYPY_DOCUMENT_H__ + +typedef struct +{ + PyObject_HEAD + GeanyDocument *doc; +} Document; + +Document *Document_create_new_from_geany_document(GeanyDocument *doc); + +#endif /* GEANYPY_DOCUMENT_H__ */ diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-editor.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-editor.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-editor.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-editor.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,466 @@ +#include "geanypy.h" + + +static void +Editor_dealloc(Editor *self) +{ + self->ob_type->tp_free((PyObject *) self); +} + + +static int +Editor_init(Editor *self) +{ + self->editor = NULL; + return 0; +} + + +static PyObject * +Editor_get_property(Editor *self, const gchar *prop_name) +{ + g_return_val_if_fail(self != NULL, NULL); + g_return_val_if_fail(prop_name != NULL, NULL); + + if (!self->editor) + { + PyErr_SetString(PyExc_RuntimeError, + "Editor instance not initialized properly"); + return NULL; + } + + if (g_str_equal(prop_name, "eol_char")) + return PyString_FromString(editor_get_eol_char(self->editor)); + else if (g_str_equal(prop_name, "eol_char_name")) + return PyString_FromString(editor_get_eol_char_name(self->editor)); + else if (g_str_equal(prop_name, "indent_prefs")) + { + const GeanyIndentPrefs *indent_prefs; + IndentPrefs *py_prefs; + indent_prefs = editor_get_indent_prefs(self->editor); + if (indent_prefs) + { + py_prefs = IndentPrefs_create_new_from_geany_indent_prefs( + (GeanyIndentPrefs *) indent_prefs); + return (PyObject *) py_prefs; + } + Py_RETURN_NONE; + } + else if (g_str_equal(prop_name, "auto_indent")) + { + if (self->editor->auto_indent) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + else if (g_str_equal(prop_name, "document")) + { + PyObject *py_doc; + py_doc = (PyObject *) Document_create_new_from_geany_document( + self->editor->document); + if (py_doc && py_doc != Py_None) + Py_RETURN_NONE; + return py_doc; + } + else if (g_str_equal(prop_name, "line_breaking")) + { + if (self->editor->line_breaking) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + else if (g_str_equal(prop_name, "line_wrapping")) + { + if (self->editor->line_wrapping) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + else if (g_str_equal(prop_name, "scintilla")) + { + Scintilla *sci; + sci = Scintilla_create_new_from_scintilla(self->editor->sci); + if (!sci) + Py_RETURN_NONE; + return (PyObject *) sci; + } + else if (g_str_equal(prop_name, "scroll_percent")) + return PyFloat_FromDouble((gdouble) self->editor->scroll_percent); + + PyErr_SetString(PyExc_AttributeError, "can't get property"); + Py_RETURN_NONE; +} + + +static int +Editor_set_property(Editor *self, PyObject *value, const gchar *prop_name) +{ + g_return_val_if_fail(self != NULL, -1); + g_return_val_if_fail(value != NULL, -1); + g_return_val_if_fail(prop_name != NULL, -1); + + if (!self->editor) + { + PyErr_SetString(PyExc_RuntimeError, + "Editor instance not initialized properly"); + return -1; + } + + if (g_str_equal(prop_name, "indent_type")) + { + long indent_type = PyInt_AsLong(value); + if (indent_type == -1 && PyErr_Occurred()) + { + PyErr_Print(); + return -1; + } + editor_set_indent_type(self->editor, (GeanyIndentType) indent_type); + return 0; + } + + PyErr_SetString(PyExc_AttributeError, "can't set property"); + return -1; +} + + +static PyObject * +Editor_create_widget(Editor *self) +{ + ScintillaObject *sci; + PyObject *pysci; + + if (self->editor == NULL) + Py_RETURN_NONE; + + sci = editor_create_widget(self->editor); + if (!sci) + Py_RETURN_NONE; + + pysci = pygobject_new(G_OBJECT(sci)); + if (!pysci) + { + gtk_widget_destroy(GTK_WIDGET(sci)); + Py_RETURN_NONE; + } + + return pysci; +} + + +static PyObject * +Editor_find_snippet(Editor *self, PyObject *args, PyObject *kwargs) +{ + gchar *name; + const gchar *snippet; + static gchar *kwlist[] = { "snippet_name", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &name)) + { + if (name != NULL) + { + snippet = editor_find_snippet(self->editor, name); + if (snippet != NULL) + return Py_BuildValue("s", snippet); + } + } + Py_RETURN_NONE; +} + + +static PyObject * +Editor_get_word_at_position(Editor *self, PyObject *args, PyObject *kwargs) +{ + gint pos = -1; + gchar *wordchars = NULL, *word = NULL; + PyObject *py_word; + static gchar *kwlist[] = { "pos", "wordchars", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "|iz", kwlist, &pos, &wordchars)) + { + word = editor_get_word_at_pos(self->editor, pos, wordchars); + if (word != NULL) + { + py_word = Py_BuildValue("s", word); + g_free(word); + return py_word; + } + } + + Py_RETURN_NONE; +} + + +static PyObject * +Editor_goto_pos(Editor *self, PyObject *args, PyObject *kwargs) +{ + gint pos, mark = FALSE, result; + static gchar *kwlist[] = { "pos", "mark", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "i|i", kwlist, &pos, &mark)) + { + result = editor_goto_pos(self->editor, pos, mark); + if (result) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + Py_RETURN_NONE; +} + + +static PyObject * +Editor_indicator_clear(Editor *self, PyObject *args, PyObject *kwargs) +{ + gint indic; + static gchar *kwlist[] = { "indic", NULL }; + if (PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &indic)) + editor_indicator_clear(self->editor, indic); + Py_RETURN_NONE; +} + + +static PyObject * +Editor_indicator_set_on_line(Editor *self, PyObject *args, PyObject *kwargs) +{ + gint indic, line_num; + static gchar *kwlist[] = { "indic", "line", NULL }; + if (PyArg_ParseTupleAndKeywords(args, kwargs, "ii", kwlist, &indic, &line_num)) + editor_indicator_set_on_line(self->editor, indic, line_num); + Py_RETURN_NONE; +} + + +static PyObject * +Editor_indicator_set_on_range(Editor *self, PyObject *args, PyObject *kwargs) +{ + gint indic, start, end; + static gchar *kwlist[] = { "indic", "start", "end", NULL }; + if (PyArg_ParseTupleAndKeywords(args, kwargs, "iii", kwlist, &indic, &start, &end)) + editor_indicator_set_on_range(self->editor, indic, start, end); + Py_RETURN_NONE; +} + + +static PyObject * +Editor_insert_snippet(Editor *self, PyObject *args, PyObject *kwargs) +{ + gint pos = 0; + gchar *snippet = NULL; + static gchar *kwlist[] = { "pos", "snippet", NULL }; + if (PyArg_ParseTupleAndKeywords(args, kwargs, "is", kwlist, &pos, &snippet)) + editor_insert_snippet(self->editor, pos, snippet); + Py_RETURN_NONE; +} + + +static PyObject * +Editor_insert_text_block(Editor *self, PyObject *args, PyObject *kwargs) +{ + gchar *text = NULL; + gint insert_pos, cursor_index = -1, newline_indent_size = -1; + gint replace_newlines = 0; + static gchar *kwlist[] = { "text", "insert_pos", "cursor_index", + "newline_indent_size", "replace_newlines", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "si|iii", kwlist, &text, + &insert_pos, &cursor_index, &newline_indent_size, &replace_newlines)) + { + editor_insert_text_block(self->editor, text, insert_pos, cursor_index, + newline_indent_size, (gboolean) replace_newlines); + } + + Py_RETURN_NONE; +} + + +static PyMethodDef Editor_methods[] = { + { "create_widget", (PyCFunction) Editor_create_widget, METH_NOARGS, + "Creates a new Scintilla widget based on the settings for " + "editor." }, + { "find_snippet", (PyCFunction) Editor_find_snippet, METH_KEYWORDS, + "Get snippet by name." }, + { "get_word_at_position", (PyCFunction) Editor_get_word_at_position, METH_KEYWORDS, + "Finds the word at the position specified." }, + { "goto_pos", (PyCFunction) Editor_goto_pos, METH_KEYWORDS, + "Moves to position, switching to the current document if " + "necessary, setting a marker if mark is set." }, + { "indicator_clear", (PyCFunction) Editor_indicator_clear, METH_KEYWORDS, + "Deletes all currently set indicators matching the specified " + "indicator in the editor." }, + { "indicator_set_on_line", (PyCFunction) Editor_indicator_set_on_line, METH_KEYWORDS, + "Sets an indicator on the specified line." }, + { "indicator_set_on_range", (PyCFunction) Editor_indicator_set_on_range, METH_KEYWORDS, + "Sets an indicator on the range specified." }, + { "insert_snippet", (PyCFunction) Editor_insert_snippet, METH_KEYWORDS, + "Replces all special sequences in snippet and inserts it at " + "the specified position." }, + { "insert_text_block", (PyCFunction) Editor_insert_text_block, METH_KEYWORDS, + "Inserts text, replacing tab chars and newline chars accordingly " + "for the document." }, + { NULL } +}; + + +static PyGetSetDef Editor_getseters[] = { + GEANYPY_GETSETDEF(Editor, "eol_char", + "The endo of line character(s)."), + GEANYPY_GETSETDEF(Editor, "eol_char_name", + "The localized name (for displaying) of the used end of line " + "characters in the editor."), + GEANYPY_GETSETDEF(Editor, "indent_prefs", + "Editor's indentation preferences."), + GEANYPY_GETSETDEF(Editor, "indent_type", + "Sets the indent type for the editor."), + GEANYPY_GETSETDEF(Editor, "auto_indent", + "True if auto-indentation is enabled."), + GEANYPY_GETSETDEF(Editor, "document", + "The document associated with the editor."), + GEANYPY_GETSETDEF(Editor, "line_breaking", + "Whether to split long lines as you type."), + GEANYPY_GETSETDEF(Editor, "line_wrapping", + "True if line wrapping is enabled."), + GEANYPY_GETSETDEF(Editor, "scintilla", + "The Scintilla widget used by the editor."), + GEANYPY_GETSETDEF(Editor, "scroll_percent", + "Percentage to scroll view by on paint, if positive."), + { NULL }, +}; + + +static PyTypeObject EditorType = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "geany.editor.Editor", /* tp_name */ + sizeof(Editor), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor)Editor_dealloc, /* tp_dealloc */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* tp_print - tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + "Wrapper around a GeanyEditor structure.", /* tp_doc */ + 0, 0, 0, 0, 0, 0, /* tp_traverse - tp_iternext */ + Editor_methods, /* tp_methods */ + 0, /* tp_members */ + Editor_getseters, /* tp_getset */ + 0, 0, 0, 0, 0, /* tp_base - tp_dictoffset */ + (initproc)Editor_init, /* tp_init */ + 0, 0, /* tp_alloc - tp_new */ + +}; + + +static PyObject * +Editor__find_snippet(PyObject *module, PyObject *args, PyObject *kwargs) +{ + gchar *name; + const gchar *snippet; + static gchar *kwlist[] = { "snippet_name", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &name)) + { + if (name != NULL) + { + snippet = editor_find_snippet(NULL, name); + if (snippet != NULL) + return Py_BuildValue("s", snippet); + } + } + Py_RETURN_NONE; +} + + +static PyObject * +Editor_get_default_eol_char(PyObject *module) +{ + const gchar *eol_char = editor_get_eol_char(NULL); + if (eol_char != NULL) + return Py_BuildValue("s", eol_char); + Py_RETURN_NONE; +} + + +static PyObject * +Editor_get_default_eol_char_name(PyObject *module) +{ + const gchar *eol_char_name = editor_get_eol_char_name(NULL); + if (eol_char_name != NULL) + return Py_BuildValue("s", eol_char_name); + Py_RETURN_NONE; +} + + +static PyObject * +Editor_get_default_indent_prefs(PyObject *module) +{ + const GeanyIndentPrefs *indent_prefs; + IndentPrefs *py_prefs; + indent_prefs = editor_get_indent_prefs(NULL); + if (indent_prefs != NULL) + { + py_prefs = IndentPrefs_create_new_from_geany_indent_prefs((GeanyIndentPrefs *)indent_prefs); + return (PyObject *) py_prefs; + } + Py_RETURN_NONE; +} + + +static +PyMethodDef EditorModule_methods[] = { + { "find_snippet", (PyCFunction) Editor__find_snippet, METH_VARARGS, + "Gets a snippet by name from the default set." }, + { "get_default_eol_char", (PyCFunction) Editor_get_default_eol_char, METH_NOARGS, + "The default eol char." }, + { "get_default_eol_char_name", (PyCFunction) Editor_get_default_eol_char_name, METH_NOARGS, + "Retrieves the localized name (for displaying) of the default end " + "of line characters." }, + { "get_default_indent_prefs", (PyCFunction) Editor_get_default_indent_prefs, METH_NOARGS, + "Gets the default indentation preferences." }, + { NULL } +}; + + +PyMODINIT_FUNC initeditor(void) +{ + PyObject *m; + + EditorType.tp_new = PyType_GenericNew; + if (PyType_Ready(&EditorType) < 0) + return; + + IndentPrefsType.tp_new = PyType_GenericNew; + if (PyType_Ready(&IndentPrefsType) < 0) + return; + + m = Py_InitModule3("editor", EditorModule_methods, + "Editor information and management."); + + Py_INCREF(&EditorType); + PyModule_AddObject(m, "Editor", (PyObject *)&EditorType); + + Py_INCREF(&IndentPrefsType); + PyModule_AddObject(m, "IndentPrefs", (PyObject *)&IndentPrefsType); + + PyModule_AddIntConstant(m, "INDENT_TYPE_SPACES", + (glong) GEANY_INDENT_TYPE_SPACES); + PyModule_AddIntConstant(m, "INDENT_TYPE_TABS", + (glong) GEANY_INDENT_TYPE_TABS); + PyModule_AddIntConstant(m, "INDENT_TYPE_BOTH", + (glong) GEANY_INDENT_TYPE_BOTH); + PyModule_AddIntConstant(m, "INDICATOR_ERROR", + (glong) GEANY_INDICATOR_ERROR); + PyModule_AddIntConstant(m, "INDICATOR_SEARCH", + (glong) GEANY_INDICATOR_SEARCH); + PyModule_AddStringConstant(m, "WORDCHARS", GEANY_WORDCHARS); + + PyModule_AddIntConstant(m, "INDENT_TYPE_SPACES", (glong) GEANY_INDENT_TYPE_SPACES); + PyModule_AddIntConstant(m, "INDENT_TYPE_TABS", (glong) GEANY_INDENT_TYPE_TABS); + PyModule_AddIntConstant(m, "INDENT_TYPE_BOTH", (glong) GEANY_INDENT_TYPE_BOTH); +} + + +Editor *Editor_create_new_from_geany_editor(GeanyEditor *editor) +{ + Editor *self; + self = (Editor *) PyObject_CallObject((PyObject *) &EditorType, NULL); + self->editor = editor; + return self; +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-editor.h geany-plugins-1.24+dfsg/geanypy/src/geanypy-editor.h --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-editor.h 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-editor.h 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,21 @@ +#ifndef GEANYPY_EDITOR_H__ +#define GEANYPY_EDITOR_H__ + +extern PyTypeObject IndentPrefsType; + +typedef struct +{ + PyObject_HEAD + GeanyEditor *editor; +} Editor; + +typedef struct +{ + PyObject_HEAD + GeanyIndentPrefs *indent_prefs; +} IndentPrefs; + +Editor *Editor_create_new_from_geany_editor(GeanyEditor *editor); +IndentPrefs *IndentPrefs_create_new_from_geany_indent_prefs(GeanyIndentPrefs *indent_prefs); + +#endif /* GEANYPY_EDITOR_H__ */ diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-encoding.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-encoding.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-encoding.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-encoding.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,310 @@ +#include "geanypy.h" + + +static void +Encoding_dealloc(Encoding *self) +{ + g_return_if_fail(self != NULL); + self->ob_type->tp_free((PyObject *) self); +} + + +static int +Encoding_init(Encoding *self) +{ + g_return_val_if_fail(self != NULL, -1); + self->encoding = NULL; + return 0; +} + + +static PyObject * +Encoding_get_property(Encoding *self, const gchar *prop_name) +{ + g_return_val_if_fail(self != NULL, NULL); + g_return_val_if_fail(prop_name != NULL, NULL); + + if (!self->encoding) + { + PyErr_SetString(PyExc_RuntimeError, + "Encoding instance not initialized properly"); + return NULL; + } + + if (g_str_equal(prop_name, "charset") && self->encoding->charset) + return PyString_FromString(self->encoding->charset); + else if (g_str_equal(prop_name, "group")) + return PyInt_FromLong((glong) self->encoding->group); + else if (g_str_equal(prop_name, "idx")) + return PyInt_FromLong((glong) self->encoding->idx); + else if (g_str_equal(prop_name, "name") && self->encoding->name) + return PyString_FromString(self->encoding->name); + else if (g_str_equal(prop_name, "order")) + return PyInt_FromLong((glong) self->encoding->order); + + Py_RETURN_NONE; +} +GEANYPY_PROPS_READONLY(Encoding); + + +static PyGetSetDef Encoding_getseters[] = { + GEANYPY_GETSETDEF(Encoding, "charset", + "String representation of the encoding, ex. 'ISO-8859-3'."), + GEANYPY_GETSETDEF(Encoding, "group", + "Internally used member for grouping (see encoding.GROUP_* constants)."), + GEANYPY_GETSETDEF(Encoding, "idx", + "The index of the encoding, (see encoding.* constants, not encoding.GROUP_*)."), + GEANYPY_GETSETDEF(Encoding, "name", + "Translatable and descriptive name of the encoding, ex 'South European'."), + GEANYPY_GETSETDEF(Encoding, "order", + "Internally used member for grouping."), + { NULL } +}; + + +PyTypeObject EncodingType = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "geany.encoding.Encoding", /* tp_name */ + sizeof(Encoding), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor) Encoding_dealloc, /* tp_dealloc */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* tp_print - tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + "Wrapper around a GeanyEncoding structure.", /* tp_doc */ + 0, 0, 0, 0, 0, 0, 0, 0, /* tp_traverse - tp_members */ + Encoding_getseters, /* tp_getset */ + 0, 0, 0, 0, 0, /* tp_base - tp_dictoffset */ + (initproc) Encoding_init, /* tp_init */ + 0, 0, /* tp_alloc - tp_new */ +}; + + +Encoding *Encoding_create_new_from_geany_encoding(GeanyEncoding *enc) +{ + Encoding *self; + self = (Encoding *) PyObject_CallObject((PyObject *) &EncodingType, NULL); + self->encoding = enc; + return self; +} + + +static PyObject * +Encodings_convert_to_utf8(PyObject *module, PyObject *args, PyObject *kwargs) +{ + gchar *buffer = NULL, *used_encoding = NULL, *new_buffer = NULL; + gssize size = -1; /* bug alert: this is gsize in Geany for some reason */ + PyObject *result; + static gchar *kwlist[] = { "buffer", "size", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s|l", kwlist, &buffer, &size)) + { + new_buffer = encodings_convert_to_utf8(buffer, size, &used_encoding); + if (new_buffer != NULL) + { + result = Py_BuildValue("ss", new_buffer, used_encoding); + g_free(new_buffer); + g_free(used_encoding); + return result; + } + } + + Py_RETURN_NONE; +} + + +static PyObject * +Encodings_convert_to_utf8_from_charset(PyObject *module, PyObject *args, PyObject *kwargs) +{ + gchar *buffer = NULL, *charset = NULL, *new_buffer = NULL; + gssize size = -1; + gint fast = 0; + PyObject *result; + static gchar *kwlist[] = { "buffer", "size", "charset", "fast", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "ss|li", kwlist, &buffer, + &charset, &size, &fast)) + { + new_buffer = encodings_convert_to_utf8_from_charset(buffer, size, charset, fast); + if (new_buffer != NULL) + { + result = Py_BuildValue("s", new_buffer); + g_free(new_buffer); + return result; + } + } + + Py_RETURN_NONE; +} + + +static PyObject * +Encodings_get_charset_from_index(PyObject *module, PyObject *args, PyObject *kwargs) +{ + gint idx = 0; + const gchar *charset = NULL; + static gchar *kwlist[] = { "index", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &idx)) + { + charset = encodings_get_charset_from_index(idx); + if (charset != NULL) + return Py_BuildValue("s", charset); + } + + Py_RETURN_NONE; +} + + +static const gchar *encoding_groups[] = { + "GROUP_NONE", + "GROUP_WEST_EUROPEAN", + "GROUP_EAST_EUROPEAN", + "GROUP_EAST_ASIAN", + "GROUP_ASIAN", + "GROUP_MIDDLE_EASTERN", + "GROUP_UNICODE" +}; + + +static const gchar *encoding_names[] = { + "ISO_8859_1", + "ISO_8859_2", + "ISO_8859_3", + "ISO_8859_4", + "ISO_8859_5", + "ISO_8859_6", + "ISO_8859_7", + "ISO_8859_8", + "ISO_8859_8_I", + "ISO_8859_9", + "ISO_8859_10", + "ISO_8859_13", + "ISO_8859_14", + "ISO_8859_15", + "ISO_8859_16", + + "UTF_7", + "UTF_8", + "UTF_16LE", + "UTF_16BE", + "UCS_2LE", + "UCS_2BE", + "UTF_32LE", + "UTF_32BE", + + "ARMSCII_8", + "BIG5", + "BIG5_HKSCS", + "CP_866", + + "EUC_JP", + "EUC_KR", + "EUC_TW", + + "GB18030", + "GB2312", + "GBK", + "GEOSTD8", + "HZ", + + "IBM_850", + "IBM_852", + "IBM_855", + "IBM_857", + "IBM_862", + "IBM_864", + + "ISO_2022_JP", + "ISO_2022_KR", + "ISO_IR_111", + "JOHAB", + "KOI8_R", + "KOI8_U", + + "SHIFT_JIS", + "TCVN", + "TIS_620", + "UHC", + "VISCII", + + "WINDOWS_1250", + "WINDOWS_1251", + "WINDOWS_1252", + "WINDOWS_1253", + "WINDOWS_1254", + "WINDOWS_1255", + "WINDOWS_1256", + "WINDOWS_1257", + "WINDOWS_1258", + + "NONE", + "CP_932", + + "MAX" +}; + + +static PyObject * +Encodings_get_list(PyObject *module) +{ + int i; + PyObject *list; + list = PyList_New(0); + for (i = 0; i < GEANY_ENCODINGS_MAX; i++) + PyList_Append(list, PyString_FromString(encoding_names[i])); + return list; +} + + +static +PyMethodDef EncodingsModule_methods[] = { + { + "convert_to_utf8", + (PyCFunction)Encodings_convert_to_utf8, METH_KEYWORDS, + "Tries to convert the supplied buffer to UTF-8 encoding. Returns " + "the converted buffer and the encoding that was used." + }, + { + "convert_to_utf8_from_charset", + (PyCFunction)Encodings_convert_to_utf8_from_charset, METH_KEYWORDS, + "Tries to convert the supplied buffer to UTF-8 from the supplied " + "charset. If the fast parameter is not False (default), additional " + "checks to validate the converted string are performed." + }, + { + "get_charset_from_index", + (PyCFunction)Encodings_get_charset_from_index, METH_KEYWORDS, + "Gets the character set name of the specified index." + }, + { + "get_list", + (PyCFunction) Encodings_get_list, METH_NOARGS, + "Gets a list of all supported encodings." + }, + { NULL } +}; + + +PyMODINIT_FUNC +initencoding(void) +{ + int i; + PyObject *m; + + EncodingType.tp_new = PyType_GenericNew; + if (PyType_Ready(&EncodingType) < 0) + return; + + m = Py_InitModule3("encoding", EncodingsModule_methods, + "Encoding conversion functions."); + + Py_INCREF(&EncodingType); + PyModule_AddObject(m, "Encoding", (PyObject *) &EncodingType); + + for (i = 0; i < GEANY_ENCODINGS_MAX; i++) + PyModule_AddIntConstant(m, encoding_names[i], (glong) i); + + for (i = 0; i < GEANY_ENCODING_GROUPS_MAX; i++) + PyModule_AddIntConstant(m, encoding_groups[i], (glong) i); +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-encoding.h geany-plugins-1.24+dfsg/geanypy/src/geanypy-encoding.h --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-encoding.h 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-encoding.h 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef GEANYPY_ENCODING_H__ +#define GEANYPY_ENCODING_H__ + +extern PyTypeObject EncodingType; + +typedef struct +{ + PyObject_HEAD + GeanyEncoding *encoding; +} Encoding; + +Encoding *Encoding_create_new_from_geany_encoding(GeanyEncoding *enc); + +#endif /* GEANYPY_ENCODING_H__ */ diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-filetypes.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-filetypes.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-filetypes.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-filetypes.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,278 @@ +#include "geanypy.h" + + +static void +Filetype_dealloc(Filetype *self) +{ + self->ob_type->tp_free((PyObject *) self); +} + + +static int +Filetype_init(Filetype *self, PyObject *args, PyObject *kwds) +{ + self->ft = NULL; + return 0; +} + + +static PyObject * +Filetype_get_property(Filetype *self, const gchar *prop_name) +{ + g_return_val_if_fail(self != NULL, NULL); + g_return_val_if_fail(prop_name != NULL, NULL); + + if (!self->ft) + { + PyErr_SetString(PyExc_RuntimeError, + "Filetype instance not initialized properly"); + return NULL; + } + + if (g_str_equal(prop_name, "display_name")) + GEANYPY_RETURN_STRING(filetypes_get_display_name(self->ft)) + else if (g_str_equal(prop_name, "extension")) + GEANYPY_RETURN_STRING(self->ft->extension) + else if (g_str_equal(prop_name, "id")) + return PyInt_FromLong((glong) self->ft->id); + else if (g_str_equal(prop_name, "lang")) + return PyInt_FromLong((glong) self->ft->lang); + else if (g_str_equal(prop_name, "name")) + GEANYPY_RETURN_STRING(self->ft->name) + else if (g_str_equal(prop_name, "pattern")) + { + gint i, len; + PyObject *list = PyList_New(0); + if (self->ft->pattern) + { + len = g_strv_length(self->ft->pattern); + for (i = 0; i < len; i++) + PyList_Append(list, PyString_FromString(self->ft->pattern[i])); + } + return list; + + } + else if (g_str_equal(prop_name, "title")) + GEANYPY_RETURN_STRING(self->ft->title) +#ifdef ENABLE_PRIVATE + else if (g_str_equal(prop_name, "context_action_cmd")) + GEANYPY_RETURN_STRING(self->ft->context_action_cmd) + else if (g_str_equal(prop_name, "comment_open")) + GEANYPY_RETURN_STRING(self->ft->comment_open) + else if (g_str_equal(prop_name, "comment_use_indent")) + { + if (self->ft->comment_use_indent) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + else if (g_str_equal(prop_name, "group")) + return PyInt_FromLong((glong) self->ft->group); + else if (g_str_equal(prop_name, "error_regex_string")) + return PyString_FromString(self->ft->error_regex_string); + else if (g_str_equal(prop_name, "lexer_filetype")) + { + if (self->ft->lexer_filetype) + return Filetype_create_new_from_geany_filetype(self->ft->lexer_filetype); + } + else if (g_str_equal(prop_name, "mime_type")) + GEANYPY_RETURN_STRING(self->ft->lexer_filetype) + else if (g_str_equal(prop_name, "icon")) + { + if (self->ft->icon) + return (PyObject *) pygobject_new(G_OBJECT(self->ft->icon)); + } + else if (g_str_equal(prop_name, "comment_single")) + GEANYPY_RETURN_STRING(self->ft->comment_single) + else if (g_str_equal(prop_name, "indent_type")) + return PyInt_FromLong((glong) self->ft->indent_type); + else if (g_str_equal(prop_name, "indent_width")) + return PyInt_FromLong((glong) self->ft->indent_width); +#endif + + Py_RETURN_NONE; +} +GEANYPY_PROPS_READONLY(Filetype); + + +static PyGetSetDef Filetype_getseters[] = { + GEANYPY_GETSETDEF(Filetype, "display_name", + "Gets the filetype's name for display."), + GEANYPY_GETSETDEF(Filetype, "extension", + "Default file extension for new files or None."), + GEANYPY_GETSETDEF(Filetype, "id", + "Index of the the filetype."), + GEANYPY_GETSETDEF(Filetype, "lang", + "TagManager language type, -1 for all, -2 for none."), + GEANYPY_GETSETDEF(Filetype, "name", + "Untranslated short name, such as 'C' or 'None'."), + GEANYPY_GETSETDEF(Filetype, "pattern", + "List of filename-matching wildcard strings."), + GEANYPY_GETSETDEF(Filetype, "title", + "Shown in the open dialog, such as 'C source file'."), +#ifdef ENABLE_PRIVATE + GEANYPY_GETSETDEF(Filetype, "context_action_cmd", ""), + GEANYPY_GETSETDEF(Filetype, "comment_open", ""), + GEANYPY_GETSETDEF(Filetype, "comment_use_indent", ""), + GEANYPY_GETSETDEF(Filetype, "group", ""), + GEANYPY_GETSETDEF(Filetype, "error_regex_string", ""), + GEANYPY_GETSETDEF(Filetype, "lexer_filetype", ""), + GEANYPY_GETSETDEF(Filetype, "mime_type", ""), + GEANYPY_GETSETDEF(Filetype, "icon", ""), + GEANYPY_GETSETDEF(Filetype, "comment_single", ""), + GEANYPY_GETSETDEF(Filetype, "indent_type", ""), + GEANYPY_GETSETDEF(Filetype, "indent_width", ""), +#endif + { NULL } +}; + + +static PyTypeObject FiletypeType = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "geany.filetypes.Filetype", /* tp_name */ + sizeof(Filetype), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor) Filetype_dealloc, /* tp_dealloc */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* tp_print - tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + "Wrapper around a GeanyFiletype structure.",/* tp_doc */ + 0, 0, 0, 0, 0, 0, 0, 0, /* tp_traverse - tp_members */ + Filetype_getseters, /* tp_getset */ + 0, 0, 0, 0, 0, /* tp_base - tp_dictoffset */ + (initproc) Filetype_init, /* tp_init */ + 0, 0, /* tp_alloc - tp_new */ + +}; + + +static PyObject * +Filetype_detect_from_file(PyObject *self, PyObject *args, PyObject *kwargs) +{ + GeanyFiletype *ft; + gchar *filename = NULL; + static gchar *kwlist[] = { "filename", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &filename)) + { + if (filename) + { + if ((ft = filetypes_detect_from_file(filename))) + return (PyObject *) Filetype_create_new_from_geany_filetype(ft); + } + } + + Py_RETURN_NONE; +} + + +static PyObject * +Filetype_get_sorted_by_name(PyObject *self) +{ + const GSList *glist, *iter; + PyObject *list; + + glist = filetypes_get_sorted_by_name(); + list = PyList_New(0); + + for (iter = glist; iter != NULL; iter = g_slist_next(iter)) + { + if (!iter->data) + continue; + PyList_Append(list, (PyObject *) + Filetype_create_new_from_geany_filetype((GeanyFiletype *) iter->data)); + } + + return list; +} + + +static PyObject * +Filetype_index(PyObject *self, PyObject *args, PyObject *kwargs) +{ + GeanyFiletype *ft; + gint idx = -1; + static gchar *kwlist[] = { "index", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &idx)) + { + if ((ft = filetypes_index(idx))) + return (PyObject *) Filetype_create_new_from_geany_filetype(ft); + } + + Py_RETURN_NONE; +} + + +static PyObject * +Filetype_lookup_by_name(PyObject *self, PyObject *args, PyObject *kwargs) +{ + GeanyFiletype *ft; + gchar *filetype = NULL; + static gchar *kwlist[] = { "name", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &filetype)) + { + if (filetype && (ft = filetypes_lookup_by_name(filetype))) + return (PyObject *) Filetype_create_new_from_geany_filetype(ft); + } + + Py_RETURN_NONE; +} + + +static PyObject * +Filetype_get_sorted_by_title(PyObject *self, PyObject *args) +{ + const GSList *iter; + PyObject *list; + + list = PyList_New(0); + + for (iter = geany_data->filetypes_by_title; iter != NULL; iter = g_slist_next(iter)) + { + if (!iter->data) + continue; + PyList_Append(list, (PyObject *) + Filetype_create_new_from_geany_filetype((GeanyFiletype *) iter->data)); + } + + return list; +} + + +static +PyMethodDef FiletypeModule_methods[] = { + { "detect_from_file", (PyCFunction) Filetype_detect_from_file, METH_KEYWORDS }, + { "index", (PyCFunction) Filetype_index, METH_KEYWORDS }, + { "get_sorted_by_name", (PyCFunction) Filetype_get_sorted_by_name, METH_NOARGS }, + { "lookup_by_name", (PyCFunction) Filetype_lookup_by_name, METH_KEYWORDS }, + { "get_sorted_by_title", (PyCFunction) Filetype_get_sorted_by_title, METH_NOARGS }, + { NULL } +}; + + +PyMODINIT_FUNC +initfiletypes(void) +{ + PyObject *m; + + FiletypeType.tp_new = PyType_GenericNew; + if (PyType_Ready(&FiletypeType) < 0) + return; + + m = Py_InitModule3("filetypes", FiletypeModule_methods, + "Filetype information and management."); + + Py_INCREF(&FiletypeType); + PyModule_AddObject(m, "Filetype", (PyObject *)&FiletypeType); +} + + +Filetype *Filetype_create_new_from_geany_filetype(GeanyFiletype *ft) +{ + Filetype *self; + self = (Filetype *) PyObject_CallObject((PyObject *) &FiletypeType, NULL); + self->ft = ft; + return self; +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-filetypes.h geany-plugins-1.24+dfsg/geanypy/src/geanypy-filetypes.h --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-filetypes.h 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-filetypes.h 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,12 @@ +#ifndef GEANYPY_FILETYPES_H__ +#define GEANYPY_FILETYPES_H__ + +typedef struct +{ + PyObject_HEAD + GeanyFiletype *ft; +} Filetype; + +Filetype *Filetype_create_new_from_geany_filetype(GeanyFiletype *ft); + +#endif /* GEANYPY_FILETYPES_H__ */ diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy.h geany-plugins-1.24+dfsg/geanypy/src/geanypy.h --- geany-plugins-1.23+dfsg/geanypy/src/geanypy.h 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy.h 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,128 @@ +/* + * geanypy.h + * + * Copyright 2011 Matthew Brush + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + * + */ + +#ifndef GEANYPY_H__ +#define GEANYPY_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +/* For plain make file build using Mingw on Windows */ +#if defined(__MINGW32__) && defined(GEANYPY_WINDOWS_BUILD) +# define GEANYPY_WINDOWS 1 +#endif + +#include +#ifndef PyMODINIT_FUNC +# define PyMODINIT_FUNC void +#endif +#include + + +/* Defines a setter that throws an attribute exception when called. */ +#define GEANYPY_PROPS_READONLY(cls) \ + static int \ + cls ## _set_property(cls *self, PyObject *value, const gchar *prop_name) { \ + PyErr_SetString(PyExc_AttributeError, "can't set attribute"); \ + return -1; } + +/* Defines a getter/setter for use in the tp_getset table. */ +#define GEANYPY_GETSETDEF(cls, prop_name, doc) \ + { prop_name, \ + (getter) cls ## _get_property, \ + (setter) cls ## _set_property, \ + doc, \ + prop_name } + + +/* Initializes a new `cls` type object. */ +#define GEANYPY_NEW(cls) \ + (cls *) PyObject_CallObject((PyObject *) &(cls ## Type), NULL); + + +/* Returns a new py string or py none if string is NULL. */ +#define GEANYPY_RETURN_STRING(memb) \ + { \ + if (memb != NULL) \ + return PyString_FromString(memb); \ + else \ + Py_RETURN_NONE; \ + } + + +#include +#include +#include + +#include + +/* necessary for compilation with -fno-common, + * see https://bugzilla.gnome.org/show_bug.cgi?id=610657 for details, + * INCLUDE_PYGOBJECT_ONCE_FULL is set only once in geanypy-plugin.c */ +#ifndef INCLUDE_PYGOBJECT_ONCE_FULL +# define NO_IMPORT_PYGOBJECT +# define NO_IMPORT_PYGTK +#endif + +#include + +#ifndef GEANYPY_WINDOWS +/* Used with the results of `pkg-config --cflags pygtk-2.0` */ +# include +#else +/* On windows the path of pygtk.h is directly an include dir */ +# include +#endif + +#ifndef GTK +# define GTK +#endif +#include +#include + +#include + +#ifndef G_LOG_DOMAIN +# define G_LOG_DOMAIN "GeanyPy" +#endif + +#ifndef GEANYPY_WINDOWS +# include "config.h" +#endif + +#include "geanypy-document.h" +#include "geanypy-editor.h" +#include "geanypy-encoding.h" +#include "geanypy-filetypes.h" +#include "geanypy-plugin.h" +#include "geanypy-project.h" +#include "geanypy-scintilla.h" +#include "geanypy-signalmanager.h" +#include "geanypy-uiutils.h" + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* GEANYPY_H__ */ diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-highlighting.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-highlighting.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-highlighting.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-highlighting.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,230 @@ +#include "geanypy.h" + + +typedef struct +{ + PyObject_HEAD + const GeanyLexerStyle *lexer_style; +} LexerStyle; + + +static void +LexerStyle_dealloc(LexerStyle *self) +{ + self->ob_type->tp_free((PyObject *) self); +} + + +static int +LexerStyle_init(LexerStyle *self, PyObject *args, PyObject *kwds) +{ + self->lexer_style = NULL; + return 0; +} + + +static PyObject * +LexerStyle_get_property(LexerStyle *self, const gchar *prop_name) +{ + g_return_val_if_fail(self != NULL, NULL); + g_return_val_if_fail(prop_name != NULL, NULL); + + if (!self->lexer_style) + { + PyErr_SetString(PyExc_RuntimeError, + "LexerStyle instance not initialized properly"); + return NULL; + } + + if (g_str_equal(prop_name, "background")) + { + guint16 red, green, blue; + red = self->lexer_style->background & 255; + green = (self->lexer_style->background >> 8) & 255; + blue = (self->lexer_style->background >> 16) & 255; + return Py_BuildValue("iii", red, green, blue); + } + else if (g_str_equal(prop_name, "foreground")) + { + guint16 red, green, blue; + red = self->lexer_style->foreground & 255; + green = (self->lexer_style->foreground >> 8) & 255; + blue = (self->lexer_style->foreground >> 16) & 255; + return Py_BuildValue("iii", red, green, blue); + } + else if (g_str_equal(prop_name, "bold")) + { + if (self->lexer_style->bold) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + else if (g_str_equal(prop_name, "italic")) + { + if (self->lexer_style->italic) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + + Py_RETURN_NONE; +} +GEANYPY_PROPS_READONLY(LexerStyle); + + +static PyGetSetDef LexerStyle_getseters[] = { + GEANYPY_GETSETDEF(LexerStyle, "background", + "Background color of text, as an (R,G,B) tuple."), + GEANYPY_GETSETDEF(LexerStyle, "foreground", + "Foreground color of text, as an (R,G,B) tuple."), + GEANYPY_GETSETDEF(LexerStyle, "bold", + "Whether the text is bold or not."), + GEANYPY_GETSETDEF(LexerStyle, "italic", + "Whether the text is italic or not."), + { NULL } +}; + + +static PyTypeObject LexerStyleType = { + PyObject_HEAD_INIT(NULL) + 0, /*ob_size*/ + "geany.highlighting.LexerStyle", /*tp_name*/ + sizeof(Editor), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + (destructor) LexerStyle_dealloc, /*tp_dealloc*/ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* tp_print - tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/ + "Wrapper around a GeanyLexerStyle structure.", /* tp_doc */ + 0, 0, 0, 0, 0, 0, 0, 0, /* tp_traverse - tp_members */ + LexerStyle_getseters, /* tp_getset */ + 0, 0, 0, 0, 0, /* tp_base - tp_dictoffset */ + (initproc) LexerStyle_init, /* tp_init */ + 0, 0, /* tp_alloc - tp_new */ +}; + + +static PyObject * +Highlighting_get_style(PyObject *module, PyObject *args, PyObject *kwargs) +{ + gint ft_id, style_id; + LexerStyle *lexer_style; + const GeanyLexerStyle *ls; + static gchar *kwlist[] = { "filetype_id", "style_id", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "ii", kwlist, &ft_id, &style_id)) + { + ls = highlighting_get_style(ft_id, style_id); + if (ls != NULL) + { + lexer_style = (LexerStyle *) PyObject_CallObject((PyObject *) &LexerStyleType, NULL); + lexer_style->lexer_style = ls; + return (PyObject *) lexer_style; + } + } + + Py_RETURN_NONE; +} + + +static PyObject * +Highlighting_is_code_style(PyObject *module, PyObject *args, PyObject *kwargs) +{ + gint lexer, style; + static gchar *kwlist[] = { "lexer", "style", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "ii", kwlist, &lexer, &style)) + { + if (highlighting_is_code_style(lexer, style)) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + + Py_RETURN_NONE; +} + + +static PyObject * +Highlighting_is_comment_style(PyObject *module, PyObject *args, PyObject *kwargs) +{ + gint lexer, style; + static gchar *kwlist[] = { "lexer", "style", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "ii", kwlist, &lexer, &style)) + { + if (highlighting_is_comment_style(lexer, style)) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + + Py_RETURN_NONE; +} + + +static PyObject * +Highlighting_is_string_style(PyObject *module, PyObject *args, PyObject *kwargs) +{ + gint lexer, style; + static gchar *kwlist[] = { "lexer", "style", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "ii", kwlist, &lexer, &style)) + { + if (highlighting_is_string_style(lexer, style)) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + + Py_RETURN_NONE; +} + + +static PyObject * +Highlighting_set_styles(PyObject *module, PyObject *args, PyObject *kwargs) +{ + PyObject *py_sci, *py_ft; + Scintilla *sci; + Filetype *ft; + static gchar *kwlist[] = { "sci", "filetype", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "OO", kwlist, &py_sci, &py_ft)) + { + if (py_sci != Py_None && py_ft != Py_None) + { + sci = (Scintilla *) py_sci; + ft = (Filetype *) py_ft; + highlighting_set_styles(sci->sci, ft->ft); + } + } + + Py_RETURN_NONE; +} + + +static +PyMethodDef EditorModule_methods[] = { + { "get_style", (PyCFunction) Highlighting_get_style, METH_KEYWORDS }, + { "is_code_style", (PyCFunction) Highlighting_is_code_style, METH_KEYWORDS }, + { "is_comment_style", (PyCFunction) Highlighting_is_comment_style, METH_KEYWORDS }, + { "is_string_style", (PyCFunction) Highlighting_is_string_style, METH_KEYWORDS }, + { "set_styles", (PyCFunction) Highlighting_set_styles, METH_KEYWORDS }, + { NULL } +}; + + +PyMODINIT_FUNC +inithighlighting(void) +{ + PyObject *m; + + LexerStyleType.tp_new = PyType_GenericNew; + if (PyType_Ready(&LexerStyleType) < 0) + return; + + m = Py_InitModule3("highlighting", EditorModule_methods, + "Highlighting information and management."); + + Py_INCREF(&LexerStyleType); + PyModule_AddObject(m, "LexerStyle", (PyObject *)&LexerStyleType); +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-indentprefs.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-indentprefs.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-indentprefs.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-indentprefs.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,78 @@ +#include "geanypy.h" + + +static void +IndentPrefs_dealloc(IndentPrefs *self) +{ + self->ob_type->tp_free((PyObject *) self); +} + + +static int +IndentPrefs_init(IndentPrefs *self, PyObject *args, PyObject *kwds) +{ + self->indent_prefs = NULL; + return 0; +} + + +static PyObject * +IndentPrefs_get_property(IndentPrefs *self, const gchar *prop_name) +{ + g_return_val_if_fail(self != NULL, NULL); + g_return_val_if_fail(prop_name != NULL, NULL); + + if (!self->indent_prefs) + { + PyErr_SetString(PyExc_RuntimeError, + "IndentPrefs instance not initialized properly"); + return NULL; + } + + if (g_str_equal(prop_name, "width")) + return PyInt_FromLong((glong) self->indent_prefs->width); + else if (g_str_equal(prop_name, "type")) + return PyInt_FromLong((glong) self->indent_prefs->type); + else if (g_str_equal(prop_name, "hard_tab_width")) + return PyInt_FromLong((glong) self->indent_prefs->hard_tab_width); + + Py_RETURN_NONE; +} +GEANYPY_PROPS_READONLY(IndentPrefs); + + +static PyGetSetDef IndentPrefs_getseters[] = { + GEANYPY_GETSETDEF(IndentPrefs, "width", "Indent width in characters."), + GEANYPY_GETSETDEF(IndentPrefs, "type", + "Whether to use tabs, spaces, or both to indent."), + GEANYPY_GETSETDEF(IndentPrefs, "hard_tab_width", + "Width of a tab, but only when using INDENT_TYPE_BOTH."), + { NULL } +}; + + +PyTypeObject IndentPrefsType = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "geany.editor.IndentPrefs", /* tp_name */ + sizeof(IndentPrefs), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor) IndentPrefs_dealloc, /* tp_dealloc */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* tp_print - tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + "Wrapper around a GeanyIndentPrefs structure.", /* tp_doc */ + 0, 0, 0, 0, 0, 0, 0, 0, /* tp_traverse - tp_members */ + IndentPrefs_getseters, /* tp_getset */ + 0, 0, 0, 0, 0, /* tp_base - tp_dictoffset */ + (initproc) IndentPrefs_init, /* tp_init */ + 0, 0, /* tp_alloc - tp_new */ +}; + + +IndentPrefs *IndentPrefs_create_new_from_geany_indent_prefs(GeanyIndentPrefs *indent_prefs) +{ + IndentPrefs *self; + self = (IndentPrefs *) PyObject_CallObject((PyObject *) &IndentPrefsType, NULL); + self->indent_prefs = indent_prefs; + return self; +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-interfaceprefs.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-interfaceprefs.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-interfaceprefs.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-interfaceprefs.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,150 @@ +#include "geanypy.h" + + +#define RET_BOOL(memb) \ + { \ + if (memb) \ + Py_RETURN_TRUE; \ + else \ + Py_RETURN_FALSE; \ + } + + +static void +InterfacePrefs_dealloc(InterfacePrefs *self) +{ + g_return_if_fail(self != NULL); + self->ob_type->tp_free((PyObject *) self); +} + + +static int +InterfacePrefs_init(InterfacePrefs *self) +{ + g_return_val_if_fail(self != NULL, -1); + self->iface_prefs = geany_data->interface_prefs; + return 0; +} + + +static PyObject * +InterfacePrefs_get_property(InterfacePrefs *self, const gchar *prop_name) +{ + g_return_val_if_fail(self != NULL, NULL); + g_return_val_if_fail(prop_name != NULL, NULL); + + if (!self->iface_prefs) + { + PyErr_SetString(PyExc_RuntimeError, + "InterfacePrefs instance not initialized properly"); + return NULL; + } + + if (g_str_equal(prop_name, "compiler_tab_autoscroll")) + RET_BOOL(self->iface_prefs->compiler_tab_autoscroll) + else if (g_str_equal(prop_name, "editor_font")) + return PyString_FromString(self->iface_prefs->editor_font); + else if (g_str_equal(prop_name, "highlighting_invert_all")) + RET_BOOL(self->iface_prefs->highlighting_invert_all) + else if (g_str_equal(prop_name, "msgwin_compiler_visible")) + RET_BOOL(self->iface_prefs->msgwin_compiler_visible) + else if (g_str_equal(prop_name, "msgwin_font")) + return PyString_FromString(self->iface_prefs->msgwin_font); + else if (g_str_equal(prop_name, "msgwin_messages_visible")) + RET_BOOL(self->iface_prefs->msgwin_messages_visible) + else if (g_str_equal(prop_name, "msgwin_scribble_visible")) + RET_BOOL(self->iface_prefs->msgwin_scribble_visible) + else if (g_str_equal(prop_name, "msgwin_status_visible")) + RET_BOOL(self->iface_prefs->msgwin_status_visible) + else if (g_str_equal(prop_name, "notebook_double_click_hides_widgets")) + RET_BOOL(self->iface_prefs->notebook_double_click_hides_widgets) + else if (g_str_equal(prop_name, "show_notebook_tabs")) + RET_BOOL(self->iface_prefs->show_notebook_tabs) + else if (g_str_equal(prop_name, "show_symbol_list_expanders")) + RET_BOOL(self->iface_prefs->show_symbol_list_expanders) + else if (g_str_equal(prop_name, "sidebar_openfiles_visible")) + RET_BOOL(self->iface_prefs->sidebar_openfiles_visible) + else if (g_str_equal(prop_name, "sidebar_pos")) + return PyInt_FromLong((glong) self->iface_prefs->sidebar_pos); + else if (g_str_equal(prop_name, "sidebar_symbol_visible")) + RET_BOOL(self->iface_prefs->sidebar_symbol_visible) + else if (g_str_equal(prop_name, "statusbar_visible")) + RET_BOOL(self->iface_prefs->statusbar_visible) + else if (g_str_equal(prop_name, "tab_pos_editor")) + return PyInt_FromLong((glong) self->iface_prefs->tab_pos_editor); + else if (g_str_equal(prop_name, "tab_pos_msgwin")) + return PyInt_FromLong((glong) self->iface_prefs->tab_pos_msgwin); + else if (g_str_equal(prop_name, "tab_pos_sidebar")) + return PyInt_FromLong((glong) self->iface_prefs->tab_pos_sidebar); + else if (g_str_equal(prop_name, "tagbar_font")) + return PyString_FromString(self->iface_prefs->tagbar_font); + else if (g_str_equal(prop_name, "use_native_windows_dialogs")) + RET_BOOL(self->iface_prefs->use_native_windows_dialogs) + + Py_RETURN_NONE; +} +GEANYPY_PROPS_READONLY(InterfacePrefs); + + +static PyGetSetDef InterfacePrefs_getseters[] = { + GEANYPY_GETSETDEF(InterfacePrefs, "compiler_tab_autoscroll", + "Wether compiler messages window is automatically scrolled to " + "show new messages."), + GEANYPY_GETSETDEF(InterfacePrefs, "editor_font", + "Font used in the editor window."), + GEANYPY_GETSETDEF(InterfacePrefs, "highlighting_invert_all", + "Whether highlighting colors are inverted."), + GEANYPY_GETSETDEF(InterfacePrefs, "msgwin_compiler_visible", + "Wether message window's compiler tab is visible."), + GEANYPY_GETSETDEF(InterfacePrefs, "msgwin_font", + "Font used in the message window."), + GEANYPY_GETSETDEF(InterfacePrefs, "msgwin_messages_visible", + "Whether message window's messages tab is visible."), + GEANYPY_GETSETDEF(InterfacePrefs, "msgwin_scribble_visible", + "Whether message window's scribble tab is visible."), + GEANYPY_GETSETDEF(InterfacePrefs, "msgwin_status_visible", + "Whether message window's status tab is visible."), + GEANYPY_GETSETDEF(InterfacePrefs, "notebook_double_click_hides_widgets", + "Whether a double-click on the notebook tabs hides all other windows."), + GEANYPY_GETSETDEF(InterfacePrefs, "show_notebook_tabs", + "Whether editor tabs are visible."), + GEANYPY_GETSETDEF(InterfacePrefs, "show_symbol_list_expanders", + "Whether to show expanders in the symbol list."), + GEANYPY_GETSETDEF(InterfacePrefs, "sidebar_openfiles_visible", + "Whether the open files list is visible."), + GEANYPY_GETSETDEF(InterfacePrefs, "sidebar_pos", + "Position of the sidebar (left or right)."), + GEANYPY_GETSETDEF(InterfacePrefs, "sidebar_symbol_visible", + "Whether the status bar is visible."), + GEANYPY_GETSETDEF(InterfacePrefs, "statusbar_visible", + "Whether the statusbar is visible."), + GEANYPY_GETSETDEF(InterfacePrefs, "tab_pos_editor", + "Position of the editor's tabs."), + GEANYPY_GETSETDEF(InterfacePrefs, "tab_pos_msgwin", + "Position of the message window tabs."), + GEANYPY_GETSETDEF(InterfacePrefs, "tab_pos_sidebar", + "Position of the sidebar's tabs."), + GEANYPY_GETSETDEF(InterfacePrefs, "tagbar_font", + "Symbol sidebar font."), + GEANYPY_GETSETDEF(InterfacePrefs, "use_native_windows_dialogs", + "Whether to use native Windows dialogs (only on Win32)."), + { NULL } +}; + + +PyTypeObject InterfacePrefsType = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "geany.ui_utils.InterfacePrefs", /* tp_name */ + sizeof(InterfacePrefs), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor) InterfacePrefs_dealloc, /* tp_dealloc */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* tp_print - tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + "Wrapper around a GeanyInterfacePrefs structure.", /* tp_doc */ + 0, 0, 0, 0, 0, 0, 0, 0, /* tp_traverse - tp_members */ + InterfacePrefs_getseters, /* tp_getset */ + 0, 0, 0, 0, 0, /* tp_base - tp_dictoffset */ + (initproc) InterfacePrefs_init, /* tp_init */ + 0, 0, /* tp_alloc - tp_new */ +}; diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-main.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-main.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-main.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-main.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,53 @@ +#include "geanypy.h" + + +static PyObject * +Main_is_realized(PyObject *module) +{ + if (main_is_realized()) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; +} + + +static PyObject * +Main_locale_init(PyObject *module, PyObject *args, PyObject *kwargs) +{ + gchar *locale_dir = NULL, *package = NULL; + static gchar *kwlist[] = { "locale_dir", "gettext_package", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "ss", kwlist, &locale_dir, &package)) + { + if (locale_dir && package) + main_locale_init(locale_dir, package); + } + + Py_RETURN_NONE; +} + + +static PyObject * +Main_reload_configuration(PyObject *module) +{ + main_reload_configuration(); + Py_RETURN_NONE; +} + + +static +PyMethodDef MainModule_methods[] = { + { "is_realized", (PyCFunction) Main_is_realized, METH_NOARGS, + "Checks whether the main gtk.Window has been realized." }, + { "locale_init", (PyCFunction) Main_locale_init, METH_KEYWORDS, + "Initializes the gettext translation system." }, + { "reload_configuration", (PyCFunction) Main_reload_configuration, METH_NOARGS, + "Reloads most of Geany's configuration files without restarting." }, + { NULL } +}; + + +PyMODINIT_FUNC initmain(void) +{ + Py_InitModule3("main", MainModule_methods, "Main program related functions."); +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-mainwidgets.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-mainwidgets.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-mainwidgets.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-mainwidgets.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,95 @@ +#include "geanypy.h" + + +static void +MainWidgets_dealloc(MainWidgets *self) +{ + self->ob_type->tp_free((PyObject *) self); +} + + +static int +MainWidgets_init(MainWidgets *self) +{ + self->main_widgets = geany_data->main_widgets; + return 0; +} + + +static PyObject * +MainWidgets_get_property(MainWidgets *self, const gchar *prop_name) +{ + g_return_val_if_fail(self != NULL, NULL); + g_return_val_if_fail(prop_name != NULL, NULL); + + if (!self->main_widgets) + { + PyErr_SetString(PyExc_RuntimeError, + "MainWidgets instance not initialized properly"); + return NULL; + } + + if (g_str_equal(prop_name, "editor_menu")) + return pygobject_new(G_OBJECT(self->main_widgets->editor_menu)); + else if (g_str_equal(prop_name, "message_window_notebook")) + return pygobject_new(G_OBJECT(self->main_widgets->message_window_notebook)); + else if (g_str_equal(prop_name, "notebook")) + return pygobject_new(G_OBJECT(self->main_widgets->notebook)); + else if (g_str_equal(prop_name, "progressbar")) + return pygobject_new(G_OBJECT(self->main_widgets->progressbar)); + else if (g_str_equal(prop_name, "project_menu")) + return pygobject_new(G_OBJECT(self->main_widgets->project_menu)); + else if (g_str_equal(prop_name, "sidebar_notebook")) + return pygobject_new(G_OBJECT(self->main_widgets->sidebar_notebook)); + else if (g_str_equal(prop_name, "toolbar")) + return pygobject_new(G_OBJECT(self->main_widgets->toolbar)); + else if (g_str_equal(prop_name, "tools_menu")) + return pygobject_new(G_OBJECT(self->main_widgets->tools_menu)); + else if (g_str_equal(prop_name, "window")) + return pygobject_new(G_OBJECT(self->main_widgets->window)); + + Py_RETURN_NONE; +} +GEANYPY_PROPS_READONLY(MainWidgets); + + +static PyGetSetDef MainWidgets_getseters[] = { + GEANYPY_GETSETDEF(MainWidgets, "editor_menu", + "Popup context menu on the editor widget."), + GEANYPY_GETSETDEF(MainWidgets, "message_window_notebook", + "Notebook in the bottom message window."), + GEANYPY_GETSETDEF(MainWidgets, "notebook", + "The central documents notebook."), + GEANYPY_GETSETDEF(MainWidgets, "progressbar", + "Progress bar in the bottom status bar."), + GEANYPY_GETSETDEF(MainWidgets, "project_menu", + "The Project menu in the main menu bar."), + GEANYPY_GETSETDEF(MainWidgets, "sidebar_notebook", + "The notebook in the sidebar."), + GEANYPY_GETSETDEF(MainWidgets, "toolbar", + "Main toolbar."), + GEANYPY_GETSETDEF(MainWidgets, "tools_menu", + "The Tools menu in the main menu bar (recommended for plugins)."), + GEANYPY_GETSETDEF(MainWidgets, "window", + "Main window."), + { NULL }, +}; + + +PyTypeObject MainWidgetsType = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "geany.ui_utils.MainWidgets", /* tp_name */ + sizeof(MainWidgets), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor) MainWidgets_dealloc, /* tp_dealloc */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* tp_print - tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + "Wrapper around the GeanyMainWidgets structure.", /* tp_doc */ + 0, 0, 0, 0, 0, 0, 0, 0, /* tp_traverse - tp_members */ + MainWidgets_getseters, /* tp_getset */ + 0, 0, 0, 0, 0, /* tp_base - tp_dictoffset */ + (initproc) MainWidgets_init, /* tp_init */ + 0, 0, /* tp_alloc - tp_new */ + +}; diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-msgwindow.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-msgwindow.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-msgwindow.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-msgwindow.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,133 @@ +#include "geanypy.h" + + +static PyObject * +Msgwin_clear_tab(PyObject *module, PyObject *args, PyObject *kwargs) +{ + gint tab_num = 0; + static gchar *kwlist[] = { "tabnum", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &tab_num)) + msgwin_clear_tab(tab_num); + + Py_RETURN_NONE; +} + + +static PyObject * +Msgwin_compiler_add(PyObject *module, PyObject *args, PyObject *kwargs) +{ + gint msg_color = COLOR_BLACK; + gchar *msg = NULL; + static gchar *kwlist[] = { "msg", "msg_color", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s|i", kwlist, &msg, &msg_color)) + msgwin_compiler_add(msg_color, "%s", msg); + + Py_RETURN_NONE; +} + + +static PyObject * +Msgwin_msg_add(PyObject *module, PyObject *args, PyObject *kwargs) +{ + gint msg_color = COLOR_BLACK, line = -1; + PyObject *obj = NULL; + Document *py_doc = NULL; + GeanyDocument *doc = NULL; + gchar *msg = NULL; + static gchar *kwlist[] = { "msg", "msg_color", "line", "doc", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s|iiO", kwlist, &msg, + &msg_color, &line, &obj)) + { + if (obj == NULL || obj == Py_None) + doc = NULL; + else + { + py_doc = (Document *) obj; + doc = py_doc->doc; + } + msgwin_msg_add(msg_color, line, doc, "%s", msg); + } + + Py_RETURN_NONE; +} + + +static PyObject * +Msgwin_set_messages_dir(PyObject *module, PyObject *args, PyObject *kwargs) +{ + gchar *msgdir = NULL; + static gchar *kwlist[] = { "messages_dir", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &msgdir)) + { + if (msgdir != NULL) + msgwin_set_messages_dir(msgdir); + } + + Py_RETURN_NONE; +} + + +static PyObject * +Msgwin_status_add(PyObject *module, PyObject *args, PyObject *kwargs) +{ + gchar *msg = NULL; + static gchar *kwlist[] = { "msg", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &msg)) + { + if (msg != NULL) + msgwin_status_add("%s", msg); + } + + Py_RETURN_NONE; +} + + +static PyObject * +Msgwin_switch_tab(PyObject *module, PyObject *args, PyObject *kwargs) +{ + gint tabnum = 0, show = 0; + static gchar *kwlist[] = { "tabnum", "show", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "i|i", kwlist, &tabnum, &show)) + msgwin_switch_tab(tabnum, show); + + Py_RETURN_NONE; +} + + +static +PyMethodDef MsgwinModule_methods[] = { + { "clear_tab", (PyCFunction) Msgwin_clear_tab, METH_KEYWORDS }, + { "compiler_add", (PyCFunction) Msgwin_compiler_add, METH_KEYWORDS }, + { "msg_add", (PyCFunction) Msgwin_msg_add, METH_KEYWORDS }, + { "set_messages_dir", (PyCFunction) Msgwin_set_messages_dir, METH_KEYWORDS }, + { "status_add", (PyCFunction) Msgwin_status_add, METH_KEYWORDS }, + { "switch_tab", (PyCFunction) Msgwin_switch_tab, METH_KEYWORDS }, + { NULL } +}; + + +PyMODINIT_FUNC +initmsgwin(void) +{ + PyObject *m; + + m = Py_InitModule3("msgwindow", MsgwinModule_methods, + "Message windows information and management."); + + PyModule_AddIntConstant(m, "COLOR_RED", COLOR_RED); + PyModule_AddIntConstant(m, "COLOR_DARK_RED", COLOR_DARK_RED); + PyModule_AddIntConstant(m, "COLOR_BLACK", COLOR_BLACK); + PyModule_AddIntConstant(m, "COLOR_BLUE", COLOR_BLUE); + + PyModule_AddIntConstant(m, "TAB_STATUS", MSG_STATUS); + PyModule_AddIntConstant(m, "TAB_COMPILER", MSG_COMPILER); + PyModule_AddIntConstant(m, "TAB_MESSAGE", MSG_MESSAGE); + PyModule_AddIntConstant(m, "TAB_SCRIBBLE", MSG_SCRATCH); + PyModule_AddIntConstant(m, "TAB_TERMINAL", MSG_VTE); +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-navqueue.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-navqueue.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-navqueue.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-navqueue.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,80 @@ +#include "geanypy.h" + + +static PyObject * +Navqueue_goto_line(PyObject *module, PyObject *args, PyObject *kwargs) +{ + gint line = 1; + PyObject *py_old = NULL, *py_new = NULL; + Document *py_doc_old, *py_doc_new; + GeanyDocument *old_doc, *new_doc; + static gchar *kwlist[] = { "old_doc", "new_doc", "line", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "OOi", kwlist, &py_old, + &py_new, &line)) + { + if (!py_old || py_old == Py_None) + old_doc = NULL; + else + { + py_doc_old = (Document *) py_old; + old_doc = py_doc_old->doc; + } + + if (!py_new || py_new == Py_None) + Py_RETURN_NONE; + else + { + py_doc_new = (Document *) py_new; + new_doc = py_doc_new->doc; + } + + if ( (old_doc != NULL && !DOC_VALID(old_doc)) || !DOC_VALID(new_doc) ) + Py_RETURN_NONE; + if (navqueue_goto_line(old_doc, new_doc, line)) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + + Py_RETURN_NONE; +} + + +#ifdef ENABLE_PRIVATE +static PyObject * +Navqueue_go_back(PyObject *module) +{ + navqueue_go_back(); + Py_RETURN_NONE; +} + + +static PyObject * +Navqueue_go_forward(PyObject *module) +{ + navqueue_go_forward(); + Py_RETURN_NONE; +} +#endif + + +static +PyMethodDef NavqueueModule_methods[] = { + { "goto_line", (PyCFunction) Navqueue_goto_line, METH_KEYWORDS, + "Adds old file position and new file position to the navqueue, " + "then goes to the new position." }, +#ifdef ENABLE_PRIVATE + { "go_back", (PyCFunction) Navqueue_go_back, METH_NOARGS, + "Navigate backwards." }, + { "go_forward", (PyCFunction) Navqueue_go_forward, METH_NOARGS, + "Navigate forward." }, +#endif + { NULL } +}; + + +PyMODINIT_FUNC initnavqueue(void) +{ + Py_InitModule3("navqueue", NavqueueModule_methods, "Simple code navigation."); +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-plugin.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-plugin.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-plugin.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-plugin.c 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,282 @@ +/* + * plugin.c + * + * Copyright 2011 Matthew Brush + * + * 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., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +#define INCLUDE_PYGOBJECT_ONCE_FULL + +#include "geanypy.h" + +G_MODULE_EXPORT GeanyPlugin *geany_plugin; +G_MODULE_EXPORT GeanyData *geany_data; +G_MODULE_EXPORT GeanyFunctions *geany_functions; + + +G_MODULE_EXPORT PLUGIN_VERSION_CHECK(211) + +G_MODULE_EXPORT PLUGIN_SET_INFO( + _("GeanyPy"), + _("Python plugins support"), + "1.0", + "Matthew Brush ") + + +static GtkWidget *loader_item = NULL; +static PyObject *manager = NULL; +static gchar *plugin_dir = NULL; +static SignalManager *signal_manager = NULL; + + +/* Forward declarations to prevent compiler warnings. */ +PyMODINIT_FUNC initapp(void); +PyMODINIT_FUNC initdialogs(void); +PyMODINIT_FUNC initdocument(void); +PyMODINIT_FUNC initeditor(void); +PyMODINIT_FUNC initencoding(void); +PyMODINIT_FUNC initfiletypes(void); +PyMODINIT_FUNC inithighlighting(void); +PyMODINIT_FUNC initmain(void); +PyMODINIT_FUNC initmsgwin(void); +PyMODINIT_FUNC initnavqueue(void); +PyMODINIT_FUNC initprefs(void); +PyMODINIT_FUNC initproject(void); +PyMODINIT_FUNC initscintilla(void); +PyMODINIT_FUNC initsearch(void); +PyMODINIT_FUNC inittemplates(void); +PyMODINIT_FUNC initui_utils(void); + + +static void +GeanyPy_start_interpreter(void) +{ + gchar *init_code; + gchar *py_dir = NULL; + + +#ifndef GEANYPY_WINDOWS + { /* Prevents a crash in the dynload thingy + TODO: is this or the old dlopen version even needed? */ + GModule *mod = g_module_open(GEANYPY_PYTHON_LIBRARY, G_MODULE_BIND_LAZY); + if (!mod) { + g_warning(_("Unable to pre-load Python library: %s."), g_module_error()); + return; + } + g_module_close(mod); + } +#endif + + Py_Initialize(); + + /* Import the C modules */ + initapp(); + initdialogs(); + initdocument(); + initeditor(); + initencoding(); + initfiletypes(); + inithighlighting(); + initmain(); + initmsgwin(); + initnavqueue(); + initprefs(); + initproject(); + initscintilla(); + initsearch(); + inittemplates(); + initui_utils(); + +#ifdef GEANYPY_WINDOWS + { /* On windows, get path at runtime since we don't really know where + * Geany is installed ahead of time. */ + gchar *geany_base_dir; + geany_base_dir = g_win32_get_package_installation_directory_of_module(NULL); + if (geany_base_dir) + { + py_dir = g_build_filename(geany_base_dir, "lib", "geanypy", NULL); + g_free(geany_base_dir); + } + if (!g_file_test(py_dir, G_FILE_TEST_EXISTS)) + { + g_critical("The path to the `geany' module was not found: %s", py_dir); + g_free(py_dir); + py_dir = g_strdup(""); /* will put current dir on path? */ + } + } +#else + py_dir = g_strdup(GEANYPY_PYTHON_DIR); +#endif + + /* Adjust Python path to find wrapper package (geany) */ + init_code = g_strdup_printf( + "import os, sys\n" + "path = '%s'.replace('~', os.path.expanduser('~'))\n" + "sys.path.append(path)\n" + "import geany\n", py_dir); + g_free(py_dir); + + PyRun_SimpleString(init_code); + g_free(init_code); + +} + +static void +GeanyPy_stop_interpreter(void) +{ + if (Py_IsInitialized()) + Py_Finalize(); +} + + +static void +GeanyPy_init_manager(const gchar *dir) +{ + PyObject *module, *man, *args; + gchar *sys_plugin_dir = NULL; + + g_return_if_fail(dir != NULL); + + module = PyImport_ImportModule("geany.manager"); + if (module == NULL) + { + g_warning(_("Failed to import manager module")); + return; + } + + man = PyObject_GetAttrString(module, "PluginManager"); + Py_DECREF(module); + + if (man == NULL) + { + g_warning(_("Failed to retrieve PluginManager from manager module")); + return; + } + +#ifdef GEANYPY_WINDOWS + { /* Detect the system plugin's dir at runtime on Windows since we + * don't really know where Geany is installed. */ + gchar *geany_base_dir; + geany_base_dir = g_win32_get_package_installation_directory_of_module(NULL); + if (geany_base_dir) + { + sys_plugin_dir = g_build_filename(geany_base_dir, "lib", "geanypy", "plugins", NULL); + g_free(geany_base_dir); + } + if (!g_file_test(sys_plugin_dir, G_FILE_TEST_EXISTS)) + { + g_warning(_("System plugin directory not found.")); + g_free(sys_plugin_dir); + sys_plugin_dir = NULL; + } + } +#else + sys_plugin_dir = g_strdup(GEANYPY_PLUGIN_DIR); +#endif + + + g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "User plugins: %s", dir); + + if (sys_plugin_dir) + { + g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "System plugins: %s", sys_plugin_dir); + args = Py_BuildValue("([s, s])", sys_plugin_dir, dir); + g_free(sys_plugin_dir); + } + else + args = Py_BuildValue("([s])", dir); + + manager = PyObject_CallObject(man, args); + if (PyErr_Occurred()) + PyErr_Print(); + Py_DECREF(man); + Py_DECREF(args); + + if (manager == NULL) + { + g_warning(_("Unable to instantiate new PluginManager")); + return; + } +} + + +static void +GeanyPy_show_manager(void) +{ + PyObject *show_method; + + g_return_if_fail(manager != NULL); + + show_method = PyObject_GetAttrString(manager, "show_all"); + if (show_method == NULL) + { + g_warning(_("Unable to get show_all() method on plugin manager")); + return; + } + PyObject_CallObject(show_method, NULL); + Py_DECREF(show_method); +} + + +static void +on_python_plugin_loader_activate(GtkMenuItem *item, gpointer user_data) +{ + GeanyPy_show_manager(); +} + + +G_MODULE_EXPORT void +plugin_init(GeanyData *data) +{ + GeanyPy_start_interpreter(); + signal_manager = signal_manager_new(geany_plugin); + + plugin_dir = g_build_filename(geany->app->configdir, + "plugins", "geanypy", "plugins", NULL); + + if (!g_file_test(plugin_dir, G_FILE_TEST_IS_DIR)) + { + if (g_mkdir_with_parents(plugin_dir, 0755) == -1) + { + g_warning(_("Unable to create Python plugins directory: %s: %s"), + plugin_dir, + strerror(errno)); + g_free(plugin_dir); + plugin_dir = NULL; + } + } + + if (plugin_dir != NULL) + GeanyPy_init_manager(plugin_dir); + + loader_item = gtk_menu_item_new_with_label(_("Python Plugin Manager")); + gtk_widget_set_sensitive(loader_item, plugin_dir != NULL); + gtk_menu_append(GTK_MENU(geany->main_widgets->tools_menu), loader_item); + gtk_widget_show(loader_item); + g_signal_connect(loader_item, "activate", + G_CALLBACK(on_python_plugin_loader_activate), NULL); +} + + +G_MODULE_EXPORT void plugin_cleanup(void) +{ + signal_manager_free(signal_manager); + Py_XDECREF(manager); + GeanyPy_stop_interpreter(); + gtk_widget_destroy(loader_item); + g_free(plugin_dir); +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-plugin.h geany-plugins-1.24+dfsg/geanypy/src/geanypy-plugin.h --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-plugin.h 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-plugin.h 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,43 @@ +/* + * plugin.h + * + * Copyright 2011 Matthew Brush + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + * + */ + +#ifndef PLUGIN_H +#define PLUGIN_H +#ifdef __cplusplus +extern "C" { +#endif + + +extern GeanyPlugin *geany_plugin; +extern GeanyData *geany_data; +extern GeanyFunctions *geany_functions; + + +#ifndef PyMODINIT_FUNC +#define PyMODINIT_FUNC void +#endif + + +#ifdef __cplusplus +} /* extern "C" */ +#endif +#endif /* PLUGIN_H */ diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-prefs.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-prefs.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-prefs.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-prefs.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,191 @@ +#include "geanypy.h" + + +typedef struct +{ + PyObject_HEAD + GeanyPrefs *prefs; +} Prefs; + + +static void +Prefs_dealloc(Prefs *self) +{ + g_return_if_fail(self != NULL); + self->ob_type->tp_free((PyObject *) self); +} + + +static int +Prefs_init(Prefs *self) +{ + g_return_val_if_fail(self != NULL, -1); + self->prefs = geany_data->prefs; + return 0; +} + + +static PyObject * +Prefs_get_property(Prefs *self, const gchar *prop_name) +{ + g_return_val_if_fail(self != NULL, NULL); + g_return_val_if_fail(prop_name != NULL, NULL); + + if (!self->prefs) + { + PyErr_SetString(PyExc_RuntimeError, + "Prefs instance not initialized properly"); + return NULL; + } + + if (g_str_equal(prop_name, "default_open_path") && self->prefs->default_open_path) + return PyString_FromString(self->prefs->default_open_path); + + Py_RETURN_NONE; +} +GEANYPY_PROPS_READONLY(Prefs); + + +static PyGetSetDef Prefs_getseters[] = { + GEANYPY_GETSETDEF(Prefs, "default_open_path", + "Default path to look for files when no other path is appropriate."), + { NULL } +}; + + +static PyTypeObject PrefsType = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "geany.prefs.Prefs", /* tp_name */ + sizeof(Prefs), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor) Prefs_dealloc, /* tp_dealloc */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* tp_print - tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + "Wrapper around a GeanyPrefs structure.", /* tp_doc */ + 0, 0, 0, 0, 0, 0, 0, 0, /* tp_traverse - tp_members */ + Prefs_getseters, /* tp_getset */ + 0, 0, 0, 0, 0, /* tp_base - tp_dictoffset */ + (initproc) Prefs_init, /* tp_init */ + 0, 0, /* tp_alloc - tp_new */ +}; + + +typedef struct +{ + PyObject_HEAD + GeanyToolPrefs *tool_prefs; +} ToolPrefs; + + +static void +ToolPrefs_dealloc(ToolPrefs *self) +{ + g_return_if_fail(self != NULL); + self->ob_type->tp_free((PyObject *) self); +} + + +static int +ToolPrefs_init(ToolPrefs *self) +{ + g_return_val_if_fail(self != NULL, -1); + self->tool_prefs = geany_data->tool_prefs; + return 0; +} + + +static PyObject * +ToolPrefs_get_property(ToolPrefs *self, const gchar *prop_name) +{ + g_return_val_if_fail(self != NULL, NULL); + g_return_val_if_fail(prop_name != NULL, NULL); + + if (!self->tool_prefs) + { + PyErr_SetString(PyExc_RuntimeError, + "ToolPrefs instance not initialized properly"); + return NULL; + } + + if (g_str_equal(prop_name, "browser_cmd") && self->tool_prefs->browser_cmd) + return PyString_FromString(self->tool_prefs->browser_cmd); + else if (g_str_equal(prop_name, "context_action_cmd") && self->tool_prefs->context_action_cmd) + return PyString_FromString(self->tool_prefs->context_action_cmd); + else if (g_str_equal(prop_name, "grep_cmd") && self->tool_prefs->grep_cmd) + return PyString_FromString(self->tool_prefs->grep_cmd); + else if (g_str_equal(prop_name, "term_cmd") && self->tool_prefs->term_cmd) + return PyString_FromString(self->tool_prefs->term_cmd); + + Py_RETURN_NONE; +} +GEANYPY_PROPS_READONLY(ToolPrefs); + + +static PyGetSetDef ToolPrefs_getseters[] = { + GEANYPY_GETSETDEF(ToolPrefs, "browser_cmd", ""), + GEANYPY_GETSETDEF(ToolPrefs, "context_action_cmd", ""), + GEANYPY_GETSETDEF(ToolPrefs, "grep_cmd", ""), + GEANYPY_GETSETDEF(ToolPrefs, "term_cmd", ""), + { NULL } +}; + + +static PyTypeObject ToolPrefsType = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "geany.prefs.ToolPrefs", /* tp_name */ + sizeof(ToolPrefs), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor) ToolPrefs_dealloc, /* tp_dealloc */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* tp_print - tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + "Wrapper around a GeanyToolPrefs structure.", /* tp_doc */ + 0, 0, 0, 0, 0, 0, 0, 0, /* tp_traverse - tp_members */ + ToolPrefs_getseters, /* tp_getset */ + 0, 0, 0, 0, 0, /* tp_base - tp_dictoffset */ + (initproc) ToolPrefs_init, /* tp_init */ + 0, 0, /* tp_alloc - tp_new */ +}; + + +#ifdef ENABLE_PRIVATE +static PyObject * +Prefs_show_dialog(PyObject *module) +{ + prefs_show_dialog(); + Py_RETURN_NONE; +} +#endif + + +static PyMethodDef PrefsModule_methods[] = { +#ifdef ENABLE_PRIVATE + { "show_dialog", (PyCFunction) Prefs_show_dialog, METH_NOARGS, + "Show the preferences dialog." }, +#endif + { NULL } +}; + + +PyMODINIT_FUNC initprefs(void) +{ + PyObject *m; + + PrefsType.tp_new = PyType_GenericNew; + if (PyType_Ready(&PrefsType) < 0) + return; + + ToolPrefsType.tp_new = PyType_GenericNew; + if (PyType_Ready(&ToolPrefsType) < 0) + return; + + m = Py_InitModule3("prefs", PrefsModule_methods, + "General preferences dialog settings"); + + Py_INCREF(&PrefsType); + PyModule_AddObject(m, "Prefs", (PyObject *) &PrefsType); + + Py_INCREF(&ToolPrefsType); + PyModule_AddObject(m, "ToolPrefs", (PyObject *) &ToolPrefsType); +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-project.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-project.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-project.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-project.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,107 @@ +#include "geanypy.h" + + +static void +Project_dealloc(Project *self) +{ + g_return_if_fail(self != NULL); + self->ob_type->tp_free((PyObject *) self); +} + + +static int +Project_init(Project *self, PyObject *args, PyObject *kwds) +{ + g_return_val_if_fail(self != NULL, -1); + self->project = geany_data->app->project; + return 0; +} + + +static PyObject * +Project_get_property(Project *self, const gchar *prop_name) +{ + g_return_val_if_fail(self != NULL, NULL); + g_return_val_if_fail(prop_name != NULL, NULL); + + if (!self->project) + Py_RETURN_NONE; + + if (g_str_equal(prop_name, "base_path") && self->project->base_path) + return PyString_FromString(self->project->base_path); + else if (g_str_equal(prop_name, "description") && self->project->description) + return PyString_FromString(self->project->description); + else if (g_str_equal(prop_name, "file_name") && self->project->file_name) + return PyString_FromString(self->project->file_name); + else if (g_str_equal(prop_name, "file_patterns") && self->project->file_patterns) + { + guint i, len; + PyObject *set; + len = g_strv_length(self->project->file_patterns); + set = PyFrozenSet_New(NULL); + for (i = 0; i < len; i++) + PySet_Add(set, PyString_FromString(self->project->file_patterns[i])); + return set; + } + else if (g_str_equal(prop_name, "name") && self->project->name) + return PyString_FromString(self->project->name); + else if (g_str_equal(prop_name, "type") && self->project->type) + return Py_BuildValue("i", self->project->type); + + Py_RETURN_NONE; +} +GEANYPY_PROPS_READONLY(Project); + + +static PyGetSetDef Project_getseters[] = { + GEANYPY_GETSETDEF(Project, "base_path", + "Base path of the project directory (maybe relative)."), + GEANYPY_GETSETDEF(Project, "description", + "Short description of the project."), + GEANYPY_GETSETDEF(Project, "file_name", + "Where the project file is stored."), + GEANYPY_GETSETDEF(Project, "file_patterns", + "Sequence of filename extension patterns."), + GEANYPY_GETSETDEF(Project, "name", + "The name of the project."), + GEANYPY_GETSETDEF(Project, "type", + "Identifier whether it is a pure Geany project or modified/" + "extended by a plugin."), + { NULL } +}; + + +PyTypeObject ProjectType = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "geany.project.Project", /* tp_name */ + sizeof(Project), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor) Project_dealloc, /* tp_dealloc */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* tp_print - tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + "Wrapper around a GeanyProject structure.", /* tp_doc */ + 0, 0, 0, 0, 0, 0, 0, 0, /* tp_traverse - tp_members */ + Project_getseters, /* tp_getset */ + 0, 0, 0, 0, 0, /* tp_base - tp_dictoffset */ + (initproc) Project_init, /* tp_init */ + 0, 0, /* tp_alloc - tp_new */ +}; + + +static PyMethodDef ProjectModule_methods[] = { { NULL } }; + + +PyMODINIT_FUNC initproject(void) +{ + PyObject *m; + + ProjectType.tp_new = PyType_GenericNew; + if (PyType_Ready(&ProjectType) < 0) + return; + + m = Py_InitModule3("project", ProjectModule_methods, "Project information"); + + Py_INCREF(&ProjectType); + PyModule_AddObject(m, "Project", (PyObject *)&ProjectType); +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-project.h geany-plugins-1.24+dfsg/geanypy/src/geanypy-project.h --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-project.h 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-project.h 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef GEANYPY_PROJECT_H__ +#define GEANYPY_PROJECT_H__ + +extern PyTypeObject ProjectType; + +typedef struct +{ + PyObject_HEAD + GeanyProject *project; +} Project; + +PyMODINIT_FUNC initproject(void); + +#endif /* GEANYPY_PROJECT_H__ */ diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-scinotification.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-scinotification.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-scinotification.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-scinotification.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,137 @@ +#include "geanypy.h" + + +static void +Notification_dealloc(Notification *self) +{ + Py_XDECREF(self->hdr); + self->ob_type->tp_free((PyObject *) self); +} + + +static int +Notification_init(Notification *self, PyObject *args, PyObject *kwds) +{ + self->notif = NULL; + self->hdr = NULL; + return 0; +} + + +static PyObject * +Notification_get_property(Notification *self, const gchar *prop_name) +{ + g_return_val_if_fail(self != NULL, NULL); + g_return_val_if_fail(prop_name != NULL, NULL); + + if (!self->notif) + { + PyErr_SetString(PyExc_RuntimeError, + "Notification instance not initialized properly"); + return NULL; + } + + if (g_str_equal(prop_name, "nmhdr")) + { + Py_INCREF(self->hdr); + return (PyObject *) self->hdr; + } + else if (g_str_equal(prop_name, "position")) + return PyInt_FromLong((glong) self->notif->position); + else if (g_str_equal(prop_name, "ch")) + return Py_BuildValue("c", self->notif->ch); + else if (g_str_equal(prop_name, "modifiers")) + return PyInt_FromLong((glong) self->notif->modifiers); + else if (g_str_equal(prop_name, "modification_type")) + return PyInt_FromLong((glong) self->notif->modificationType); + else if (g_str_equal(prop_name, "text")) + return PyString_FromString(self->notif->text); + else if (g_str_equal(prop_name, "length")) + return PyInt_FromLong((glong) self->notif->length); + else if (g_str_equal(prop_name, "lines_added")) + return PyInt_FromLong((glong) self->notif->linesAdded); + else if (g_str_equal(prop_name, "message")) + return PyInt_FromLong((glong) self->notif->message); + else if (g_str_equal(prop_name, "w_param")) + return PyLong_FromLong(self->notif->wParam); + else if (g_str_equal(prop_name, "l_param")) + return PyLong_FromLong(self->notif->lParam); + else if (g_str_equal(prop_name, "line")) + return PyInt_FromLong((glong) self->notif->line); + else if (g_str_equal(prop_name, "fold_level_now")) + return PyInt_FromLong((glong) self->notif->foldLevelNow); + else if (g_str_equal(prop_name, "fold_level_prev")) + return PyInt_FromLong((glong) self->notif->foldLevelPrev); + else if (g_str_equal(prop_name, "margin")) + return PyInt_FromLong((glong) self->notif->margin); + else if (g_str_equal(prop_name, "list_type")) + return PyInt_FromLong((glong) self->notif->listType); + else if (g_str_equal(prop_name, "x")) + return PyInt_FromLong((glong) self->notif->x); + else if (g_str_equal(prop_name, "y")) + return PyInt_FromLong((glong) self->notif->y); + else if (g_str_equal(prop_name, "token")) + return PyInt_FromLong((glong) self->notif->token); + else if (g_str_equal(prop_name, "annotation_lines_added")) + return PyInt_FromLong((glong) self->notif->annotationLinesAdded); + else if (g_str_equal(prop_name, "updated")) + return PyInt_FromLong((glong) self->notif->updated); + + Py_RETURN_NONE; +} +GEANYPY_PROPS_READONLY(Notification); + + +static PyGetSetDef Notification_getseters[] = { + GEANYPY_GETSETDEF(Notification, "nmhdr", ""), + GEANYPY_GETSETDEF(Notification, "position", ""), + GEANYPY_GETSETDEF(Notification, "ch", ""), + GEANYPY_GETSETDEF(Notification, "modifiers", ""), + GEANYPY_GETSETDEF(Notification, "modification_type", ""), + GEANYPY_GETSETDEF(Notification, "text", ""), + GEANYPY_GETSETDEF(Notification, "length", ""), + GEANYPY_GETSETDEF(Notification, "lines_added", ""), + GEANYPY_GETSETDEF(Notification, "message", ""), + GEANYPY_GETSETDEF(Notification, "w_param", ""), + GEANYPY_GETSETDEF(Notification, "l_param", ""), + GEANYPY_GETSETDEF(Notification, "line", ""), + GEANYPY_GETSETDEF(Notification, "fold_level_now", ""), + GEANYPY_GETSETDEF(Notification, "fold_level_prev", ""), + GEANYPY_GETSETDEF(Notification, "margin", ""), + GEANYPY_GETSETDEF(Notification, "list_type", ""), + GEANYPY_GETSETDEF(Notification, "x", ""), + GEANYPY_GETSETDEF(Notification, "y", ""), + GEANYPY_GETSETDEF(Notification, "token", ""), + GEANYPY_GETSETDEF(Notification, "annotation_lines_added", ""), + GEANYPY_GETSETDEF(Notification, "updated", ""), + { NULL } +}; + + +PyTypeObject NotificationType = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "geany.scintilla.Notification", /* tp_name */ + sizeof(Notification), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor) Notification_dealloc, /* tp_dealloc */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* tp_print - tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + "Wrapper around a SCNotification structure.", /* tp_doc */ + 0, 0, 0, 0, 0, 0, 0, 0, /* tp_traverse - tp_members */ + Notification_getseters, /* tp_getset */ + 0, 0, 0, 0, 0, /* tp_base - tp_dictoffset */ + (initproc) Notification_init, /* tp_init */ + 0, 0, /* tp_alloc - tp_new */ + +}; + + +Notification *Notification_create_new_from_scintilla_notification(SCNotification *notif) +{ + Notification *self; + self = (Notification *) PyObject_CallObject((PyObject *) &NotificationType, NULL); + self->notif = notif; + self->hdr = NotifyHeader_create_new_from_scintilla_notification(self->notif); + return self; +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-scinotifyheader.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-scinotifyheader.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-scinotifyheader.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-scinotifyheader.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,77 @@ +#include "geanypy.h" + + +static void +NotifyHeader_dealloc(NotifyHeader *self) +{ + self->ob_type->tp_free((PyObject *) self); +} + + +static int +NotifyHeader_init(NotifyHeader *self, PyObject *args, PyObject *kwds) +{ + self->notif = NULL; + return 0; +} + + +static PyObject * +NotifyHeader_get_property(NotifyHeader *self, const gchar *prop_name) +{ + g_return_val_if_fail(self != NULL, NULL); + g_return_val_if_fail(prop_name != NULL, NULL); + + if (!self->notif) + { + PyErr_SetString(PyExc_RuntimeError, + "NotifyHeader instance not initialized properly"); + return NULL; + } + + if (g_str_equal(prop_name, "hwnd_from")) + return PyLong_FromVoidPtr(self->notif->nmhdr.hwndFrom); + else if (g_str_equal(prop_name, "id_from")) + return PyLong_FromLong(self->notif->nmhdr.idFrom); + else if (g_str_equal(prop_name, "code")) + return PyInt_FromLong((glong) self->notif->nmhdr.code); + + Py_RETURN_NONE; +} +GEANYPY_PROPS_READONLY(NotifyHeader); + + +static PyGetSetDef NotifyHeader_getseters[] = { + GEANYPY_GETSETDEF(NotifyHeader, "hwnd_from", ""), + GEANYPY_GETSETDEF(NotifyHeader, "id_from", ""), + GEANYPY_GETSETDEF(NotifyHeader, "code", ""), + { NULL } +}; + + +PyTypeObject NotifyHeaderType = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "geany.scintilla.NotifyHeader", /* tp_name */ + sizeof(NotifyHeader), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor) NotifyHeader_dealloc, /* tp_dealloc */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* tp_print - tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + "Wrapper around a NotifyHeader structure.", /* tp_doc */ + 0, 0, 0, 0, 0, 0, 0, 0, /* tp_traverse - tp_members */ + NotifyHeader_getseters, /* tp_getset */ + 0, 0, 0, 0, 0, /* tp_base - tp_dictoffset */ + (initproc) NotifyHeader_init, /* tp_init */ + 0, 0, /* tp_alloc - tp_new */ + +}; + + +NotifyHeader *NotifyHeader_create_new_from_scintilla_notification(SCNotification *notif) +{ + NotifyHeader *self; + self = (NotifyHeader *) PyObject_CallObject((PyObject *) &NotifyHeaderType, NULL); + self->notif = notif; + return self; +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-scintilla.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-scintilla.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-scintilla.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-scintilla.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,1006 @@ +#include "geanypy.h" + + +/* Bail-out when ScintillaObject being wrapped is NULL. */ +#define SCI_RET_IF_FAIL(obj) { \ + if (!self->sci) { \ + PyErr_SetString(PyExc_RuntimeError, \ + "Scintilla instance not initialized properly."); \ + Py_RETURN_NONE; } } + + +static void +Scintilla_dealloc(Scintilla *self) +{ + self->ob_type->tp_free((PyObject *) self); +} + + +static int +Scintilla_init(Scintilla *self) +{ + self->sci = NULL; + return 0; +} + + +static PyObject * +Scintilla_get_property(Scintilla *self, const gchar *prop_name) +{ + g_return_val_if_fail(self != NULL, NULL); + g_return_val_if_fail(prop_name != NULL, NULL); + + if (!self->sci) + { + PyErr_SetString(PyExc_RuntimeError, + "Scintilla instance not initialized properly"); + return NULL; + } + + if (g_str_equal(prop_name, "widget")) + return pygobject_new(G_OBJECT(self->sci)); + + Py_RETURN_NONE; +} +GEANYPY_PROPS_READONLY(Scintilla); + + +static PyObject * +Scintilla_delete_marker_at_line(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint line_num, marker; + static gchar *kwlist[] = { "line_number", "marker", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "ii", kwlist, &line_num, &marker)) + sci_delete_marker_at_line(self->sci, line_num, marker); + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_end_undo_action(Scintilla *self) +{ + SCI_RET_IF_FAIL(self); + sci_end_undo_action(self->sci); + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_ensure_line_is_visible(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint line = -1; + static gchar *kwlist[] = { "line", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "|i", kwlist, &line)) + { + if (line == -1) + line = sci_get_current_line(self->sci); + sci_ensure_line_is_visible(self->sci, line); + } + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_find_matching_brace(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint pos, match_pos; + static gchar *kwlist[] = { "pos", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &pos)) + { + match_pos = sci_find_matching_brace(self->sci, pos); + return Py_BuildValue("i", match_pos); + } + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_find_text(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint pos = -1, flags = 0; + glong start_chr = 0, end_chr = 0; + gchar *search_text; + struct Sci_TextToFind ttf = { { 0 } }; + static gchar *kwlist[] = { "text", "flags", "start_char", "end_char", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s|ill", kwlist, + &search_text, &flags, &start_chr, &end_chr)) + { + ttf.chrg.cpMin = start_chr; + ttf.chrg.cpMax = end_chr; + ttf.lpstrText = search_text; + pos = sci_find_text(self->sci, flags, &ttf); + if (pos > -1) + return Py_BuildValue("ll", ttf.chrgText.cpMin, ttf.chrgText.cpMax); + } + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_get_char_at(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint pos; + gchar chr; + static gchar *kwlist[] = { "pos", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &pos)) + { + chr = sci_get_char_at(self->sci, pos); + return PyString_FromFormat("%c", chr); + } + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_get_col_from_position(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint pos, col; + static gchar *kwlist[] = { "pos", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &pos)) + { + col = sci_get_col_from_position(self->sci, pos); + return Py_BuildValue("i", col); + } + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_get_contents(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint len = -1; + gchar *text; + PyObject *py_text; + static gchar *kwlist[] = { "len", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "|i", kwlist, &len)) + { + if (len == -1) + len = sci_get_length(self->sci) + 1; + text = sci_get_contents(self->sci, len); + if (text == NULL) + Py_RETURN_NONE; + py_text = PyString_FromString(text); + g_free(text); + return py_text; + } + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_get_contents_range(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint start = -1, end = -1; + gchar *text; + PyObject *py_text; + static gchar *kwlist[] = { "start", "end", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "|ii", kwlist, &start, &end)) + { + if (start == -1) + start = 0; + if (end == -1) + end = sci_get_length(self->sci) + 1; + text = sci_get_contents_range(self->sci, start, end); + if (text == NULL) + Py_RETURN_NONE; + py_text = PyString_FromString(text); + g_free(text); + return py_text; + } + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_get_current_line(Scintilla *self) +{ + gint line; + SCI_RET_IF_FAIL(self); + line = sci_get_current_line(self->sci); + return Py_BuildValue("i", line); +} + +static PyObject * +Scintilla_get_current_position(Scintilla *self) +{ + gint pos; + SCI_RET_IF_FAIL(self); + pos = sci_get_current_position(self->sci); + return Py_BuildValue("i", pos); +} + + +static PyObject * +Scintilla_get_length(Scintilla *self) +{ + gint len; + SCI_RET_IF_FAIL(self); + len = sci_get_length(self->sci); + return Py_BuildValue("i", len); +} + + +static PyObject * +Scintilla_get_line(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint line_num = -1; + gchar *text; + PyObject *py_text; + static gchar *kwlist[] = { "line_num", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "|i", kwlist, &line_num)) + { + if (line_num == -1) + line_num = sci_get_current_line(self->sci); + text = sci_get_line(self->sci, line_num); + if (text == NULL) + Py_RETURN_NONE; + py_text = PyString_FromString(text); + g_free(text); + return py_text; + } + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_get_line_count(Scintilla *self) +{ + gint line_count; + SCI_RET_IF_FAIL(self); + line_count = sci_get_line_count(self->sci); + return Py_BuildValue("i", line_count); +} + + +static PyObject * +Scintilla_get_line_end_position(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint line = -1, line_end_pos; + static gchar *kwlist[] = { "line", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "|i", kwlist, &line)) + { + if (line == -1) + line = sci_get_current_line(self->sci); + line_end_pos = sci_get_line_end_position(self->sci, line); + return Py_BuildValue("i", line_end_pos); + } + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_get_line_from_position(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint line, pos; + static gchar *kwlist[] = { "pos", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "|i", kwlist, &pos)) + { + if (pos == -1) + pos = sci_get_current_position(self->sci); + line = sci_get_line_from_position(self->sci, pos); + return Py_BuildValue("i", line); + } + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_get_line_indentation(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint line = -1, width; + static gchar *kwlist[] = { "line", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "|i", kwlist, &line)) + { + if (line == -1) + line = sci_get_current_line(self->sci); + width = sci_get_line_indentation(self->sci, line); + return Py_BuildValue("i", width); + } + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_get_line_is_visible(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint line = -1; + gboolean visible; + static gchar *kwlist[] = { "line", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "|i", kwlist, &line)) + { + if (line == -1) + line = sci_get_current_line(self->sci); + visible = sci_get_line_is_visible(self->sci, line); + if (visible) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_get_line_length(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint line = -1, length; + static gchar *kwlist[] = { "line", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "|i", kwlist, &line)) + { + if (line == -1) + line = sci_get_current_line(self->sci); + length = sci_get_line_length(self->sci, line); + return Py_BuildValue("i", length); + } + + Py_RETURN_NONE; +} + + + +static PyObject * +Scintilla_get_position_from_line(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint line = -1, pos; + static gchar *kwlist[] = { "line", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "|i", kwlist, &line)) + { + if (line == -1) + line = sci_get_current_line(self->sci); + pos = sci_get_position_from_line(self->sci, line); + return Py_BuildValue("i", pos); + } + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_get_selected_text_length(Scintilla *self) +{ + gint len; + SCI_RET_IF_FAIL(self); + len = sci_get_selected_text_length(self->sci); + return Py_BuildValue("i", len); +} + + +static PyObject * +Scintilla_get_selection_contents(Scintilla *self) +{ + gchar *text; + PyObject *py_text; + SCI_RET_IF_FAIL(self); + text = sci_get_selection_contents(self->sci); + if (text == NULL) + Py_RETURN_NONE; + py_text = PyString_FromString(text); + g_free(text); + return py_text; +} + + +static PyObject * +Scintilla_get_selection_end(Scintilla *self) +{ + gint pos; + SCI_RET_IF_FAIL(self); + pos = sci_get_selection_end(self->sci); + return Py_BuildValue("i", pos); +} + + +static PyObject * +Scintilla_get_selection_mode(Scintilla *self) +{ + gint mode; + SCI_RET_IF_FAIL(self); + mode = sci_get_selection_mode(self->sci); + return Py_BuildValue("i", mode); +} + + +static PyObject * +Scintilla_get_selection_start(Scintilla *self) +{ + gint pos; + SCI_RET_IF_FAIL(self); + pos = sci_get_selection_start(self->sci); + return Py_BuildValue("i", pos); +} + + +static PyObject * +Scintilla_get_style_at(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint pos = -1, style; + static gchar *kwlist[] = { "pos", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "|i", kwlist, &pos)) + { + if (pos == -1) + pos = sci_get_current_position(self->sci); + style = sci_get_style_at(self->sci, pos); + return Py_BuildValue("i", style); + } + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_get_tab_width(Scintilla *self) +{ + gint width; + SCI_RET_IF_FAIL(self); + width = sci_get_tab_width(self->sci); + return Py_BuildValue("i", width); +} + + +static PyObject * +Scintilla_goto_line(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint line, unfold; + static gchar *kwlist[] = { "line", "unfold", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "ii", kwlist, &line, &unfold)) + sci_goto_line(self->sci, line, (gboolean) unfold); + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_has_selection(Scintilla *self) +{ + SCI_RET_IF_FAIL(self); + if (sci_has_selection(self->sci)) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; +} + + +static PyObject * +Scintilla_indicator_clear(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint pos, len; + static gchar *kwlist[] = { "pos", "len", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "ii", kwlist, &pos, &len)) + sci_indicator_clear(self->sci, pos, len); + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_indicator_set(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint indic; + static gchar *kwlist[] = { "indic", NULL }; + + SCI_RET_IF_FAIL(self); + if (PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &indic)) + sci_indicator_set(self->sci, indic); + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_insert_text(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint pos = -1; + gchar *text; + static gchar *kwlist[] = { "text", "pos", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s|i", kwlist, &text, &pos)) + { + if (pos == -1) + pos = sci_get_current_position(self->sci); + if (text != NULL) + sci_insert_text(self->sci, pos, text); + } + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_is_marker_set_at_line(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gboolean result; + gint line, marker; + static gchar *kwlist[] = { "line", "marker", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "ii", kwlist, &line, &marker)) + { + result = sci_is_marker_set_at_line(self->sci, line, marker); + if (result) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_replace_sel(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gchar *text; + static gchar *kwlist[] = { "text", NULL }; + SCI_RET_IF_FAIL(self); + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &text)) + sci_replace_sel(self->sci, text); + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_scroll_caret(Scintilla *self) +{ + SCI_RET_IF_FAIL(self); + sci_scroll_caret(self->sci); + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_send_command(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint cmd; + static gchar *kwlist[] = { "cmd", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &cmd)) + sci_send_command(self->sci, cmd); + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_set_current_position(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint pos, stc = FALSE; + static gchar *kwlist[] = { "pos", "scroll_to_caret", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "i|i", kwlist, &pos, &stc)) + sci_set_current_position(self->sci, pos, stc); + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_set_font(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint style, size; + gchar *font; + static gchar *kwlist[] = { "style", "font", "size", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "isi", kwlist, &style, &font, &size)) + sci_set_font(self->sci, style, font, size); + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_set_line_indentation(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint line, indent; + static gchar *kwlist[] = { "line", "indent", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "ii", kwlist, &line, &indent)) + sci_set_line_indentation(self->sci, line, indent); + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_set_marker_at_line(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint line, marker; + static gchar *kwlist[] = { "line", "marker", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "ii", kwlist, &line, &marker)) + sci_set_marker_at_line(self->sci, line, marker); + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_set_selection_end(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint pos; + static gchar *kwlist[] = { "pos", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &pos)) + sci_set_selection_end(self->sci, pos); + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_set_selection_mode(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint mode; + static gchar *kwlist[] = { "mode", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &mode)) + sci_set_selection_mode(self->sci, mode); + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_set_selection_start(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint pos; + static gchar *kwlist[] = { "pos", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &pos)) + sci_set_selection_start(self->sci, pos); + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_set_text(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gchar *text; + static gchar *kwlist[] = { "text", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &text)) + sci_set_text(self->sci, text); + + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_start_undo_action(Scintilla *self) +{ + SCI_RET_IF_FAIL(self); + sci_start_undo_action(self->sci); + Py_RETURN_NONE; +} + + +static PyObject * +Scintilla_send_message(Scintilla *self, PyObject *args, PyObject *kwargs) +{ + gint msg; + glong uptr = 0, sptr = 0, ret; + static gchar *kwlist[] = { "msg", "lparam", "wparam", NULL }; + + SCI_RET_IF_FAIL(self); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "i|ll", kwlist, &msg, &uptr, &sptr)) + { + ret = scintilla_send_message(self->sci, msg, uptr, sptr); + return Py_BuildValue("l", ret); + } + + Py_RETURN_NONE; +} + + +static PyMethodDef Scintilla_methods[] = { + { "delete_marker_at_line", (PyCFunction) Scintilla_delete_marker_at_line, METH_KEYWORDS, + "Deletes a line marker." }, + { "end_undo_action", (PyCFunction) Scintilla_end_undo_action, METH_NOARGS, + "Ends grouping a set of edits together as one Undo action." }, + { "ensure_line_is_visible", (PyCFunction) Scintilla_ensure_line_is_visible, METH_KEYWORDS, + "Makes line visible (folding may have hidden it)." }, + { "find_matching_brace", (PyCFunction) Scintilla_find_matching_brace, METH_KEYWORDS, + "Finds a matching brace at pos." }, + { "find_text", (PyCFunction) Scintilla_find_text, METH_KEYWORDS, + "Finds text in the document." }, + { "get_char_at", (PyCFunction) Scintilla_get_char_at, METH_KEYWORDS, + "Gets the character at a position." }, + { "get_col_from_position", (PyCFunction) Scintilla_get_col_from_position, METH_KEYWORDS, + "Gets the column number relative to the start of the line that " + "pos is on." }, + { "get_contents", (PyCFunction) Scintilla_get_contents, METH_KEYWORDS, + "Gets all text inside a given text length." }, + { "get_contents_range", (PyCFunction) Scintilla_get_contents_range, METH_KEYWORDS, + "Gets text between start and end." }, + { "get_current_line", (PyCFunction) Scintilla_get_current_line, METH_NOARGS, + "Gets current line number." }, + { "get_current_position", (PyCFunction) Scintilla_get_current_position, METH_NOARGS, + "Gets the cursor position." }, + { "get_length", (PyCFunction) Scintilla_get_length, METH_NOARGS, + "Gets the length of all text." }, + { "get_line", (PyCFunction) Scintilla_get_line, METH_KEYWORDS, + "Gets line contents." }, + { "get_line_count", (PyCFunction) Scintilla_get_line_count, METH_NOARGS, + "Gets the total number of lines." }, + { "get_line_end_position", (PyCFunction) Scintilla_get_line_end_position, METH_KEYWORDS, + "Gets the position at the end of a line." }, + { "get_line_from_position", (PyCFunction) Scintilla_get_line_from_position, METH_KEYWORDS, + "Gets the line number from pos." }, + { "get_line_indentation", (PyCFunction) Scintilla_get_line_indentation, METH_KEYWORDS, + "Gets the indentation width of a line." }, + { "get_line_is_visible", (PyCFunction) Scintilla_get_line_is_visible, METH_KEYWORDS, + "Checks if a line is visible (folding may have hidden it)." }, + { "get_line_length", (PyCFunction) Scintilla_get_line_length, METH_KEYWORDS, + "Gets line length." }, + { "get_position_from_line", (PyCFunction) Scintilla_get_position_from_line, METH_KEYWORDS, + "Gets the position for the start of line." }, + { "get_selected_text_length", (PyCFunction) Scintilla_get_selected_text_length, METH_NOARGS, + "Gets selected text length."}, + { "get_selection_contents", (PyCFunction) Scintilla_get_selection_contents, METH_NOARGS, + "Gets selected text." }, + { "get_selection_end", (PyCFunction) Scintilla_get_selection_end, METH_NOARGS, + "Gets the selection end position." }, + { "get_selection_mode", (PyCFunction) Scintilla_get_selection_mode, METH_NOARGS, + "Gets the selection mode." }, + { "get_selection_start", (PyCFunction) Scintilla_get_selection_start, METH_NOARGS, + "Gets the selection start position." }, + { "get_style_at", (PyCFunction) Scintilla_get_style_at, METH_KEYWORDS, + "Gets the style ID at pos." }, + { "get_tab_width", (PyCFunction) Scintilla_get_tab_width, METH_NOARGS, + "Gets display tab width (this is not indent width, see IndentPrefs)." }, + { "goto_line", (PyCFunction) Scintilla_goto_line, METH_KEYWORDS, + "Jumps to the specified line in the document." }, + { "has_selection", (PyCFunction) Scintilla_has_selection, METH_NOARGS, + "Checks if there's a selection." }, + { "indicator_clear", (PyCFunction) Scintilla_indicator_clear, METH_KEYWORDS, + "Clears the currently set indicator from a range of text." }, + { "indicator_set", (PyCFunction) Scintilla_indicator_set, METH_KEYWORDS, + "Sets the current indicator." }, + { "insert_text", (PyCFunction) Scintilla_insert_text, METH_KEYWORDS, + "Inserts text at pos." }, + { "is_marker_set_at_line", (PyCFunction) Scintilla_is_marker_set_at_line, METH_KEYWORDS, + "Checks if a line has a marker set." }, + { "replace_sel", (PyCFunction) Scintilla_replace_sel, METH_KEYWORDS, + "Replaces selection." }, + { "scroll_caret", (PyCFunction) Scintilla_scroll_caret, METH_NOARGS, + "Scrolls the cursor in view." }, + { "send_command", (PyCFunction) Scintilla_send_command, METH_KEYWORDS, + "Sends Scintilla commands without any parameters (see send_message function)." }, + { "set_current_position", (PyCFunction) Scintilla_set_current_position, METH_KEYWORDS, + "Sets the cursor position." }, + { "set_font", (PyCFunction) Scintilla_set_font, METH_KEYWORDS, + "Sets the font and size for a particular style." }, + { "set_line_indentation", (PyCFunction) Scintilla_set_line_indentation, METH_KEYWORDS, + "Sets the indentation of a line." }, + { "set_marker_at_line", (PyCFunction) Scintilla_set_marker_at_line, METH_KEYWORDS, + "Sets a line marker." }, + { "set_selection_end", (PyCFunction) Scintilla_set_selection_end, METH_KEYWORDS, + "Sets the selection end position." }, + { "set_selection_mode", (PyCFunction) Scintilla_set_selection_mode, METH_KEYWORDS, + "Sets selection mode." }, + { "set_selection_start", (PyCFunction) Scintilla_set_selection_start, METH_KEYWORDS, + "Sets the selection start position." }, + { "set_text", (PyCFunction) Scintilla_set_text, METH_KEYWORDS, + "Sets all text." }, + { "start_undo_action", (PyCFunction) Scintilla_start_undo_action, METH_NOARGS, + "Begins grouping a set of edits together as one Undo action." }, + { "send_message", (PyCFunction) Scintilla_send_message, METH_KEYWORDS, + "Send a message to the Scintilla widget." }, + { NULL } +}; + + +static PyGetSetDef Scintilla_getseters[] = { + GEANYPY_GETSETDEF(Scintilla, "widget", + "Gets the ScintillaObject as a GTK+ widget."), + { NULL } +}; + + +static PyTypeObject ScintillaType = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "geany.scintilla.Scintilla", /* tp_name */ + sizeof(Scintilla), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor) Scintilla_dealloc, /* tp_dealloc */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* tp_print - tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + "Wrapper around a ScintillaObject structure.", /* tp_doc */ + 0, 0, 0, 0, 0, 0, /* tp_traverse - tp_iternext */ + Scintilla_methods, /* tp_methods */ + 0, /* tp_members */ + Scintilla_getseters, /* tp_getset */ + 0, 0, 0, 0, 0, /* tp_base - tp_dictoffset */ + (initproc) Scintilla_init, /* tp_init */ + 0, 0, /* tp_alloc - tp_new */ +}; + +static PyMethodDef ScintillaModule_methods[] = { { NULL } }; + + +PyMODINIT_FUNC initscintilla(void) +{ + PyObject *m; + + ScintillaType.tp_new = PyType_GenericNew; + if (PyType_Ready(&ScintillaType) < 0) + return; + + NotificationType.tp_new = PyType_GenericNew; + if (PyType_Ready(&NotificationType) < 0) + return; + + NotifyHeaderType.tp_new = PyType_GenericNew; + if (PyType_Ready(&NotifyHeaderType) < 0) + return; + + m = Py_InitModule("scintilla", ScintillaModule_methods); + + Py_INCREF(&ScintillaType); + PyModule_AddObject(m, "Scintilla", (PyObject *)&ScintillaType); + + Py_INCREF(&NotificationType); + PyModule_AddObject(m, "Notification", (PyObject *)&NotificationType); + + Py_INCREF(&NotifyHeaderType); + PyModule_AddObject(m, "NotifyHeader", (PyObject *)&NotifyHeaderType); + + + PyModule_AddIntConstant(m, "FLAG_WHOLE_WORD", SCFIND_WHOLEWORD); + PyModule_AddIntConstant(m, "FLAG_MATCH_CASE", SCFIND_MATCHCASE); + PyModule_AddIntConstant(m, "FLAG_WORD_START", SCFIND_WORDSTART); + PyModule_AddIntConstant(m, "FLAG_REGEXP", SCFIND_REGEXP); + PyModule_AddIntConstant(m, "FLAG_POSIX", SCFIND_POSIX); + + PyModule_AddIntConstant(m, "UPDATE_CONTENT", SC_UPDATE_CONTENT); + PyModule_AddIntConstant(m, "UPDATE_SELECTION", SC_UPDATE_SELECTION); + PyModule_AddIntConstant(m, "UPDATE_V_SCROLL", SC_UPDATE_V_SCROLL); + PyModule_AddIntConstant(m, "UPDATE_H_SCROLL", SC_UPDATE_H_SCROLL); + + PyModule_AddIntConstant(m, "MOD_INSERT_TEXT", SC_MOD_INSERTTEXT); + PyModule_AddIntConstant(m, "MOD_DELETE_TEXT", SC_MOD_DELETETEXT); + PyModule_AddIntConstant(m, "MOD_CHANGE_STYLE", SC_MOD_CHANGESTYLE); + PyModule_AddIntConstant(m, "MOD_CHANGE_FOLD", SC_MOD_CHANGEFOLD); + PyModule_AddIntConstant(m, "PERFORMED_USER", SC_PERFORMED_USER); + PyModule_AddIntConstant(m, "PERFORMED_UNDO", SC_PERFORMED_UNDO); + PyModule_AddIntConstant(m, "PERFORMED_REDO", SC_PERFORMED_REDO); + PyModule_AddIntConstant(m, "MULTI_STEP_UNDO_REDO", SC_MULTISTEPUNDOREDO); + PyModule_AddIntConstant(m, "LAST_STEP_IN_UNDO_REDO", SC_LASTSTEPINUNDOREDO); + PyModule_AddIntConstant(m, "MOD_CHANGE_MARKER", SC_MOD_CHANGEMARKER); + PyModule_AddIntConstant(m, "MOD_BEFORE_INSERT", SC_MOD_BEFOREINSERT); + PyModule_AddIntConstant(m, "MOD_BEFORE_DELETE", SC_MOD_BEFOREDELETE); + PyModule_AddIntConstant(m, "MOD_CHANGE_INDICATOR", SC_MOD_CHANGEINDICATOR); + PyModule_AddIntConstant(m, "MOD_CHANGE_LINE_STATE", SC_MOD_CHANGELINESTATE); + PyModule_AddIntConstant(m, "MOD_LEXER_STATE", SC_MOD_LEXERSTATE); + PyModule_AddIntConstant(m, "MOD_CHANGE_MARGIN", SC_MOD_CHANGEMARGIN); + PyModule_AddIntConstant(m, "MOD_CHANGE_ANNOTATION", SC_MOD_CHANGEANNOTATION); + PyModule_AddIntConstant(m, "MULTILINE_UNDO_REDO", SC_MULTILINEUNDOREDO); + PyModule_AddIntConstant(m, "START_ACTION", SC_STARTACTION); + PyModule_AddIntConstant(m, "MOD_CONTAINER", SC_MOD_CONTAINER); + PyModule_AddIntConstant(m, "MOD_EVENT_MASK_ALL", SC_MODEVENTMASKALL); + + PyModule_AddIntConstant(m, "STYLE_NEEDED", SCN_STYLENEEDED); + PyModule_AddIntConstant(m, "CHAR_ADDED", SCN_CHARADDED); + PyModule_AddIntConstant(m, "SAVE_POINT_REACHED", SCN_SAVEPOINTREACHED); + PyModule_AddIntConstant(m, "SAVE_POINT_LEFT", SCN_SAVEPOINTLEFT); + PyModule_AddIntConstant(m, "MODIFY_ATTEMPT_RO", SCN_MODIFYATTEMPTRO); + PyModule_AddIntConstant(m, "KEY", SCN_KEY); + PyModule_AddIntConstant(m, "DOUBLE_CLICK", SCN_DOUBLECLICK); + PyModule_AddIntConstant(m, "UPDATE_UI", SCN_UPDATEUI); + PyModule_AddIntConstant(m, "MODIFIED", SCN_MODIFIED); + PyModule_AddIntConstant(m, "MACRO_RECORD", SCN_MACRORECORD); + PyModule_AddIntConstant(m, "MARGIN_CLICK", SCN_MARGINCLICK); + PyModule_AddIntConstant(m, "NEED_SHOWN", SCN_NEEDSHOWN); + PyModule_AddIntConstant(m, "PAINTED", SCN_PAINTED); + PyModule_AddIntConstant(m, "USER_LIST_SELECTION", SCN_USERLISTSELECTION); + PyModule_AddIntConstant(m, "URI_DROPPED", SCN_URIDROPPED); + PyModule_AddIntConstant(m, "DWELL_START", SCN_DWELLSTART); + PyModule_AddIntConstant(m, "DWELL_END", SCN_DWELLEND); + PyModule_AddIntConstant(m, "ZOOM", SCN_ZOOM); + PyModule_AddIntConstant(m, "HOT_SPOT_CLICK", SCN_HOTSPOTCLICK); + PyModule_AddIntConstant(m, "HOT_SPOT_DOUBLE_CLICK", SCN_HOTSPOTDOUBLECLICK); + PyModule_AddIntConstant(m, "CALL_TIP_CLICK", SCN_CALLTIPCLICK); + PyModule_AddIntConstant(m, "AUTO_C_SELECTION", SCN_AUTOCSELECTION); + PyModule_AddIntConstant(m, "INDICATOR_CLICK", SCN_INDICATORCLICK); + PyModule_AddIntConstant(m, "INDICATOR_RELEASE", SCN_INDICATORRELEASE); + PyModule_AddIntConstant(m, "AUTOC_CANCELLED", SCN_AUTOCCANCELLED); + PyModule_AddIntConstant(m, "AUTOC_CHAR_DELETED", SCN_AUTOCCHARDELETED); + PyModule_AddIntConstant(m, "HOT_SPOT_RELEASE_CLICK", SCN_HOTSPOTRELEASECLICK); +} + + +Scintilla *Scintilla_create_new_from_scintilla(ScintillaObject *sci) +{ + Scintilla *self; + self = (Scintilla *) PyObject_CallObject((PyObject *) &ScintillaType, NULL); + self->sci = sci; + return self; +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-scintilla.h geany-plugins-1.24+dfsg/geanypy/src/geanypy-scintilla.h --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-scintilla.h 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-scintilla.h 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,32 @@ +#ifndef GEANYPY_SCINTILLA_H__ +#define GEANYPY_SCINTILLA_H__ + +extern PyTypeObject NotificationType; +extern PyTypeObject NotifyHeaderType; + +typedef struct +{ + PyObject_HEAD + ScintillaObject *sci; +} Scintilla; + +typedef struct +{ + PyObject_HEAD + SCNotification *notif; +} NotifyHeader; + +typedef struct +{ + PyObject_HEAD + SCNotification *notif; + NotifyHeader *hdr; +} Notification; + + +PyMODINIT_FUNC init_geany_scintilla(void); +Scintilla *Scintilla_create_new_from_scintilla(ScintillaObject *sci); +Notification *Notification_create_new_from_scintilla_notification(SCNotification *notif); +NotifyHeader *NotifyHeader_create_new_from_scintilla_notification(SCNotification *notif); + +#endif /* GEANYPY_SCINTILLA_H__ */ diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-search.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-search.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-search.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-search.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,116 @@ +#include "geanypy.h" + + +typedef struct +{ + PyObject_HEAD + GeanySearchPrefs *search_prefs; +} SearchPrefs; + + +static void +SearchPrefs_dealloc(SearchPrefs *self) +{ + g_return_if_fail(self != NULL); + self->ob_type->tp_free((PyObject *) self); +} + + +static int +SearchPrefs_init(SearchPrefs *self) +{ + g_return_val_if_fail(self != NULL, -1); + self->search_prefs = geany_data->search_prefs; + return 0; +} + + +static PyObject * +SearchPrefs_get_property(SearchPrefs *self, const gchar *prop_name) +{ + g_return_val_if_fail(self != NULL, NULL); + g_return_val_if_fail(prop_name != NULL, NULL); + + if (!self->search_prefs) + { + PyErr_SetString(PyExc_RuntimeError, + "SearchPrefs instance not initialized properly"); + return NULL; + } + + if (g_str_equal(prop_name, "use_current_word")) + { + if (self->search_prefs->use_current_word) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + + Py_RETURN_NONE; +} +GEANYPY_PROPS_READONLY(SearchPrefs); + + +static PyGetSetDef SearchPrefs_getseters[] = { + GEANYPY_GETSETDEF(SearchPrefs, "use_current_word", + "Use current word for default search text."), + { NULL } +}; + + +static PyTypeObject SearchPrefsType = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "geany.search.SearchPrefs", /* tp_name */ + sizeof(SearchPrefs), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor) SearchPrefs_dealloc, /* tp_dealloc */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* tp_print - tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + "Wrapper around a GeanySearchPrefs structure.", /* tp_doc */ + 0, 0, 0, 0, 0, 0, 0, 0, /* tp_traverse - tp_members */ + SearchPrefs_getseters, /* tp_getset */ + 0, 0, 0, 0, 0, /* tp_base - tp_dictoffset */ + (initproc) SearchPrefs_init, /* tp_init */ + 0, 0, /* tp_alloc - tp_new */ +}; + + +static PyObject * +Search_show_find_in_files_dialog(PyObject *self, PyObject *args, PyObject *kwargs) +{ + gchar *dir = NULL; + static gchar *kwlist[] = { "init_dir", NULL }; + + PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &dir); + search_show_find_in_files_dialog(dir); + + Py_RETURN_NONE; +} + + +static PyMethodDef SearchPrefsModule_methods[] = { + { "show_find_in_files_dialog", + (PyCFunction) Search_show_find_in_files_dialog, + METH_KEYWORDS, + "Shows the Find in Files dialog, taking an optional directory " + "to search in for the dialog or if not specified then uses " + "the current document's directory." }, + { NULL } +}; + + +PyMODINIT_FUNC initsearch(void) +{ + PyObject *m; + + SearchPrefsType.tp_new = PyType_GenericNew; + if (PyType_Ready(&SearchPrefsType) < 0) + return; + + m = Py_InitModule3("search", SearchPrefsModule_methods, + "Search preferences and information."); + + Py_INCREF(&SearchPrefsType); + PyModule_AddObject(m, "SearchPrefs", (PyObject *) &SearchPrefsType); +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-signalmanager.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-signalmanager.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-signalmanager.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-signalmanager.c 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,243 @@ +#include "geanypy.h" + +struct _SignalManager +{ + GeanyPlugin *geany_plugin; + PyObject *py_obj; + GObject *obj; +}; + + +static void signal_manager_connect_signals(SignalManager *man); + +static void on_build_start(GObject *geany_object, SignalManager *man); +static void on_document_activate(GObject *geany_object, GeanyDocument *doc, SignalManager *man); +static void on_document_before_save(GObject *geany_object, GeanyDocument *doc, SignalManager *man); +static void on_document_close(GObject *geany_object, GeanyDocument *doc, SignalManager *man); +static void on_document_filetype_set(GObject *geany_object, GeanyDocument *doc, GeanyFiletype *filetype_old, SignalManager *man); +static void on_document_new(GObject *geany_object, GeanyDocument *doc, SignalManager *man); +static void on_document_open(GObject *geany_object, GeanyDocument *doc, SignalManager *man); +static void on_document_reload(GObject *geany_object, GeanyDocument *doc, SignalManager *man); +static void on_document_save(GObject *geany_object, GeanyDocument *doc, SignalManager *man); +static gboolean on_editor_notify(GObject *geany_object, GeanyEditor *editor, SCNotification *nt, SignalManager *man); +static void on_geany_startup_complete(GObject *geany_object, SignalManager *man); +static void on_project_close(GObject *geany_object, SignalManager *man); +static void on_project_dialog_confirmed(GObject *geany_object, GtkWidget *notebook, SignalManager *man); +static void on_project_dialog_open(GObject *geany_object, GtkWidget *notebook, SignalManager *man); +static void on_project_dialog_close(GObject *geany_object, GtkWidget *notebook, SignalManager *man); +static void on_project_open(GObject *geany_object, GKeyFile *config, SignalManager *man); +static void on_project_save(GObject *geany_object, GKeyFile *config, SignalManager *man); +static void on_update_editor_menu(GObject *geany_object, const gchar *word, gint pos, GeanyDocument *doc, SignalManager *man); + + +SignalManager *signal_manager_new(GeanyPlugin *geany_plugin) +{ + SignalManager *man; + PyObject *module; + + man = g_new0(SignalManager, 1); + + man->geany_plugin = geany_plugin; + man->py_obj = NULL; + man->obj = NULL; + + module = PyImport_ImportModule("geany"); + if (!module) + { + if (PyErr_Occurred()) + PyErr_Print(); + g_warning("Unable to import 'geany' module"); + g_free(man); + return NULL; + } + + man->py_obj = PyObject_GetAttrString(module, "signals"); + Py_DECREF(module); + if (!man->py_obj) + { + if (PyErr_Occurred()) + PyErr_Print(); + g_warning("Unable to get 'SignalManager' instance from 'geany' module."); + g_free(man); + return NULL; + } + man->obj = pygobject_get(man->py_obj); + + signal_manager_connect_signals(man); + + return man; +} + + +void signal_manager_free(SignalManager *man) +{ + g_return_if_fail(man != NULL); + Py_XDECREF(man->py_obj); + g_free(man); +} + +GObject *signal_manager_get_gobject(SignalManager *signal_manager) +{ + return G_OBJECT(signal_manager->obj); +} + + +static void signal_manager_connect_signals(SignalManager *man) +{ + plugin_signal_connect(geany_plugin, NULL, "build-start", TRUE, G_CALLBACK(on_build_start), man); + plugin_signal_connect(geany_plugin, NULL, "document-activate", TRUE, G_CALLBACK(on_document_activate), man); + plugin_signal_connect(geany_plugin, NULL, "document-before-save", TRUE, G_CALLBACK(on_document_before_save), man); + plugin_signal_connect(geany_plugin, NULL, "document-close", TRUE, G_CALLBACK(on_document_close), man); + plugin_signal_connect(geany_plugin, NULL, "document-filetype-set", TRUE, G_CALLBACK(on_document_filetype_set), man); + plugin_signal_connect(geany_plugin, NULL, "document-new", TRUE, G_CALLBACK(on_document_new), man); + plugin_signal_connect(geany_plugin, NULL, "document-open", TRUE, G_CALLBACK(on_document_open), man); + plugin_signal_connect(geany_plugin, NULL, "document-reload", TRUE, G_CALLBACK(on_document_reload), man); + plugin_signal_connect(geany_plugin, NULL, "document-save", TRUE, G_CALLBACK(on_document_save), man); + plugin_signal_connect(geany_plugin, NULL, "editor-notify", TRUE, G_CALLBACK(on_editor_notify), man); + plugin_signal_connect(geany_plugin, NULL, "geany-startup-complete", TRUE, G_CALLBACK(on_geany_startup_complete), man); + plugin_signal_connect(geany_plugin, NULL, "project-close", TRUE, G_CALLBACK(on_project_close), man); + plugin_signal_connect(geany_plugin, NULL, "project-dialog-confirmed", TRUE, G_CALLBACK(on_project_dialog_confirmed), man); + plugin_signal_connect(geany_plugin, NULL, "project-dialog-open", TRUE, G_CALLBACK(on_project_dialog_open), man); + plugin_signal_connect(geany_plugin, NULL, "project-dialog-close", TRUE, G_CALLBACK(on_project_dialog_close), man); + plugin_signal_connect(geany_plugin, NULL, "project-open", TRUE, G_CALLBACK(on_project_open), man); + plugin_signal_connect(geany_plugin, NULL, "project-save", TRUE, G_CALLBACK(on_project_save), man); + plugin_signal_connect(geany_plugin, NULL, "update-editor-menu", TRUE, G_CALLBACK(on_update_editor_menu), man); +} + +static void on_build_start(GObject *geany_object, SignalManager *man) +{ + g_signal_emit_by_name(man->obj, "build-start"); +} + + +static void on_document_event(GObject *geany_object, GeanyDocument *doc, SignalManager *man, const gchar *signal_name) +{ + PyObject *py_doc = (PyObject *) Document_create_new_from_geany_document(doc); + g_signal_emit_by_name(man->obj, signal_name, py_doc); + Py_XDECREF(py_doc); +} + + +static void on_document_activate(GObject *geany_object, GeanyDocument *doc, SignalManager *man) +{ + on_document_event(geany_object, doc, man, "document-activate"); +} + + +static void on_document_before_save(GObject *geany_object, GeanyDocument *doc, SignalManager *man) +{ + on_document_event(geany_object, doc, man, "document-before-save"); +} + + +static void on_document_close(GObject *geany_object, GeanyDocument *doc, SignalManager *man) +{ + on_document_event(geany_object, doc, man, "document-close"); +} + + +static void on_document_filetype_set(GObject *geany_object, GeanyDocument *doc, GeanyFiletype *filetype_old, SignalManager *man) +{ + PyObject *py_doc, *py_ft; + py_doc = (PyObject *) Document_create_new_from_geany_document(doc); + py_ft = (PyObject *) Filetype_create_new_from_geany_filetype(filetype_old); + g_signal_emit_by_name(man->obj, "document-filetype-set", py_doc, py_ft); + Py_XDECREF(py_doc); + Py_XDECREF(py_ft); +} + + +static void on_document_new(GObject *geany_object, GeanyDocument *doc, SignalManager *man) +{ + on_document_event(geany_object, doc, man, "document-new"); +} + + +static void on_document_open(GObject *geany_object, GeanyDocument *doc, SignalManager *man) +{ + on_document_event(geany_object, doc, man, "document-open"); +} + + +static void on_document_reload(GObject *geany_object, GeanyDocument *doc, SignalManager *man) +{ + on_document_event(geany_object, doc, man, "document-reload"); +} + + +static void on_document_save(GObject *geany_object, GeanyDocument *doc, SignalManager *man) +{ + on_document_event(geany_object, doc, man, "document-save"); +} + + +static gboolean on_editor_notify(GObject *geany_object, GeanyEditor *editor, SCNotification *nt, SignalManager *man) +{ + gboolean res = FALSE; + PyObject *py_ed, *py_notif; + py_ed = (PyObject *) Editor_create_new_from_geany_editor(editor); + py_notif = (PyObject *) Notification_create_new_from_scintilla_notification(nt); + g_signal_emit_by_name(man->obj, "editor-notify", py_ed, py_notif, &res); + Py_XDECREF(py_ed); + Py_XDECREF(py_notif); + return res; +} + + +static void on_geany_startup_complete(GObject *geany_object, SignalManager *man) +{ + g_signal_emit_by_name(man->obj, "geany-startup-complete"); +} + + +static void on_project_close(GObject *geany_object, SignalManager *man) +{ + g_signal_emit_by_name(man->obj, "project-close"); +} + + +static void on_project_dialog_confirmed(GObject *geany_object, GtkWidget *notebook, SignalManager *man) +{ + PyObject *gob = (PyObject *) pygobject_new(G_OBJECT(notebook)); + g_signal_emit_by_name(man->obj, "project-dialog-confirmed", gob); + Py_XDECREF(gob); +} + + +static void on_project_dialog_open(GObject *geany_object, GtkWidget *notebook, SignalManager *man) +{ + PyObject *gob = (PyObject *) pygobject_new(G_OBJECT(notebook)); + g_signal_emit_by_name(man->obj, "project-dialog-open", gob); + Py_XDECREF(gob); +} + +static void on_project_dialog_close(GObject *geany_object, GtkWidget *notebook, SignalManager *man) +{ + PyObject *gob = (PyObject *) pygobject_new(G_OBJECT(notebook)); + g_signal_emit_by_name(man->obj, "project-dialog-close", gob); + Py_XDECREF(gob); +} + + +static void on_project_open(GObject *geany_object, GKeyFile *config, SignalManager *man) +{ + PyObject *py_proj = (PyObject *) GEANYPY_NEW(Project); + g_signal_emit_by_name(man->obj, "project-open", py_proj); + Py_XDECREF(py_proj); +} + + +static void on_project_save(GObject *geany_object, GKeyFile *config, SignalManager *man) +{ + PyObject *py_proj = (PyObject *) GEANYPY_NEW(Project); + g_signal_emit_by_name(man->obj, "project-save", py_proj); + Py_XDECREF(py_proj); +} + + +static void on_update_editor_menu(GObject *geany_object, const gchar *word, gint pos, GeanyDocument *doc, SignalManager *man) +{ + PyObject *py_doc = (PyObject *) Document_create_new_from_geany_document(doc); + g_signal_emit_by_name(man->obj, "update-editor-menu", word, pos, py_doc); + Py_XDECREF(py_doc); +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-signalmanager.h geany-plugins-1.24+dfsg/geanypy/src/geanypy-signalmanager.h --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-signalmanager.h 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-signalmanager.h 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,10 @@ +#ifndef SIGNALMANAGER_H +#define SIGNALMANAGER_H + +typedef struct _SignalManager SignalManager; + +SignalManager *signal_manager_new(GeanyPlugin *geany_plugin); +void signal_manager_free(SignalManager *signal_manager); +GObject *signal_manager_get_gobject(SignalManager *signal_manager); + +#endif /* SIGNALMANAGER_H */ diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-templates.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-templates.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-templates.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-templates.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,102 @@ +#include "geanypy.h" + +/* TODO: see if the TemplatePrefs members are safe to modify. */ + +typedef struct +{ + PyObject_HEAD + GeanyTemplatePrefs *template_prefs; +} TemplatePrefs; + + +static void +TemplatePrefs_dealloc(TemplatePrefs *self) +{ + g_return_if_fail(self != NULL); + self->ob_type->tp_free((PyObject *) self); +} + + +static int +TemplatePrefs_init(TemplatePrefs *self) +{ + g_return_val_if_fail(self != NULL, -1); + self->template_prefs = geany_data->template_prefs; + return 0; +} + + +static PyObject * +TemplatePrefs_get_property(TemplatePrefs *self, const gchar *prop_name) +{ + g_return_val_if_fail(self != NULL, NULL); + g_return_val_if_fail(prop_name != NULL, NULL); + + if (!self->template_prefs) + { + PyErr_SetString(PyExc_RuntimeError, + "TemplatePrefs instance not initialized properly"); + return NULL; + } + + if (g_str_equal(prop_name, "company")) + return PyString_FromString(self->template_prefs->company); + else if (g_str_equal(prop_name, "developer")) + return PyString_FromString(self->template_prefs->developer); + else if (g_str_equal(prop_name, "initials")) + return PyString_FromString(self->template_prefs->initials); + else if (g_str_equal(prop_name, "mail")) + return PyString_FromString(self->template_prefs->mail); + else if (g_str_equal(prop_name, "version")) + return PyString_FromString(self->template_prefs->version); + + Py_RETURN_NONE; +} +GEANYPY_PROPS_READONLY(TemplatePrefs); + + +static PyGetSetDef TemplatePrefs_getseters[] = { + GEANYPY_GETSETDEF(TemplatePrefs, "company", ""), + GEANYPY_GETSETDEF(TemplatePrefs, "developer", ""), + GEANYPY_GETSETDEF(TemplatePrefs, "initials", ""), + GEANYPY_GETSETDEF(TemplatePrefs, "mail", "Email address"), + GEANYPY_GETSETDEF(TemplatePrefs, "version", "Initial version"), + { NULL } +}; + + +static PyTypeObject TemplatePrefsType = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "geany.templates.TemplatePrefs", /* tp_name */ + sizeof(TemplatePrefs), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor) TemplatePrefs_dealloc, /* tp_dealloc */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* tp_print - tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + "Wrapper around a GeanyTemplatePrefs structure.", /* tp_doc */ + 0, 0, 0, 0, 0, 0, 0, 0, /* tp_traverse - tp_members */ + TemplatePrefs_getseters, /* tp_getset */ + 0, 0, 0, 0, 0, /* tp_base - tp_dictoffset */ + (initproc) TemplatePrefs_init, /* tp_init */ + 0, 0, /* tp_alloc - tp_new */ +}; + + +static PyMethodDef TemplatePrefsModule_methods[] = { { NULL } }; + + +PyMODINIT_FUNC inittemplates(void) +{ + PyObject *m; + + TemplatePrefsType.tp_new = PyType_GenericNew; + if (PyType_Ready(&TemplatePrefsType) < 0) + return; + + m = Py_InitModule3("templates", TemplatePrefsModule_methods, + "Template information and management."); + + Py_INCREF(&TemplatePrefsType); + PyModule_AddObject(m, "TemplatePrefs", (PyObject *) &TemplatePrefsType); +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-uiutils.c geany-plugins-1.24+dfsg/geanypy/src/geanypy-uiutils.c --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-uiutils.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-uiutils.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,449 @@ +#include "geanypy.h" + + +#define GOB_CHECK(pyobj, arg) \ + { \ + if (!pyobj || pyobj == Py_None || !pygobject_check(pyobj, PyGObject_Type)) \ + { \ + PyErr_SetString(PyExc_ValueError, \ + "argument " #arg " must inherit from a gobject.GObject type"); \ + return NULL; \ + } \ + } + +#define GOB_TYPE_CHECK(gob, gob_type, arg) \ + { \ + if (!gob || !G_IS_OBJECT(gob) || \ + !g_type_is_a(G_TYPE_FROM_INSTANCE(gob), gob_type)) \ + { \ + PyErr_SetString(PyExc_ValueError, \ + "argument " #arg " must inherit from a " #gob_type " type"); \ + return NULL; \ + } \ + } + + +static PyTypeObject *PyGObject_Type = NULL; + + +static PyObject * +UiUtils_hookup_widget(PyObject *module, PyObject *args, PyObject *kwargs) +{ + PyObject *py_owner = NULL, *py_widget = NULL; + const gchar *widget_name = NULL; + GObject *owner = NULL, *widget = NULL; + static gchar *kwlist[] = { "owner", "widget", "widget_name", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "OOs", kwlist, + &py_owner, &py_widget, &widget_name)) + { + GOB_CHECK(py_owner, 1); + GOB_CHECK(py_widget, 2); + owner = pygobject_get(py_owner); + widget = pygobject_get(py_widget); + ui_hookup_widget(owner, widget, widget_name); + } + + Py_RETURN_NONE; +} + + +static PyObject * +UiUtils_lookup_widget(PyObject *module, PyObject *args, PyObject *kwargs) +{ + PyObject *py_widget = NULL; + const gchar *widget_name = NULL; + GObject *widget = NULL; + GtkWidget *found_widget = NULL; + static gchar *kwlist[] = { "widget", "widget_name", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "Os", kwlist, + &py_widget, &widget_name)) + { + GOB_CHECK(py_widget, 1); + widget = pygobject_get(py_widget); + GOB_TYPE_CHECK(widget, GTK_TYPE_WIDGET, 1); + found_widget = ui_lookup_widget(GTK_WIDGET(widget), widget_name); + if (GTK_IS_WIDGET(found_widget)) + return pygobject_new(G_OBJECT(found_widget)); + } + + Py_RETURN_NONE; +} + + +static PyObject * +UiUtils_add_document_sensitive(PyObject *module, PyObject *args, PyObject *kwargs) +{ + PyObject *py_widget = NULL; + GObject *widget = NULL; + static gchar *kwlist[] = { "widget", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "O", kwlist, &py_widget)) + { + GOB_CHECK(py_widget, 1); + widget = pygobject_get(py_widget); + GOB_TYPE_CHECK(widget, GTK_TYPE_WIDGET, 1); + ui_add_document_sensitive(GTK_WIDGET(widget)); + } + + Py_RETURN_NONE; +} + + +static PyObject * +UiUtils_button_new_with_image(PyObject *module, PyObject *args, PyObject *kwargs) +{ + const gchar *stock_id = NULL, *text = NULL; + GtkWidget *button = NULL; + static gchar *kwlist[] = { "stock_id", "text", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "ss", kwlist, &stock_id, &text)) + { + button = ui_button_new_with_image(stock_id, text); + if (GTK_IS_WIDGET(button)) + return pygobject_new(G_OBJECT(button)); + } + + Py_RETURN_NONE; +} + + +static PyObject * +UiUtils_combo_box_add_to_history(PyObject *module, PyObject *args, PyObject *kwargs) +{ + PyObject *py_cbo = NULL; + const gchar *text = NULL; + gint hist_len = 0; + GObject *widget = NULL; + static gchar *kwlist[] = { "combo_entry", "text", "history_len", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "Osi", kwlist, + &py_cbo, &text, &hist_len)) + { + GOB_CHECK(py_cbo, 1); + widget = pygobject_get(py_cbo); + GOB_TYPE_CHECK(widget, GTK_TYPE_COMBO_BOX_TEXT, 1); + ui_combo_box_add_to_history(GTK_COMBO_BOX_TEXT(widget), text, hist_len); + } + + Py_RETURN_NONE; +} + + +static PyObject * +UiUtils_dialog_vbox_new(PyObject *module, PyObject *args, PyObject *kwargs) +{ + PyObject *py_dlg; + GObject *dlg; + GtkWidget *widget; + static gchar *kwlist[] = { "dialog", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "O", kwlist, &py_dlg)) + { + GOB_CHECK(py_dlg, 1); + dlg = pygobject_get(py_dlg); + GOB_TYPE_CHECK(dlg, GTK_TYPE_DIALOG, 1); + widget = ui_dialog_vbox_new(GTK_DIALOG(dlg)); + if (GTK_IS_WIDGET(widget)) + return pygobject_new(G_OBJECT(widget)); + } + + Py_RETURN_NONE; +} + + +static PyObject * +UiUtils_entry_add_clear_icon(PyObject *module, PyObject *args, PyObject *kwargs) +{ + PyObject *py_ent = NULL; + GObject *ent; + static gchar *kwlist[] = { "entry", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "O", kwlist, &py_ent)) + { + GOB_CHECK(py_ent, 1); + ent = pygobject_get(py_ent); + GOB_TYPE_CHECK(ent, GTK_TYPE_ENTRY, 1); + ui_entry_add_clear_icon(GTK_ENTRY(ent)); + } + + Py_RETURN_NONE; +} + + +static PyObject * +UiUtils_frame_new_with_alignment(PyObject *module, PyObject *args, PyObject *kwargs) +{ + const gchar *text = NULL; + static gchar *kwlist[] = { "label_text", NULL }; + GtkWidget *alignment = NULL, *frame = NULL; + PyObject *py_al = NULL, *py_fr = NULL, *ret; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &text)) + { + frame = ui_frame_new_with_alignment(text, &alignment); + py_al = (PyObject *) pygobject_new(G_OBJECT(frame)); + py_fr = (PyObject *) pygobject_new(G_OBJECT(alignment)); + ret = Py_BuildValue("OO", py_al, py_fr); + Py_DECREF(py_al); + Py_DECREF(py_fr); + return ret; + } + + Py_RETURN_NONE; +} + + +static PyObject * +UiUtils_get_gtk_settings_integer(PyObject *module, PyObject *args, PyObject *kwargs) +{ + const gchar *prop_name = NULL; + gint default_value = 0; + static gchar *kwlist[] = { "property_name", "default_value", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "si", kwlist, &prop_name, + &default_value)) + { + return PyInt_FromLong( + (glong) ui_get_gtk_settings_integer(prop_name, default_value)); + } + + Py_RETURN_NONE; +} + + +static PyObject * +UiUtils_image_menu_item_new(PyObject *module, PyObject *args, PyObject *kwargs) +{ + const gchar *stock_id = NULL, *label = NULL; + GtkWidget *ret = NULL; + static gchar *kwlist[] = { "stock_id", "label", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "ss", kwlist, + &stock_id, &label)) + { + ret = ui_image_menu_item_new(stock_id, label); + if (GTK_IS_WIDGET(ret)) + return pygobject_new(G_OBJECT(ret)); + } + + Py_RETURN_NONE; +} + + +static PyObject * +UiUtils_is_keyval_enter_or_return(PyObject *module, PyObject *args, PyObject *kwargs) +{ + guint kv; + static gchar *kwlist[] = { "keyval", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "I", kwlist, &kv)) + { + if (ui_is_keyval_enter_or_return(kv)) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; + } + + Py_RETURN_NONE; +} + + +/* FIXME: ui_menu_add_document_items() and ui_menu_add_document_items_sorted() + * skipped because I don't know how to pass GCallbacks between Python and C, + * if it's even possible. */ + + + static PyObject * + UiUtils_path_box_new(PyObject *module, PyObject *args, PyObject *kwargs) + { + gint act; + PyObject *py_ent = NULL; + GObject *ent = NULL; + GtkWidget *pbox = NULL; + const gchar *title = NULL; + static gchar *kwlist[] = { "title", "action", "entry", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "ziO", kwlist, + &title, &act, &py_ent)) + { + GOB_CHECK(py_ent, 3); + ent = pygobject_get(py_ent); + GOB_TYPE_CHECK(ent, GTK_TYPE_ENTRY, 3); + pbox = ui_path_box_new(title, (GtkFileChooserAction) act, GTK_ENTRY(ent)); + if (GTK_IS_WIDGET(pbox)) + return pygobject_new(G_OBJECT(pbox)); + } + + + Py_RETURN_NONE; + } + + + static PyObject * + UiUtils_progress_bar_start(PyObject *module, PyObject *args, PyObject *kwargs) + { + const gchar *text = NULL; + static gchar *kwlist[] = { "text", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "z", kwlist, &text)) + ui_progress_bar_start(text); + + Py_RETURN_NONE; + } + + + static PyObject * + UiUtils_progress_bar_stop(PyObject *module) + { + ui_progress_bar_stop(); + Py_RETURN_NONE; + } + + + static PyObject * + UiUtils_set_statusbar(PyObject *module, PyObject *args, PyObject *kwargs) + { + gint log = 0; + const gchar *text = NULL; + static gchar *kwlist[] = { "text", "log", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "s|i", kwlist, &text, &log)) + ui_set_statusbar((gboolean) log, "%s", text); + + Py_RETURN_NONE; + } + + + /* FIXME: ui_table_add_row() skipped since it's probably not useful and + * not well documented. */ + + +static PyObject * +UiUtils_widget_modify_font_from_string(PyObject *module, PyObject *args, PyObject *kwargs) +{ + PyObject *py_widget = NULL; + GObject *widget = NULL; + const gchar *font_str = NULL; + static gchar *kwlist[] = { "widget", "font_str", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "Os", kwlist, &py_widget, &font_str)) + { + GOB_CHECK(py_widget, 1); + widget = pygobject_get(py_widget); + GOB_TYPE_CHECK(widget, GTK_TYPE_WIDGET, 1); + ui_widget_modify_font_from_string(GTK_WIDGET(widget), font_str); + } + + Py_RETURN_NONE; +} + + +/* Deprecated in Geany 0.21 in favour of gtk_widget_set_tooltip_text() */ +#if 0 +static PyObject * +UiUtils_widget_set_tooltip_text(PyObject *module, PyObject *args, PyObject *kwargs) +{ + PyObject *py_widget = NULL; + GObject *widget = NULL; + const gchar *text = NULL; + static gchar *kwlist[] = { "widget", "text", NULL }; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "Os", kwlist, &py_widget, &text)) + { + GOB_CHECK(py_widget, 1); + widget = pygobject_get(py_widget); + GOB_TYPE_CHECK(widget, GTK_TYPE_WIDGET, 1); + ui_widget_set_tooltip_text(GTK_WIDGET(widget), text); + } + + Py_RETURN_NONE; +} +#endif + + +static PyMethodDef UiUtilsModule_methods[] = { + { "hookup_widget", (PyCFunction) UiUtils_hookup_widget, METH_KEYWORDS, + "Sets a name to lookup widget from owner." }, + { "lookup_widget", (PyCFunction) UiUtils_lookup_widget, METH_KEYWORDS, + "Returns a widget from a name in a component, usually created " + "by Glade. Call it with the toplevel widget in the component " + "(ie. a window or dialog), or alternatively any widget in the " + "component, and the name of the widget you want returned."}, + { "add_document_sensitive", (PyCFunction) UiUtils_add_document_sensitive, METH_KEYWORDS, + "Adds a widget to the list of widgets that should be set " + "sensitive or insensitive depending if any documents are open." }, + { "button_new_with_image", (PyCFunction) UiUtils_button_new_with_image, METH_KEYWORDS, + "Creates a gtk.Button with custom text and a stock image similar " + "to gtk.Button() initializer." }, + { "combo_box_add_to_history", (PyCFunction) UiUtils_combo_box_add_to_history, METH_KEYWORDS, + "Prepends text to the dropdown list, removing a duplicate element " + "in the list if found. Also ensures there are less than the " + "specified number of elements in the history." }, + { "dialog_vbox_new", (PyCFunction) UiUtils_dialog_vbox_new, METH_KEYWORDS, + "Makes a fixed border for dialogs without increasing the button " + "box border size." }, + { "entry_add_clear_icon", (PyCFunction) UiUtils_entry_add_clear_icon, METH_KEYWORDS, + "Adds a small clear icon to the right end of the passed in entry. " + "A callback to clear the contents of the gtk.Entry is automatically " + "added." }, + { "frame_new_with_alignement", (PyCFunction) UiUtils_frame_new_with_alignment, METH_KEYWORDS, + "Creates a GNOME HIG-style frame with no border and indented " + "child alignment. Returns a tuple with the gtk.Frame as the first " + "element and the gtk.Alignment as the second element." }, + { "get_gtk_settings_integer", (PyCFunction) UiUtils_get_gtk_settings_integer, METH_KEYWORDS, + "Reads an integer from the GTK default settings registry." }, + { "image_menu_item_new", (PyCFunction) UiUtils_image_menu_item_new, METH_KEYWORDS, + "Creates a gtk.ImageMenuItem with a stock image and a custom label." }, + { "is_keyval_enter_or_return", (PyCFunction) UiUtils_is_keyval_enter_or_return, METH_KEYWORDS, + "Checks whether the passed in keyval is the Enter or Returns key. " }, + { "path_box_new", (PyCFunction) UiUtils_path_box_new, METH_KEYWORDS, + "Creates a gtk.HBox with entry packed into it and an open button " + "which runs a file chooser, replacing entry text (if successful) " + "with the path returned from the gtk.FileChooser." }, + { "progress_bar_start", (PyCFunction) UiUtils_progress_bar_start, METH_KEYWORDS, + "Starts a constantly pulsing progressbar in the right corner of " + "the statusbar (if the status bar is visible)." }, + { "progress_bar_stop", (PyCFunction) UiUtils_progress_bar_stop, METH_NOARGS, + "Stops a running progress bar and hides the widget again." }, + { "set_statusbar", (PyCFunction) UiUtils_set_statusbar, METH_KEYWORDS, + "Displays text on the statusbar." }, + { "widget_modify_font_from_string", (PyCFunction) UiUtils_widget_modify_font_from_string, METH_KEYWORDS, + "Modifies the font of a widget using modify_font() automatically " + "parsing the Pango font description string in font_str." }, + { NULL }, +}; + + +PyMODINIT_FUNC initui_utils(void) +{ + PyObject *m; + + init_pygobject(); + init_pygtk(); + m = PyImport_ImportModule("gobject"); + + if (m) + { + PyGObject_Type = (PyTypeObject *) PyObject_GetAttrString(m, "GObject"); + Py_XDECREF(m); + } + + InterfacePrefsType.tp_new = PyType_GenericNew; + if (PyType_Ready(&InterfacePrefsType) < 0) + return; + + MainWidgetsType.tp_new = PyType_GenericNew; + if (PyType_Ready(&MainWidgetsType) < 0) + return; + + m = Py_InitModule3("ui_utils", UiUtilsModule_methods, + "User interface information and utilities."); + + Py_INCREF(&InterfacePrefsType); + PyModule_AddObject(m, "InterfacePrefs", (PyObject *) &InterfacePrefsType); + + Py_INCREF(&MainWidgetsType); + PyModule_AddObject(m, "MainWidgets", (PyObject *) &MainWidgetsType); +} diff -Nru geany-plugins-1.23+dfsg/geanypy/src/geanypy-uiutils.h geany-plugins-1.24+dfsg/geanypy/src/geanypy-uiutils.h --- geany-plugins-1.23+dfsg/geanypy/src/geanypy-uiutils.h 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/geanypy-uiutils.h 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef GEANYPY_UI_UTILS_H__ +#define GEANYPY_UI_UTILS_H__ + +extern PyTypeObject InterfacePrefsType; +extern PyTypeObject MainWidgetsType; + +typedef struct +{ + PyObject_HEAD + GeanyInterfacePrefs *iface_prefs; +} InterfacePrefs; + +typedef struct +{ + PyObject_HEAD + GeanyMainWidgets *main_widgets; +} MainWidgets; + +#endif /* GEANYPY_UI_UTILS_H__ */ diff -Nru geany-plugins-1.23+dfsg/geanypy/src/Makefile.am geany-plugins-1.24+dfsg/geanypy/src/Makefile.am --- geany-plugins-1.23+dfsg/geanypy/src/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/Makefile.am 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,39 @@ +include $(top_srcdir)/build/vars.build.mk + +geanyplugin_LTLIBRARIES = geanypy.la +geanyplugindir = $(libdir)/geany + +geanypy_la_LDFLAGS = -module -avoid-version -Wl,--export-dynamic +geanypy_la_CPPFLAGS = @GEANY_CFLAGS@ @PYGTK_CFLAGS@ @PYTHON_CPPFLAGS@ \ + -DGEANYPY_PYTHON_DIR="\"$(libdir)/geany/geanypy\"" \ + -DGEANYPY_PLUGIN_DIR="\"$(datadir)/geany/geanypy/plugins\"" \ + -UHAVE_CONFIG_H +geanypy_la_CFLAGS = -fno-strict-aliasing -Wno-write-strings +geanypy_la_LIBADD = @GEANY_LIBS@ @PYGTK_LIBS@ @PYTHON_LDFLAGS@ \ + @PYTHON_EXTRA_LIBS@ @PYTHON_EXTRA_LDFLAGS@ +geanypy_la_SOURCES = geanypy-app.c \ + geanypy-dialogs.c \ + geanypy-document.c geanypy-document.h \ + geanypy-editor.c geanypy-editor.h \ + geanypy-encoding.c geanypy-encoding.h \ + geanypy-filetypes.c geanypy-filetypes.h \ + geanypy.h \ + geanypy-highlighting.c \ + geanypy-indentprefs.c \ + geanypy-interfaceprefs.c \ + geanypy-main.c \ + geanypy-mainwidgets.c \ + geanypy-msgwindow.c \ + geanypy-navqueue.c \ + geanypy-plugin.c geanypy-plugin.h \ + geanypy-prefs.c \ + geanypy-project.c geanypy-project.h \ + geanypy-scinotification.c \ + geanypy-scinotifyheader.c \ + geanypy-scintilla.c geanypy-scintilla.h \ + geanypy-search.c \ + geanypy-signalmanager.c geanypy-signalmanager.h \ + geanypy-templates.c \ + geanypy-uiutils.c geanypy-uiutils.h + +include $(top_srcdir)/build/cppcheck.mk diff -Nru geany-plugins-1.23+dfsg/geanypy/src/Makefile.in geany-plugins-1.24+dfsg/geanypy/src/Makefile.in --- geany-plugins-1.23+dfsg/geanypy/src/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/src/Makefile.in 2014-04-13 17:12:44.000000000 +0000 @@ -0,0 +1,1035 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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 \ + *\\[\ \ ]*) \ + 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; \ + 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@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp +subdir = geanypy/src +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ + $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ + $(top_srcdir)/build/cppcheck.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ + $(top_srcdir)/build/geanydoc.m4 \ + $(top_srcdir)/build/geanyextrasel.m4 \ + $(top_srcdir)/build/geanygendoc.m4 \ + $(top_srcdir)/build/geanyinsertnum.m4 \ + $(top_srcdir)/build/geanylatex.m4 \ + $(top_srcdir)/build/geanylipsum.m4 \ + $(top_srcdir)/build/geanylua.m4 \ + $(top_srcdir)/build/geanymacro.m4 \ + $(top_srcdir)/build/geanyminiscript.m4 \ + $(top_srcdir)/build/geanynumberedbookmarks.m4 \ + $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ + $(top_srcdir)/build/geanysendmail.m4 \ + $(top_srcdir)/build/geanyvc.m4 \ + $(top_srcdir)/build/geniuspaste.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ + $(top_srcdir)/build/pretty-printer.m4 \ + $(top_srcdir)/build/scope.m4 \ + $(top_srcdir)/build/shiftcolumn.m4 \ + $(top_srcdir)/build/spellcheck.m4 \ + $(top_srcdir)/build/status.m4 \ + $(top_srcdir)/build/tableconvert.m4 \ + $(top_srcdir)/build/treebrowser.m4 \ + $(top_srcdir)/build/unittests.m4 \ + $(top_srcdir)/build/updatechecker.m4 \ + $(top_srcdir)/build/webhelper.m4 \ + $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ + $(top_srcdir)/build/cache/glib-gettext.m4 \ + $(top_srcdir)/build/cache/intltool.m4 \ + $(top_srcdir)/build/cache/libtool.m4 \ + $(top_srcdir)/build/cache/ltoptions.m4 \ + $(top_srcdir)/build/cache/ltsugar.m4 \ + $(top_srcdir)/build/cache/ltversion.m4 \ + $(top_srcdir)/build/cache/lt~obsolete.m4 \ + $(top_srcdir)/build/cache/nls.m4 \ + $(top_srcdir)/build/cache/pkg.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +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__installdirs = "$(DESTDIR)$(geanyplugindir)" +LTLIBRARIES = $(geanyplugin_LTLIBRARIES) +geanypy_la_DEPENDENCIES = +am_geanypy_la_OBJECTS = geanypy_la-geanypy-app.lo \ + geanypy_la-geanypy-dialogs.lo geanypy_la-geanypy-document.lo \ + geanypy_la-geanypy-editor.lo geanypy_la-geanypy-encoding.lo \ + geanypy_la-geanypy-filetypes.lo \ + geanypy_la-geanypy-highlighting.lo \ + geanypy_la-geanypy-indentprefs.lo \ + geanypy_la-geanypy-interfaceprefs.lo \ + geanypy_la-geanypy-main.lo geanypy_la-geanypy-mainwidgets.lo \ + geanypy_la-geanypy-msgwindow.lo geanypy_la-geanypy-navqueue.lo \ + geanypy_la-geanypy-plugin.lo geanypy_la-geanypy-prefs.lo \ + geanypy_la-geanypy-project.lo \ + geanypy_la-geanypy-scinotification.lo \ + geanypy_la-geanypy-scinotifyheader.lo \ + geanypy_la-geanypy-scintilla.lo geanypy_la-geanypy-search.lo \ + geanypy_la-geanypy-signalmanager.lo \ + geanypy_la-geanypy-templates.lo geanypy_la-geanypy-uiutils.lo +geanypy_la_OBJECTS = $(am_geanypy_la_OBJECTS) +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 = +geanypy_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(geanypy_la_CFLAGS) \ + $(CFLAGS) $(geanypy_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 +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +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_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_CCLD_1 = +SOURCES = $(geanypy_la_SOURCES) +DIST_SOURCES = $(geanypy_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + 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 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ +COMMANDER_CFLAGS = @COMMANDER_CFLAGS@ +COMMANDER_LIBS = @COMMANDER_LIBS@ +CPP = @CPP@ +CPPCHECK = @CPPCHECK@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ +DEVHELP_LIBS = @DEVHELP_LIBS@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENCHANT_CFLAGS = @ENCHANT_CFLAGS@ +ENCHANT_LIBS = @ENCHANT_LIBS@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GEANYGENDOC_CFLAGS = @GEANYGENDOC_CFLAGS@ +GEANYGENDOC_LIBS = @GEANYGENDOC_LIBS@ +GEANY_CFLAGS = @GEANY_CFLAGS@ +GEANY_LIBS = @GEANY_LIBS@ +GEANY_VERSION = @GEANY_VERSION@ +GENIUSPASTE_CFLAGS = @GENIUSPASTE_CFLAGS@ +GENIUSPASTE_LIBS = @GENIUSPASTE_LIBS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GPGME_CFLAGS = @GPGME_CFLAGS@ +GPGME_CONFIG = @GPGME_CONFIG@ +GPGME_LIBS = @GPGME_LIBS@ +GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ +GREP = @GREP@ +GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ +GTKSPELL_LIBS = @GTKSPELL_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBMARKDOWN_CFLAGS = @LIBMARKDOWN_CFLAGS@ +LIBMARKDOWN_LIBS = @LIBMARKDOWN_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCALEDIR = @LOCALEDIR@ +LTLIBOBJS = @LTLIBOBJS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_LIBS = @LUA_LIBS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MARKDOWN_CFLAGS = @MARKDOWN_CFLAGS@ +MARKDOWN_LIBS = @MARKDOWN_LIBS@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +MULTITERM_CFLAGS = @MULTITERM_CFLAGS@ +MULTITERM_LIBS = @MULTITERM_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +RST2HTML = @RST2HTML@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +UPDATECHECKER_CFLAGS = @UPDATECHECKER_CFLAGS@ +UPDATECHECKER_LIBS = @UPDATECHECKER_LIBS@ +USE_NLS = @USE_NLS@ +VALAC = @VALAC@ +VERSION = @VERSION@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ +WEBHELPER_CFLAGS = @WEBHELPER_CFLAGS@ +WEBHELPER_LIBS = @WEBHELPER_LIBS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +geanypluginsdir = @geanypluginsdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AM_CFLAGS = \ + -DLOCALEDIR=\""$(LOCALEDIR)"\" \ + -DPREFIX=\""$(prefix)"\" \ + -DDOCDIR=\""$(docdir)"\" \ + -DGEANYPLUGINS_DATADIR=\""$(datadir)"\" \ + -DPKGDATADIR=\""$(pkgdatadir)"\" \ + -DLIBDIR=\""$(libdir)"\" \ + -DPKGLIBDIR=\""$(pkglibdir)"\" \ + $(GEANY_CFLAGS) \ + $(GP_CFLAGS) + +AM_LDFLAGS = -module -avoid-version +COMMONLIBS = \ + $(GEANY_LIBS) \ + $(INTLLIBS) + +geanyplugin_LTLIBRARIES = geanypy.la +geanyplugindir = $(libdir)/geany +geanypy_la_LDFLAGS = -module -avoid-version -Wl,--export-dynamic +geanypy_la_CPPFLAGS = @GEANY_CFLAGS@ @PYGTK_CFLAGS@ @PYTHON_CPPFLAGS@ \ + -DGEANYPY_PYTHON_DIR="\"$(libdir)/geany/geanypy\"" \ + -DGEANYPY_PLUGIN_DIR="\"$(datadir)/geany/geanypy/plugins\"" \ + -UHAVE_CONFIG_H + +geanypy_la_CFLAGS = -fno-strict-aliasing -Wno-write-strings +geanypy_la_LIBADD = @GEANY_LIBS@ @PYGTK_LIBS@ @PYTHON_LDFLAGS@ \ + @PYTHON_EXTRA_LIBS@ @PYTHON_EXTRA_LDFLAGS@ + +geanypy_la_SOURCES = geanypy-app.c \ + geanypy-dialogs.c \ + geanypy-document.c geanypy-document.h \ + geanypy-editor.c geanypy-editor.h \ + geanypy-encoding.c geanypy-encoding.h \ + geanypy-filetypes.c geanypy-filetypes.h \ + geanypy.h \ + geanypy-highlighting.c \ + geanypy-indentprefs.c \ + geanypy-interfaceprefs.c \ + geanypy-main.c \ + geanypy-mainwidgets.c \ + geanypy-msgwindow.c \ + geanypy-navqueue.c \ + geanypy-plugin.c geanypy-plugin.h \ + geanypy-prefs.c \ + geanypy-project.c geanypy-project.h \ + geanypy-scinotification.c \ + geanypy-scinotifyheader.c \ + geanypy-scintilla.c geanypy-scintilla.h \ + geanypy-search.c \ + geanypy-signalmanager.c geanypy-signalmanager.h \ + geanypy-templates.c \ + geanypy-uiutils.c geanypy-uiutils.h + +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/vars.build.mk $(top_srcdir)/build/cppcheck.mk $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign geanypy/src/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign geanypy/src/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + 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/vars.build.mk $(top_srcdir)/build/cppcheck.mk: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-geanypluginLTLIBRARIES: $(geanyplugin_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(geanyplugin_LTLIBRARIES)'; test -n "$(geanyplugindir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(geanyplugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(geanyplugindir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(geanyplugindir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(geanyplugindir)"; \ + } + +uninstall-geanypluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(geanyplugin_LTLIBRARIES)'; test -n "$(geanyplugindir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(geanyplugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(geanyplugindir)/$$f"; \ + done + +clean-geanypluginLTLIBRARIES: + -test -z "$(geanyplugin_LTLIBRARIES)" || rm -f $(geanyplugin_LTLIBRARIES) + @list='$(geanyplugin_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}; \ + } + +geanypy.la: $(geanypy_la_OBJECTS) $(geanypy_la_DEPENDENCIES) $(EXTRA_geanypy_la_DEPENDENCIES) + $(AM_V_CCLD)$(geanypy_la_LINK) -rpath $(geanyplugindir) $(geanypy_la_OBJECTS) $(geanypy_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-app.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-dialogs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-document.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-editor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-encoding.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-filetypes.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-highlighting.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-indentprefs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-interfaceprefs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-main.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-mainwidgets.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-msgwindow.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-navqueue.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-plugin.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-prefs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-project.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-scinotification.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-scinotifyheader.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-scintilla.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-search.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-signalmanager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-templates.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geanypy_la-geanypy-uiutils.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@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 -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 -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +geanypy_la-geanypy-app.lo: geanypy-app.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-app.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-app.Tpo -c -o geanypy_la-geanypy-app.lo `test -f 'geanypy-app.c' || echo '$(srcdir)/'`geanypy-app.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-app.Tpo $(DEPDIR)/geanypy_la-geanypy-app.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-app.c' object='geanypy_la-geanypy-app.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-app.lo `test -f 'geanypy-app.c' || echo '$(srcdir)/'`geanypy-app.c + +geanypy_la-geanypy-dialogs.lo: geanypy-dialogs.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-dialogs.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-dialogs.Tpo -c -o geanypy_la-geanypy-dialogs.lo `test -f 'geanypy-dialogs.c' || echo '$(srcdir)/'`geanypy-dialogs.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-dialogs.Tpo $(DEPDIR)/geanypy_la-geanypy-dialogs.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-dialogs.c' object='geanypy_la-geanypy-dialogs.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-dialogs.lo `test -f 'geanypy-dialogs.c' || echo '$(srcdir)/'`geanypy-dialogs.c + +geanypy_la-geanypy-document.lo: geanypy-document.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-document.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-document.Tpo -c -o geanypy_la-geanypy-document.lo `test -f 'geanypy-document.c' || echo '$(srcdir)/'`geanypy-document.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-document.Tpo $(DEPDIR)/geanypy_la-geanypy-document.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-document.c' object='geanypy_la-geanypy-document.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-document.lo `test -f 'geanypy-document.c' || echo '$(srcdir)/'`geanypy-document.c + +geanypy_la-geanypy-editor.lo: geanypy-editor.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-editor.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-editor.Tpo -c -o geanypy_la-geanypy-editor.lo `test -f 'geanypy-editor.c' || echo '$(srcdir)/'`geanypy-editor.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-editor.Tpo $(DEPDIR)/geanypy_la-geanypy-editor.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-editor.c' object='geanypy_la-geanypy-editor.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-editor.lo `test -f 'geanypy-editor.c' || echo '$(srcdir)/'`geanypy-editor.c + +geanypy_la-geanypy-encoding.lo: geanypy-encoding.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-encoding.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-encoding.Tpo -c -o geanypy_la-geanypy-encoding.lo `test -f 'geanypy-encoding.c' || echo '$(srcdir)/'`geanypy-encoding.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-encoding.Tpo $(DEPDIR)/geanypy_la-geanypy-encoding.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-encoding.c' object='geanypy_la-geanypy-encoding.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-encoding.lo `test -f 'geanypy-encoding.c' || echo '$(srcdir)/'`geanypy-encoding.c + +geanypy_la-geanypy-filetypes.lo: geanypy-filetypes.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-filetypes.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-filetypes.Tpo -c -o geanypy_la-geanypy-filetypes.lo `test -f 'geanypy-filetypes.c' || echo '$(srcdir)/'`geanypy-filetypes.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-filetypes.Tpo $(DEPDIR)/geanypy_la-geanypy-filetypes.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-filetypes.c' object='geanypy_la-geanypy-filetypes.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-filetypes.lo `test -f 'geanypy-filetypes.c' || echo '$(srcdir)/'`geanypy-filetypes.c + +geanypy_la-geanypy-highlighting.lo: geanypy-highlighting.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-highlighting.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-highlighting.Tpo -c -o geanypy_la-geanypy-highlighting.lo `test -f 'geanypy-highlighting.c' || echo '$(srcdir)/'`geanypy-highlighting.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-highlighting.Tpo $(DEPDIR)/geanypy_la-geanypy-highlighting.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-highlighting.c' object='geanypy_la-geanypy-highlighting.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-highlighting.lo `test -f 'geanypy-highlighting.c' || echo '$(srcdir)/'`geanypy-highlighting.c + +geanypy_la-geanypy-indentprefs.lo: geanypy-indentprefs.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-indentprefs.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-indentprefs.Tpo -c -o geanypy_la-geanypy-indentprefs.lo `test -f 'geanypy-indentprefs.c' || echo '$(srcdir)/'`geanypy-indentprefs.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-indentprefs.Tpo $(DEPDIR)/geanypy_la-geanypy-indentprefs.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-indentprefs.c' object='geanypy_la-geanypy-indentprefs.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-indentprefs.lo `test -f 'geanypy-indentprefs.c' || echo '$(srcdir)/'`geanypy-indentprefs.c + +geanypy_la-geanypy-interfaceprefs.lo: geanypy-interfaceprefs.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-interfaceprefs.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-interfaceprefs.Tpo -c -o geanypy_la-geanypy-interfaceprefs.lo `test -f 'geanypy-interfaceprefs.c' || echo '$(srcdir)/'`geanypy-interfaceprefs.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-interfaceprefs.Tpo $(DEPDIR)/geanypy_la-geanypy-interfaceprefs.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-interfaceprefs.c' object='geanypy_la-geanypy-interfaceprefs.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-interfaceprefs.lo `test -f 'geanypy-interfaceprefs.c' || echo '$(srcdir)/'`geanypy-interfaceprefs.c + +geanypy_la-geanypy-main.lo: geanypy-main.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-main.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-main.Tpo -c -o geanypy_la-geanypy-main.lo `test -f 'geanypy-main.c' || echo '$(srcdir)/'`geanypy-main.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-main.Tpo $(DEPDIR)/geanypy_la-geanypy-main.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-main.c' object='geanypy_la-geanypy-main.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-main.lo `test -f 'geanypy-main.c' || echo '$(srcdir)/'`geanypy-main.c + +geanypy_la-geanypy-mainwidgets.lo: geanypy-mainwidgets.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-mainwidgets.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-mainwidgets.Tpo -c -o geanypy_la-geanypy-mainwidgets.lo `test -f 'geanypy-mainwidgets.c' || echo '$(srcdir)/'`geanypy-mainwidgets.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-mainwidgets.Tpo $(DEPDIR)/geanypy_la-geanypy-mainwidgets.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-mainwidgets.c' object='geanypy_la-geanypy-mainwidgets.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-mainwidgets.lo `test -f 'geanypy-mainwidgets.c' || echo '$(srcdir)/'`geanypy-mainwidgets.c + +geanypy_la-geanypy-msgwindow.lo: geanypy-msgwindow.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-msgwindow.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-msgwindow.Tpo -c -o geanypy_la-geanypy-msgwindow.lo `test -f 'geanypy-msgwindow.c' || echo '$(srcdir)/'`geanypy-msgwindow.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-msgwindow.Tpo $(DEPDIR)/geanypy_la-geanypy-msgwindow.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-msgwindow.c' object='geanypy_la-geanypy-msgwindow.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-msgwindow.lo `test -f 'geanypy-msgwindow.c' || echo '$(srcdir)/'`geanypy-msgwindow.c + +geanypy_la-geanypy-navqueue.lo: geanypy-navqueue.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-navqueue.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-navqueue.Tpo -c -o geanypy_la-geanypy-navqueue.lo `test -f 'geanypy-navqueue.c' || echo '$(srcdir)/'`geanypy-navqueue.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-navqueue.Tpo $(DEPDIR)/geanypy_la-geanypy-navqueue.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-navqueue.c' object='geanypy_la-geanypy-navqueue.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-navqueue.lo `test -f 'geanypy-navqueue.c' || echo '$(srcdir)/'`geanypy-navqueue.c + +geanypy_la-geanypy-plugin.lo: geanypy-plugin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-plugin.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-plugin.Tpo -c -o geanypy_la-geanypy-plugin.lo `test -f 'geanypy-plugin.c' || echo '$(srcdir)/'`geanypy-plugin.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-plugin.Tpo $(DEPDIR)/geanypy_la-geanypy-plugin.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-plugin.c' object='geanypy_la-geanypy-plugin.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-plugin.lo `test -f 'geanypy-plugin.c' || echo '$(srcdir)/'`geanypy-plugin.c + +geanypy_la-geanypy-prefs.lo: geanypy-prefs.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-prefs.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-prefs.Tpo -c -o geanypy_la-geanypy-prefs.lo `test -f 'geanypy-prefs.c' || echo '$(srcdir)/'`geanypy-prefs.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-prefs.Tpo $(DEPDIR)/geanypy_la-geanypy-prefs.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-prefs.c' object='geanypy_la-geanypy-prefs.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-prefs.lo `test -f 'geanypy-prefs.c' || echo '$(srcdir)/'`geanypy-prefs.c + +geanypy_la-geanypy-project.lo: geanypy-project.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-project.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-project.Tpo -c -o geanypy_la-geanypy-project.lo `test -f 'geanypy-project.c' || echo '$(srcdir)/'`geanypy-project.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-project.Tpo $(DEPDIR)/geanypy_la-geanypy-project.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-project.c' object='geanypy_la-geanypy-project.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-project.lo `test -f 'geanypy-project.c' || echo '$(srcdir)/'`geanypy-project.c + +geanypy_la-geanypy-scinotification.lo: geanypy-scinotification.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-scinotification.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-scinotification.Tpo -c -o geanypy_la-geanypy-scinotification.lo `test -f 'geanypy-scinotification.c' || echo '$(srcdir)/'`geanypy-scinotification.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-scinotification.Tpo $(DEPDIR)/geanypy_la-geanypy-scinotification.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-scinotification.c' object='geanypy_la-geanypy-scinotification.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-scinotification.lo `test -f 'geanypy-scinotification.c' || echo '$(srcdir)/'`geanypy-scinotification.c + +geanypy_la-geanypy-scinotifyheader.lo: geanypy-scinotifyheader.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-scinotifyheader.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-scinotifyheader.Tpo -c -o geanypy_la-geanypy-scinotifyheader.lo `test -f 'geanypy-scinotifyheader.c' || echo '$(srcdir)/'`geanypy-scinotifyheader.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-scinotifyheader.Tpo $(DEPDIR)/geanypy_la-geanypy-scinotifyheader.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-scinotifyheader.c' object='geanypy_la-geanypy-scinotifyheader.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-scinotifyheader.lo `test -f 'geanypy-scinotifyheader.c' || echo '$(srcdir)/'`geanypy-scinotifyheader.c + +geanypy_la-geanypy-scintilla.lo: geanypy-scintilla.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-scintilla.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-scintilla.Tpo -c -o geanypy_la-geanypy-scintilla.lo `test -f 'geanypy-scintilla.c' || echo '$(srcdir)/'`geanypy-scintilla.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-scintilla.Tpo $(DEPDIR)/geanypy_la-geanypy-scintilla.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-scintilla.c' object='geanypy_la-geanypy-scintilla.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-scintilla.lo `test -f 'geanypy-scintilla.c' || echo '$(srcdir)/'`geanypy-scintilla.c + +geanypy_la-geanypy-search.lo: geanypy-search.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-search.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-search.Tpo -c -o geanypy_la-geanypy-search.lo `test -f 'geanypy-search.c' || echo '$(srcdir)/'`geanypy-search.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-search.Tpo $(DEPDIR)/geanypy_la-geanypy-search.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-search.c' object='geanypy_la-geanypy-search.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-search.lo `test -f 'geanypy-search.c' || echo '$(srcdir)/'`geanypy-search.c + +geanypy_la-geanypy-signalmanager.lo: geanypy-signalmanager.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-signalmanager.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-signalmanager.Tpo -c -o geanypy_la-geanypy-signalmanager.lo `test -f 'geanypy-signalmanager.c' || echo '$(srcdir)/'`geanypy-signalmanager.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-signalmanager.Tpo $(DEPDIR)/geanypy_la-geanypy-signalmanager.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-signalmanager.c' object='geanypy_la-geanypy-signalmanager.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-signalmanager.lo `test -f 'geanypy-signalmanager.c' || echo '$(srcdir)/'`geanypy-signalmanager.c + +geanypy_la-geanypy-templates.lo: geanypy-templates.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-templates.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-templates.Tpo -c -o geanypy_la-geanypy-templates.lo `test -f 'geanypy-templates.c' || echo '$(srcdir)/'`geanypy-templates.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-templates.Tpo $(DEPDIR)/geanypy_la-geanypy-templates.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-templates.c' object='geanypy_la-geanypy-templates.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-templates.lo `test -f 'geanypy-templates.c' || echo '$(srcdir)/'`geanypy-templates.c + +geanypy_la-geanypy-uiutils.lo: geanypy-uiutils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -MT geanypy_la-geanypy-uiutils.lo -MD -MP -MF $(DEPDIR)/geanypy_la-geanypy-uiutils.Tpo -c -o geanypy_la-geanypy-uiutils.lo `test -f 'geanypy-uiutils.c' || echo '$(srcdir)/'`geanypy-uiutils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geanypy_la-geanypy-uiutils.Tpo $(DEPDIR)/geanypy_la-geanypy-uiutils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='geanypy-uiutils.c' object='geanypy_la-geanypy-uiutils.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(geanypy_la_CPPFLAGS) $(CPPFLAGS) $(geanypy_la_CFLAGS) $(CFLAGS) -c -o geanypy_la-geanypy-uiutils.lo `test -f 'geanypy-uiutils.c' || echo '$(srcdir)/'`geanypy-uiutils.c + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +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 + +GTAGS: + 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 + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@HAVE_CPPCHECK_FALSE@check-local: +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(geanyplugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-geanypluginLTLIBRARIES clean-generic clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-geanypluginLTLIBRARIES + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-geanypluginLTLIBRARIES + +.MAKE: check-am install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ + clean-geanypluginLTLIBRARIES clean-generic 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-geanypluginLTLIBRARIES \ + 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 uninstall-geanypluginLTLIBRARIES + + +@HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) + +@HAVE_CPPCHECK_TRUE@check-local: check-cppcheck + +# 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. +.NOEXPORT: diff -Nru geany-plugins-1.23+dfsg/geanypy/wscript_build geany-plugins-1.24+dfsg/geanypy/wscript_build --- geany-plugins-1.23+dfsg/geanypy/wscript_build 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/wscript_build 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,47 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - GeanyPy +# +# Copyright 2013 Enrico Tröger +# +# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from build.wafutils import build_plugin, target_is_win32 + + +# plugin config +name = 'GeanyPy' +includes = ['geanypy/src'] +libraries = ['PYGTK', 'PYEXT'] + +build_plugin(bld, name, includes=includes, libraries=libraries) + + +# install Python modules (they will be byte-compiled on install) +py_sources = ['geany/__init__.py', + 'geany/console.py', + 'geany/manager.py', + 'geany/loader.py', + 'geany/plugin.py', + 'geany/signalmanager.py'] +bld.new_task_gen( + features = 'py', + source = py_sources, + install_path = '%s/geany' % bld.env['GEANYPY_PYTHON_DIR']) + + +# install plugins +start_dir = bld.path.find_dir('plugins') +bld.install_files(bld.env['GEANYPY_PLUGIN_DIR'], start_dir.ant_glob('*.py'), cwd=start_dir) diff -Nru geany-plugins-1.23+dfsg/geanypy/wscript_configure geany-plugins-1.24+dfsg/geanypy/wscript_configure --- geany-plugins-1.23+dfsg/geanypy/wscript_configure 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanypy/wscript_configure 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,80 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - GeanyPy +# +# Copyright 2013 Enrico Tröger +# +# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from build.wafutils import add_to_env_and_define, check_cfg_cached, target_is_win32 +from waflib.Errors import ConfigurationError + +PYTHON_DETECT_DSO_CODE = """ +from distutils.sysconfig import get_config_vars +from os.path import join as path_join + +cvars = get_config_vars() +# support multiarch-enabled distributions like Ubuntu +if not 'MULTIARCH' in cvars.keys(): + cvars['MULTIARCH'] = '' +print(path_join(cvars['LIBDIR'], cvars['MULTIARCH'], cvars['LDLIBRARY'])) +""" + +# Python +conf.load('python') +conf.check_python_version((2, 6)) +conf.check_python_headers() + +if conf.env['PYTHON_VERSION'][0] == '3': + raise ConfigurationError('Python3 is not supported') + +# PyGTK +check_cfg_cached(conf, + package='pygtk-2.0', + uselib_store="PYGTK", + mandatory=True, + args='--cflags --libs') + +# try to find the Python DSO path, for details see geanypy/m4/ax_python_library.m4 +conf.start_msg('Checking for python DSO path') +try: + dso_path = conf.cmd_and_log(conf.env['PYTHON'] + ['-c', PYTHON_DETECT_DSO_CODE]) + if not dso_path: + conf.fatal('not found') +except: + conf.end_msg(False) + conf.fatal('Could not find the python DSO path') +else: + dso_path = dso_path.strip() + add_to_env_and_define(conf, 'GEANYPY_PYTHON_LIBRARY', dso_path, quote=True) + conf.end_msg(dso_path) + +# work around for Debian Python bug (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695979) +if not 'LIB_PYEXT' in conf.env: + conf.env['LIBPATH_PYEXT'] = conf.env['LIBPATH_PYEMBED'] + conf.env['LIB_PYEXT'] = conf.env['LIB_PYEMBED'] + +# dirs +is_win32 = target_is_win32(conf) +if is_win32: + geanypy_lib_path = '%s/lib/geany-plugins/geanypy' % conf.env['G_PREFIX'] + geanypy_data_path = '%s/%s/geany-plugins/geanypy' % ( + conf.env['G_PREFIX'], conf.env['GEANYPLUGINS_DATADIR']) +else: + geanypy_lib_path = '%s/geany-plugins/geanypy' % conf.env['LIBDIR'] + geanypy_data_path = '%s/geany-plugins/geanypy' % conf.env['GEANYPLUGINS_DATADIR'] + +add_to_env_and_define(conf, 'GEANYPY_PYTHON_DIR', geanypy_lib_path, quote=True) +add_to_env_and_define(conf, 'GEANYPY_PLUGIN_DIR', '%s/plugins' % geanypy_data_path, quote=True) diff -Nru geany-plugins-1.23+dfsg/geanysendmail/Makefile.in geany-plugins-1.24+dfsg/geanysendmail/Makefile.in --- geany-plugins-1.23+dfsg/geanysendmail/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanysendmail/Makefile.in 2014-04-13 17:12:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - NEWS TODO +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog NEWS README TODO subdir = geanysendmail ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -467,22 +545,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -497,57 +578,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 \ @@ -563,12 +599,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; \ @@ -580,15 +611,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 @@ -597,6 +624,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 @@ -760,22 +802,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/geanysendmail/src/geanysendmail.c geany-plugins-1.24+dfsg/geanysendmail/src/geanysendmail.c --- geany-plugins-1.23+dfsg/geanysendmail/src/geanysendmail.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanysendmail/src/geanysendmail.c 2014-04-12 14:28:39.000000000 +0000 @@ -1,7 +1,7 @@ /* * geanysendmail.c * - * Copyright 2007-2011 Frank Lanitz + * Copyright 2007-2011, 2013 Frank Lanitz * Copyright 2007 Enrico Tröger * Copyright 2007, 2008 Nick Treleaven * Copyright 2008, 2009 Timothy Boronczyk @@ -111,6 +111,8 @@ } else { + g_string_free(cmd_str, TRUE); + g_free(locale_filename); return; } @@ -170,6 +172,8 @@ { ui_set_statusbar(FALSE, _("File has to be saved before sending.")); } + + g_key_file_free(config); } static void key_send_as_attachment(G_GNUC_UNUSED guint key_id) @@ -184,7 +188,7 @@ GtkIconSet *icon_set; GtkIconFactory *factory = gtk_icon_factory_new(); GtkIconTheme *theme = gtk_icon_theme_get_default(); - GtkStockItem item = { GEANYSENDMAIL_STOCK_MAIL, N_("Mail"), 0, 0, GETTEXT_PACKAGE }; + GtkStockItem item = { (gchar*)(GEANYSENDMAIL_STOCK_MAIL), (gchar*)(N_("Mail")), 0, 0, (gchar*)(GETTEXT_PACKAGE) }; if (gtk_icon_theme_has_icon(theme, "mail-message-new")) { diff -Nru geany-plugins-1.23+dfsg/geanysendmail/src/Makefile.in geany-plugins-1.24+dfsg/geanysendmail/src/Makefile.in --- geany-plugins-1.23+dfsg/geanysendmail/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanysendmail/src/Makefile.in 2014-04-13 17:12:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,17 +78,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp subdir = geanysendmail/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -74,12 +104,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -91,6 +124,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -143,6 +177,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 @@ -155,20 +202,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 = $(geanysendmail_la_SOURCES) DIST_SOURCES = $(geanysendmail_la_SOURCES) am__can_run_installinfo = \ @@ -176,6 +219,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -184,6 +244,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -202,6 +264,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -237,6 +301,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -303,6 +370,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -428,6 +505,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -454,12 +532,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + geanysendmail.la: $(geanysendmail_la_OBJECTS) $(geanysendmail_la_DEPENDENCIES) $(EXTRA_geanysendmail_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) -rpath $(geanypluginsdir) $(geanysendmail_la_OBJECTS) $(geanysendmail_la_LIBADD) $(LIBS) @@ -476,14 +557,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 $@ $< @@ -498,26 +579,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; \ @@ -529,15 +599,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 @@ -546,6 +612,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 @@ -692,24 +773,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/geanyvc/Makefile.in geany-plugins-1.24+dfsg/geanyvc/Makefile.in --- geany-plugins-1.23+dfsg/geanyvc/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyvc/Makefile.in 2014-04-13 17:12:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - NEWS THANKS TODO +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog NEWS README THANKS TODO subdir = geanyvc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -467,22 +545,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -497,57 +578,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 \ @@ -563,12 +599,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; \ @@ -580,15 +611,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 @@ -597,6 +624,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 @@ -760,22 +802,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/geanyvc/src/externdiff.c geany-plugins-1.24+dfsg/geanyvc/src/externdiff.c --- geany-plugins-1.23+dfsg/geanyvc/src/externdiff.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyvc/src/externdiff.c 2014-04-12 14:28:39.000000000 +0000 @@ -50,8 +50,10 @@ for (i = 0; i < EXTERNAL_DIFF_COUNT; i++) { - if (g_find_program_in_path(viewers[i])) + gchar *path = g_find_program_in_path(viewers[i]); + if (path) { + g_free(path); extern_diff_viewer = (gchar *) viewers[i]; return viewers[i]; } diff -Nru geany-plugins-1.23+dfsg/geanyvc/src/geanyvc.c geany-plugins-1.24+dfsg/geanyvc/src/geanyvc.c --- geany-plugins-1.23+dfsg/geanyvc/src/geanyvc.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyvc/src/geanyvc.c 2014-04-12 14:28:39.000000000 +0000 @@ -491,7 +491,7 @@ setptr(*std_out, encodings_convert_to_utf8(*std_out, strlen(*std_out), NULL)); } - if (!NZV(*std_out)) + if (EMPTY(*std_out)) { g_free(*std_out); *std_out = NULL; @@ -509,7 +509,7 @@ setptr(*std_err, encodings_convert_to_utf8(*std_err, strlen(*std_err), NULL)); } - if (!NZV(*std_err)) + if (EMPTY(*std_err)) { g_free(*std_err); *std_err = NULL; @@ -527,6 +527,7 @@ { gchar *dir = NULL; gint ret; + const gint action_command_cell = 1; if (std_out) *std_out = NULL; @@ -556,6 +557,10 @@ ret = execute_custom_command(dir, vc->commands[cmd].command, vc->commands[cmd].env, std_out, std_err, filename, list, message); + + ui_set_statusbar(TRUE, _("File %s: action %s executed via %s."), + filename, vc->commands[cmd].command[action_command_cell], vc->program); + g_free(dir); return ret; } @@ -963,7 +968,7 @@ { document_reload_file(doc, NULL); - if (NZV(text)) + if (!EMPTY(text)) show_output(text, "*VC-UPDATE*", NULL, NULL, 0); g_free(text); } @@ -1075,7 +1080,7 @@ } static void -set_diff_buff(GtkTextBuffer * buffer, const gchar * txt) +set_diff_buff(GtkWidget * textview, GtkTextBuffer * buffer, const gchar * txt) { GtkTextIter start, end; GtkTextMark *mark; @@ -1083,6 +1088,19 @@ const gchar *tagname = ""; const gchar *c, *p = txt; + if (strlen(txt) > COMMIT_DIFF_MAXLENGTH) + { + gtk_text_buffer_set_text(buffer, + _("The resulting differences cannot be displayed because " + "the changes are too big to display here and would slow down the UI significantly." + "\n\n" + "To view the differences, cancel this dialog and open the differences " + "in Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)."), -1); + gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_WORD); + return; + } + gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_NONE); + gtk_text_buffer_set_text(buffer, txt, -1); gtk_text_buffer_get_start_iter(buffer, &start); @@ -1152,7 +1170,7 @@ gchar *diff; GtkWidget *diffView = ui_lookup_widget(GTK_WIDGET(treeview), "textDiff"); diff = get_commit_diff(GTK_TREE_VIEW(treeview)); - set_diff_buff(gtk_text_view_get_buffer(GTK_TEXT_VIEW(diffView)), diff); + set_diff_buff(diffView, gtk_text_view_get_buffer(GTK_TEXT_VIEW(diffView)), diff); g_free(diff); } @@ -1288,6 +1306,26 @@ g_free(path); } +static gboolean commit_text_line_number_update_cb(GtkWidget *widget, GdkEvent *event, + gpointer user_data) +{ + GtkWidget *text_view = widget; + GtkLabel *line_column_label = GTK_LABEL(user_data); + GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_view)); + GtkTextMark *mark = gtk_text_buffer_get_insert(buffer); + GtkTextIter iter; + gint line, column; + gchar text[64]; + + gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark); + line = gtk_text_iter_get_line(&iter) + 1; + column = gtk_text_iter_get_line_offset(&iter); + + g_snprintf(text, sizeof(text), _("Line: %d Column: %d"), line, column); + gtk_label_set_text(line_column_label, text); + + return FALSE; +} static GtkWidget * create_commitDialog(void) @@ -1310,6 +1348,8 @@ GtkWidget *btnCancel; GtkWidget *btnCommit; GtkWidget *select_cbox; + GtkWidget *commit_text_vbox; + GtkWidget *lineColumnLabel; GtkTreeSelection *sel; gchar *rcstyle = g_strdup_printf("style \"geanyvc-diff-font\"\n" @@ -1395,14 +1435,17 @@ gtk_container_add(GTK_CONTAINER(frame1), alignment1); gtk_alignment_set_padding(GTK_ALIGNMENT(alignment1), 0, 0, 12, 0); + commit_text_vbox = gtk_vbox_new(FALSE, 0); + gtk_widget_show(commit_text_vbox); + gtk_container_add(GTK_CONTAINER(alignment1), commit_text_vbox); + scrolledwindow3 = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow3); - gtk_container_add(GTK_CONTAINER(alignment1), scrolledwindow3); + gtk_box_pack_start(GTK_BOX(commit_text_vbox), scrolledwindow3, TRUE, TRUE, 0); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow3), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwindow3), GTK_SHADOW_IN); - textCommitMessage = gtk_text_view_new(); gtk_widget_show(textCommitMessage); gtk_container_add(GTK_CONTAINER(scrolledwindow3), textCommitMessage); @@ -1415,6 +1458,12 @@ gtk_frame_set_label_widget(GTK_FRAME(frame1), label1); gtk_label_set_use_markup(GTK_LABEL(label1), TRUE); + /* line/column status label */ + lineColumnLabel = gtk_label_new(""); + gtk_misc_set_alignment(GTK_MISC(lineColumnLabel), 0, 0.5); + gtk_box_pack_end(GTK_BOX(commit_text_vbox), lineColumnLabel, TRUE, TRUE, 0); + gtk_widget_show(lineColumnLabel); + dialog_action_area1 = GTK_DIALOG(commitDialog)->action_area; gtk_widget_show(dialog_action_area1); gtk_button_box_set_layout(GTK_BUTTON_BOX(dialog_action_area1), GTK_BUTTONBOX_END); @@ -1431,6 +1480,13 @@ gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE); g_signal_connect(sel, "changed", G_CALLBACK(commit_tree_selection_changed_cb), textDiff); + g_signal_connect(textCommitMessage, "key-release-event", + G_CALLBACK(commit_text_line_number_update_cb), lineColumnLabel); + g_signal_connect(textCommitMessage, "button-release-event", + G_CALLBACK(commit_text_line_number_update_cb), lineColumnLabel); + /* initial setup */ + commit_text_line_number_update_cb(textCommitMessage, NULL, lineColumnLabel); + /* Store pointers to all widgets, for use by lookup_widget(). */ GLADE_HOOKUP_OBJECT_NO_REF(commitDialog, commitDialog, "commitDialog"); GLADE_HOOKUP_OBJECT_NO_REF(commitDialog, dialog_vbox1, "dialog_vbox1"); @@ -1523,7 +1579,7 @@ gtk_text_buffer_create_tag(diffbuf, "invisible", "invisible", TRUE, NULL); - set_diff_buff(diffbuf, diff); + set_diff_buff(diffView, diffbuf, diff); if (set_maximize_commit_dialog) { @@ -1548,7 +1604,7 @@ g_error_free(spellcheck_error); spellcheck_error = NULL; } - else if (NZV(lang)) + else if (!EMPTY(lang)) { gtkspell_set_language(speller, lang, &spellcheck_error); if (spellcheck_error != NULL) @@ -1574,7 +1630,7 @@ gtk_text_buffer_get_end_iter(mbuf, &end); message = gtk_text_buffer_get_text(mbuf, &begin, &end, FALSE); gtk_tree_model_foreach(model, get_commit_files_foreach, &selected_files); - if (NZV(message) && selected_files) + if (!EMPTY(message) && selected_files) { execute_command(vc, NULL, NULL, dir, VC_COMMAND_COMMIT, selected_files, message); @@ -1748,7 +1804,7 @@ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets.cb_confirm_add)); set_maximize_commit_dialog = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets.cb_max_commit)); - + set_external_diff = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets.cb_external_diff)); @@ -1879,7 +1935,7 @@ "inside tools menu or directly inside Geany's menubar." "Will take in account after next start of GeanyVC")); gtk_button_set_focus_on_click(GTK_BUTTON(widgets.cb_attach_to_menubar), FALSE); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets.cb_attach_to_menubar), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets.cb_attach_to_menubar), set_menubar_entry); gtk_box_pack_start(GTK_BOX(vbox), widgets.cb_attach_to_menubar, TRUE, FALSE, 2); @@ -2241,7 +2297,7 @@ GtkWidget *menu_vc_file = NULL; GtkWidget *menu_vc_dir = NULL; GtkWidget *menu_vc_basedir = NULL; - + config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, "VC", G_DIR_SEPARATOR_S, "VC.conf", NULL); @@ -2253,7 +2309,7 @@ if (set_menubar_entry == TRUE) { GtkMenuShell *menubar; - + menubar = GTK_MENU_SHELL( ui_lookup_widget(geany->main_widgets->window, "menubar1")); diff -Nru geany-plugins-1.23+dfsg/geanyvc/src/geanyvc.h geany-plugins-1.24+dfsg/geanyvc/src/geanyvc.h --- geany-plugins-1.23+dfsg/geanyvc/src/geanyvc.h 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyvc/src/geanyvc.h 2013-06-30 11:40:06.000000000 +0000 @@ -52,6 +52,8 @@ VC_COMMAND_STARTDIR_FILE }; +#define COMMIT_DIFF_MAXLENGTH 16384 + #define FLAG_RELOAD (1<<0) #define FLAG_FORCE_ASK (1<<1) #define FLAG_FILE (1<<2) diff -Nru geany-plugins-1.23+dfsg/geanyvc/src/Makefile.in geany-plugins-1.24+dfsg/geanyvc/src/Makefile.in --- geany-plugins-1.23+dfsg/geanyvc/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyvc/src/Makefile.in 2014-04-13 17:12:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,17 +78,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp subdir = geanyvc/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -74,12 +104,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -91,6 +124,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -146,9 +180,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 = geanyvc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(geanyvc_la_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 @@ -161,20 +208,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 = $(geanyvc_la_SOURCES) DIST_SOURCES = $(geanyvc_la_SOURCES) am__can_run_installinfo = \ @@ -182,6 +225,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -190,6 +250,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -208,6 +270,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -243,6 +307,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -309,6 +376,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -452,6 +529,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -478,12 +556,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + geanyvc.la: $(geanyvc_la_OBJECTS) $(geanyvc_la_DEPENDENCIES) $(EXTRA_geanyvc_la_DEPENDENCIES) $(AM_V_CCLD)$(geanyvc_la_LINK) -rpath $(geanypluginsdir) $(geanyvc_la_OBJECTS) $(geanyvc_la_LIBADD) $(LIBS) @@ -508,14 +589,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 $@ $< @@ -593,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; \ @@ -624,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 @@ -641,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 @@ -787,24 +868,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/geanyvc/src/vc_bzr.c geany-plugins-1.24+dfsg/geanyvc/src/vc_bzr.c --- geany-plugins-1.23+dfsg/geanyvc/src/vc_bzr.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyvc/src/vc_bzr.c 2014-04-12 14:28:39.000000000 +0000 @@ -137,7 +137,7 @@ execute_custom_command(dir, (const gchar **) argv, NULL, &std_output, NULL, filename, NULL, NULL); - if (NZV(std_output)) + if (!EMPTY(std_output)) { ret = TRUE; } @@ -178,7 +178,7 @@ g_return_val_if_fail(base_dir, NULL); execute_custom_command(base_dir, argv, NULL, &txt, NULL, base_dir, NULL, NULL); - if (!NZV(txt)) + if (EMPTY(txt)) { g_free(base_dir); g_free(txt); diff -Nru geany-plugins-1.23+dfsg/geanyvc/src/vc_cvs.c geany-plugins-1.24+dfsg/geanyvc/src/vc_cvs.c --- geany-plugins-1.23+dfsg/geanyvc/src/vc_cvs.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyvc/src/vc_cvs.c 2014-04-12 14:28:39.000000000 +0000 @@ -167,7 +167,7 @@ const char *argv[] = { "cvs", "-nq", "update", NULL }; execute_custom_command(dir, argv, NULL, &txt, NULL, dir, NULL, NULL); - if (!NZV(txt)) + if (EMPTY(txt)) return NULL; p = txt; diff -Nru geany-plugins-1.23+dfsg/geanyvc/src/vc_git.c geany-plugins-1.24+dfsg/geanyvc/src/vc_git.c --- geany-plugins-1.23+dfsg/geanyvc/src/vc_git.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyvc/src/vc_git.c 2014-04-12 14:28:39.000000000 +0000 @@ -199,7 +199,7 @@ execute_custom_command(dir, (const gchar **) argv, NULL, &std_output, NULL, dir, NULL, NULL); - if (NZV(std_output)) + if (!EMPTY(std_output)) { ret = TRUE; g_free(std_output); diff -Nru geany-plugins-1.23+dfsg/geanyvc/src/vc_hg.c geany-plugins-1.24+dfsg/geanyvc/src/vc_hg.c --- geany-plugins-1.23+dfsg/geanyvc/src/vc_hg.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyvc/src/vc_hg.c 2014-04-12 14:28:39.000000000 +0000 @@ -135,7 +135,7 @@ execute_custom_command(dir, (const gchar **) argv, NULL, &std_output, NULL, dir, NULL, NULL); - if (NZV(std_output)) + if (!EMPTY(std_output)) { ret = TRUE; g_free(std_output); @@ -173,7 +173,7 @@ g_return_val_if_fail(base_dir, NULL); execute_custom_command(base_dir, argv, NULL, &txt, NULL, base_dir, NULL, NULL); - if (!NZV(txt)) + if (EMPTY(txt)) { g_free(base_dir); g_free(txt); diff -Nru geany-plugins-1.23+dfsg/geanyvc/src/vc_svk.c geany-plugins-1.24+dfsg/geanyvc/src/vc_svk.c --- geany-plugins-1.23+dfsg/geanyvc/src/vc_svk.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyvc/src/vc_svk.c 2014-04-12 14:28:39.000000000 +0000 @@ -178,7 +178,7 @@ const char *argv[] = { "svk", "status", NULL }; execute_custom_command(dir, argv, NULL, &txt, NULL, dir, NULL, NULL); - if (!NZV(txt)) + if (EMPTY(txt)) return NULL; p = txt; diff -Nru geany-plugins-1.23+dfsg/geanyvc/src/vc_svn.c geany-plugins-1.24+dfsg/geanyvc/src/vc_svn.c --- geany-plugins-1.23+dfsg/geanyvc/src/vc_svn.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyvc/src/vc_svn.c 2014-04-12 14:28:39.000000000 +0000 @@ -158,7 +158,12 @@ break; } while (strcmp(base, base_prev) != 0); - + if (base_prev == NULL) + { + /* fallback for Subversion 1.7: try to climb up the tree until we + * find a .svn subdirectory */ + base_prev = find_subdir_path(path, ".svn"); + } g_free(base); return base_prev; } @@ -172,7 +177,7 @@ gboolean ret = FALSE; gchar *std_output; - if (!find_dir(filename, ".svn", FALSE)) + if (!find_dir(filename, ".svn", TRUE)) return FALSE; if (g_file_test(filename, G_FILE_TEST_IS_DIR)) @@ -184,7 +189,7 @@ execute_custom_command(dir, (const gchar **) argv, NULL, &std_output, NULL, dir, NULL, NULL); - if (NZV(std_output)) + if (!EMPTY(std_output)) { ret = TRUE; g_free(std_output); @@ -218,7 +223,7 @@ const char *argv[] = { "svn", "status", NULL }; execute_custom_command(dir, argv, NULL, &txt, NULL, dir, NULL, NULL); - if (!NZV(txt)) + if (EMPTY(txt)) return NULL; p = txt; diff -Nru geany-plugins-1.23+dfsg/geanyvc/tests/Makefile.am geany-plugins-1.24+dfsg/geanyvc/tests/Makefile.am --- geany-plugins-1.23+dfsg/geanyvc/tests/Makefile.am 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyvc/tests/Makefile.am 2013-06-30 11:40:06.000000000 +0000 @@ -1,8 +1,8 @@ if UNITTESTS include $(top_srcdir)/build/vars.build.mk -INCLUDES = $(GEANY_CFLAGS) -DUNITTESTS TESTS=unittests check_PROGRAMS=unittests unittests_SOURCES = unittests.c ../src/utils.c -unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ +unittests_CFLAGS = $(GEANY_CFLAGS) -DUNITTESTS +unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ endif diff -Nru geany-plugins-1.23+dfsg/geanyvc/tests/Makefile.in geany-plugins-1.24+dfsg/geanyvc/tests/Makefile.in --- geany-plugins-1.23+dfsg/geanyvc/tests/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geanyvc/tests/Makefile.in 2014-04-13 17:12:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -50,18 +77,22 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp \ + $(top_srcdir)/test-driver @UNITTESTS_TRUE@TESTS = unittests$(EXEEXT) @UNITTESTS_TRUE@check_PROGRAMS = unittests$(EXEEXT) subdir = geanyvc/tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -74,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -91,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,14 +142,30 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__unittests_SOURCES_DIST = unittests.c ../src/utils.c -@UNITTESTS_TRUE@am_unittests_OBJECTS = unittests.$(OBJEXT) \ -@UNITTESTS_TRUE@ utils.$(OBJEXT) +@UNITTESTS_TRUE@am_unittests_OBJECTS = unittests-unittests.$(OBJEXT) \ +@UNITTESTS_TRUE@ unittests-utils.$(OBJEXT) unittests_OBJECTS = $(am_unittests_OBJECTS) am__DEPENDENCIES_1 = @UNITTESTS_TRUE@unittests_DEPENDENCIES = $(am__DEPENDENCIES_1) 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 = +unittests_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(unittests_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 @@ -127,20 +178,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 = $(unittests_SOURCES) DIST_SOURCES = $(am__unittests_SOURCES_DIST) am__can_run_installinfo = \ @@ -148,16 +195,237 @@ 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) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -176,6 +444,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -211,6 +481,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -277,6 +550,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -364,13 +647,13 @@ @UNITTESTS_TRUE@ $(GEANY_LIBS) \ @UNITTESTS_TRUE@ $(INTLLIBS) -@UNITTESTS_TRUE@INCLUDES = $(GEANY_CFLAGS) -DUNITTESTS @UNITTESTS_TRUE@unittests_SOURCES = unittests.c ../src/utils.c +@UNITTESTS_TRUE@unittests_CFLAGS = $(GEANY_CFLAGS) -DUNITTESTS @UNITTESTS_TRUE@unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/vars.build.mk $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -411,9 +694,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + unittests$(EXEEXT): $(unittests_OBJECTS) $(unittests_DEPENDENCIES) $(EXTRA_unittests_DEPENDENCIES) @rm -f unittests$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(unittests_OBJECTS) $(unittests_LDADD) $(LIBS) + $(AM_V_CCLD)$(unittests_LINK) $(unittests_OBJECTS) $(unittests_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -421,22 +705,22 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unittests.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unittests-unittests.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unittests-utils.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @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 $@ $< @@ -445,19 +729,33 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -utils.o: ../src/utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT utils.o -MD -MP -MF $(DEPDIR)/utils.Tpo -c -o utils.o `test -f '../src/utils.c' || echo '$(srcdir)/'`../src/utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utils.Tpo $(DEPDIR)/utils.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../src/utils.c' object='utils.o' libtool=no @AMDEPBACKSLASH@ +unittests-unittests.o: unittests.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittests_CFLAGS) $(CFLAGS) -MT unittests-unittests.o -MD -MP -MF $(DEPDIR)/unittests-unittests.Tpo -c -o unittests-unittests.o `test -f 'unittests.c' || echo '$(srcdir)/'`unittests.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/unittests-unittests.Tpo $(DEPDIR)/unittests-unittests.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unittests.c' object='unittests-unittests.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittests_CFLAGS) $(CFLAGS) -c -o unittests-unittests.o `test -f 'unittests.c' || echo '$(srcdir)/'`unittests.c + +unittests-unittests.obj: unittests.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittests_CFLAGS) $(CFLAGS) -MT unittests-unittests.obj -MD -MP -MF $(DEPDIR)/unittests-unittests.Tpo -c -o unittests-unittests.obj `if test -f 'unittests.c'; then $(CYGPATH_W) 'unittests.c'; else $(CYGPATH_W) '$(srcdir)/unittests.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/unittests-unittests.Tpo $(DEPDIR)/unittests-unittests.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unittests.c' object='unittests-unittests.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittests_CFLAGS) $(CFLAGS) -c -o unittests-unittests.obj `if test -f 'unittests.c'; then $(CYGPATH_W) 'unittests.c'; else $(CYGPATH_W) '$(srcdir)/unittests.c'; fi` + +unittests-utils.o: ../src/utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittests_CFLAGS) $(CFLAGS) -MT unittests-utils.o -MD -MP -MF $(DEPDIR)/unittests-utils.Tpo -c -o unittests-utils.o `test -f '../src/utils.c' || echo '$(srcdir)/'`../src/utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/unittests-utils.Tpo $(DEPDIR)/unittests-utils.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../src/utils.c' object='unittests-utils.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o utils.o `test -f '../src/utils.c' || echo '$(srcdir)/'`../src/utils.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittests_CFLAGS) $(CFLAGS) -c -o unittests-utils.o `test -f '../src/utils.c' || echo '$(srcdir)/'`../src/utils.c -utils.obj: ../src/utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT utils.obj -MD -MP -MF $(DEPDIR)/utils.Tpo -c -o utils.obj `if test -f '../src/utils.c'; then $(CYGPATH_W) '../src/utils.c'; else $(CYGPATH_W) '$(srcdir)/../src/utils.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utils.Tpo $(DEPDIR)/utils.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../src/utils.c' object='utils.obj' libtool=no @AMDEPBACKSLASH@ +unittests-utils.obj: ../src/utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittests_CFLAGS) $(CFLAGS) -MT unittests-utils.obj -MD -MP -MF $(DEPDIR)/unittests-utils.Tpo -c -o unittests-utils.obj `if test -f '../src/utils.c'; then $(CYGPATH_W) '../src/utils.c'; else $(CYGPATH_W) '$(srcdir)/../src/utils.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/unittests-utils.Tpo $(DEPDIR)/unittests-utils.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../src/utils.c' object='unittests-utils.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o utils.obj `if test -f '../src/utils.c'; then $(CYGPATH_W) '../src/utils.c'; else $(CYGPATH_W) '$(srcdir)/../src/utils.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittests_CFLAGS) $(CFLAGS) -c -o unittests-utils.obj `if test -f '../src/utils.c'; then $(CYGPATH_W) '../src/utils.c'; else $(CYGPATH_W) '$(srcdir)/../src/utils.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -465,26 +763,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; \ @@ -496,15 +783,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 @@ -513,102 +796,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; \ + else \ + 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 $(check_PROGRAMS) + @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 $$? +unittests.log: unittests$(EXEEXT) + @p='unittests$(EXEEXT)'; \ + b='unittests'; \ + $(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'`; \ @@ -666,6 +1034,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: @@ -749,9 +1120,9 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic 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 \ @@ -761,7 +1132,7 @@ 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 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru geany-plugins-1.23+dfsg/geniuspaste/Makefile.in geany-plugins-1.24+dfsg/geniuspaste/Makefile.in --- geany-plugins-1.23+dfsg/geniuspaste/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geniuspaste/Makefile.in 2014-04-13 17:12:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - NEWS TODO +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog NEWS README TODO subdir = geniuspaste ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -467,22 +545,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -497,57 +578,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 \ @@ -563,12 +599,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; \ @@ -580,15 +611,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 @@ -597,6 +624,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 @@ -760,22 +802,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/geniuspaste/src/Makefile.in geany-plugins-1.24+dfsg/geniuspaste/src/Makefile.in --- geany-plugins-1.23+dfsg/geniuspaste/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/geniuspaste/src/Makefile.in 2014-04-13 17:12:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,17 +78,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp subdir = geniuspaste/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -74,12 +104,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -91,6 +124,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -144,10 +178,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 = geniuspaste_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(geniuspaste_la_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 @@ -160,20 +207,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 = $(geniuspaste_la_SOURCES) DIST_SOURCES = $(geniuspaste_la_SOURCES) am__can_run_installinfo = \ @@ -181,6 +224,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -189,6 +249,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -207,6 +269,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -242,6 +306,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -308,6 +375,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -446,6 +523,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -472,12 +550,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + geniuspaste.la: $(geniuspaste_la_OBJECTS) $(geniuspaste_la_DEPENDENCIES) $(EXTRA_geniuspaste_la_DEPENDENCIES) $(AM_V_CCLD)$(geniuspaste_la_LINK) -rpath $(geanypluginsdir) $(geniuspaste_la_OBJECTS) $(geniuspaste_la_LIBADD) $(LIBS) @@ -494,14 +575,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 $@ $< @@ -523,26 +604,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; \ @@ -554,15 +624,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 @@ -571,6 +637,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 @@ -717,24 +798,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/gproject/icons/Makefile.in geany-plugins-1.24+dfsg/gproject/icons/Makefile.in --- geany-plugins-1.23+dfsg/gproject/icons/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/gproject/icons/Makefile.in 2014-04-13 17:12:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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,15 +79,18 @@ build_triplet = @build@ host_triplet = @host@ subdir = gproject/icons -DIST_COMMON = $(dist_icon_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(dist_icon_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -73,12 +103,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -90,6 +123,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -105,12 +139,18 @@ 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 = \ @@ -147,12 +187,15 @@ } am__installdirs = "$(DESTDIR)$(icondir)" DATA = $(dist_icon_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -171,6 +214,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -206,6 +251,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -272,6 +320,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -414,11 +472,11 @@ @list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -559,17 +617,18 @@ .MAKE: install-am install-data-am install-strip uninstall-am .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-dist_iconDATA 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-dist_iconDATA uninstall-hook + 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-dist_iconDATA 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-dist_iconDATA \ + uninstall-hook install-data-hook: update-icon-cache uninstall-hook: update-icon-cache diff -Nru geany-plugins-1.23+dfsg/gproject/Makefile.in geany-plugins-1.24+dfsg/gproject/Makefile.in --- geany-plugins-1.23+dfsg/gproject/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/gproject/Makefile.in 2014-04-13 17:12:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - NEWS THANKS +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog NEWS README THANKS subdir = gproject ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -467,22 +545,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -497,57 +578,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 \ @@ -563,12 +599,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; \ @@ -580,15 +611,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 @@ -597,6 +624,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 @@ -760,22 +802,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/gproject/README geany-plugins-1.24+dfsg/gproject/README --- geany-plugins-1.23+dfsg/gproject/README 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/gproject/README 2013-06-30 11:40:06.000000000 +0000 @@ -187,7 +187,7 @@ Get the code from:: - svn checkout http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geany-plugins + git clone https://github.com/geany/geany-plugins.git Ideas, questions, patches and bug reports ========================================= diff -Nru geany-plugins-1.23+dfsg/gproject/src/gproject-main.c geany-plugins-1.24+dfsg/gproject/src/gproject-main.c --- geany-plugins-1.23+dfsg/gproject/src/gproject-main.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/gproject/src/gproject-main.c 2013-06-30 11:40:06.000000000 +0000 @@ -66,8 +66,6 @@ static void on_doc_activate(G_GNUC_UNUSED GObject * obj, G_GNUC_UNUSED GeanyDocument * doc, G_GNUC_UNUSED gpointer user_data) { - g_return_if_fail(doc != NULL && doc->file_name != NULL); - gprj_sidebar_update(FALSE); } diff -Nru geany-plugins-1.23+dfsg/gproject/src/gproject-project.c geany-plugins-1.24+dfsg/gproject/src/gproject-project.c --- geany-plugins-1.23+dfsg/gproject/src/gproject-project.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/gproject/src/gproject-project.c 2014-04-12 14:28:39.000000000 +0000 @@ -345,9 +345,9 @@ ignored_dirs_patterns, generate_tags); - g_free(source_patterns); - g_free(header_patterns); - g_free(ignored_dirs_patterns); + g_strfreev(source_patterns); + g_strfreev(header_patterns); + g_strfreev(ignored_dirs_patterns); } diff -Nru geany-plugins-1.23+dfsg/gproject/src/gproject-sidebar.c geany-plugins-1.24+dfsg/gproject/src/gproject-sidebar.c --- geany-plugins-1.23+dfsg/gproject/src/gproject-sidebar.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/gproject/src/gproject-sidebar.c 2014-04-12 14:28:39.000000000 +0000 @@ -24,6 +24,7 @@ #include "config.h" #endif #include +#include #include "gproject-utils.h" #include "gproject-project.h" @@ -47,6 +48,14 @@ static struct { + GtkWidget *expand; + GtkWidget *collapse; + GtkWidget *follow; +} s_project_toolbar = {NULL, NULL, NULL}; + + +static struct +{ GtkWidget *widget; GtkWidget *dir_label; @@ -92,7 +101,7 @@ label = gtk_label_new(_("Search for:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_size_group_add_widget(size_group, label); - s_fif_dialog.combo = gtk_combo_box_entry_new_text(); + s_fif_dialog.combo = gtk_combo_box_text_new_with_entry(); entry = gtk_bin_get_child(GTK_BIN(s_fif_dialog.combo)); gtk_entry_set_width_chars(GTK_ENTRY(entry), 40); gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); @@ -146,7 +155,7 @@ *pattern = g_strconcat("*", str, "*", NULL); *case_sensitive = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(s_fif_dialog.case_sensitive)); *full_path = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(s_fif_dialog.full_path)); - ui_combo_box_add_to_history(GTK_COMBO_BOX_ENTRY(s_fif_dialog.combo), str, 0); + ui_combo_box_add_to_history(GTK_COMBO_BOX_TEXT(s_fif_dialog.combo), str, 0); } gtk_widget_hide(s_fif_dialog.widget); @@ -345,10 +354,10 @@ else { gchar *name; - gchar *icon; + GIcon *icon; gtk_tree_model_get(model, &iter, FILEVIEW_COLUMN_ICON, &icon, -1); - + if (!icon) { /* help string doesn't have icon */ @@ -358,6 +367,7 @@ name = build_path(&iter); open_file(name); g_free(name); + g_object_unref(icon); } } } @@ -456,6 +466,7 @@ GtkTreeIter iter; gchar **path_arr = dir_list->data; gchar *last_dir_name; + GIcon *icon_dir = g_icon_new_for_string("gtk-directory", NULL); last_dir_name = path_arr[level]; @@ -470,7 +481,7 @@ { gtk_tree_store_append(s_file_store, &iter, parent); gtk_tree_store_set(s_file_store, &iter, - FILEVIEW_COLUMN_ICON, "gtk-directory", + FILEVIEW_COLUMN_ICON, icon_dir, FILEVIEW_COLUMN_NAME, last_dir_name, -1); create_branch(level+1, tmp_list, &iter, header_patterns, source_patterns); @@ -485,39 +496,60 @@ gtk_tree_store_append(s_file_store, &iter, parent); gtk_tree_store_set(s_file_store, &iter, - FILEVIEW_COLUMN_ICON, "gtk-directory", + FILEVIEW_COLUMN_ICON, icon_dir, FILEVIEW_COLUMN_NAME, last_dir_name, -1); create_branch(level+1, tmp_list, &iter, header_patterns, source_patterns); g_slist_free(tmp_list); g_slist_free(dir_list); + g_object_unref(icon_dir); } for (elem = file_list; elem != NULL; elem = g_slist_next(elem)) { GtkTreeIter iter; gchar **path_arr = elem->data; + GIcon *icon = NULL; + gchar *content_type = g_content_type_guess(path_arr[level], NULL, 0, NULL); + + if (content_type) + { + icon = g_content_type_get_icon(content_type); + g_free(content_type); + } gtk_tree_store_append(s_file_store, &iter, parent); if (patterns_match(header_patterns, path_arr[level])) { + if (! icon) + icon = g_icon_new_for_string("gproject-header", NULL); + gtk_tree_store_set(s_file_store, &iter, - FILEVIEW_COLUMN_ICON, "gproject-header", + FILEVIEW_COLUMN_ICON, icon, FILEVIEW_COLUMN_NAME, path_arr[level], -1); } else if (patterns_match(source_patterns, path_arr[level])) { + if (! icon) + icon = g_icon_new_for_string("gproject-source", NULL); + gtk_tree_store_set(s_file_store, &iter, - FILEVIEW_COLUMN_ICON, "gproject-source", + FILEVIEW_COLUMN_ICON, icon, FILEVIEW_COLUMN_NAME, path_arr[level], -1); } else { + if (! icon) + icon = g_icon_new_for_string("gproject-file", NULL); + gtk_tree_store_set(s_file_store, &iter, - FILEVIEW_COLUMN_ICON, "gproject-file", + FILEVIEW_COLUMN_ICON, icon, FILEVIEW_COLUMN_NAME, path_arr[level], -1); } + + if (icon) + g_object_unref(icon); } g_slist_free(file_list); @@ -550,7 +582,13 @@ } if (path_list != NULL) + { create_branch(0, path_list, NULL, header_patterns, source_patterns); + + gtk_widget_set_sensitive(s_project_toolbar.expand, TRUE); + gtk_widget_set_sensitive(s_project_toolbar.collapse, TRUE); + gtk_widget_set_sensitive(s_project_toolbar.follow, TRUE); + } else { GtkTreeIter iter; @@ -558,6 +596,10 @@ gtk_tree_store_append(s_file_store, &iter, NULL); gtk_tree_store_set(s_file_store, &iter, FILEVIEW_COLUMN_NAME, "Set file patterns under Project->Properties", -1); + + gtk_widget_set_sensitive(s_project_toolbar.expand, FALSE); + gtk_widget_set_sensitive(s_project_toolbar.collapse, FALSE); + gtk_widget_set_sensitive(s_project_toolbar.follow, FALSE); } g_slist_foreach(header_patterns, (GFunc) g_pattern_spec_free, NULL); @@ -688,6 +730,7 @@ GtkTreeViewColumn *column; GtkTreeSelection *sel; PangoFontDescription *pfd; + GList *focus_chain = NULL; s_file_view_vbox = gtk_vbox_new(FALSE, 0); @@ -711,12 +754,14 @@ ui_widget_set_tooltip_text(item, _("Expand all")); g_signal_connect(item, "clicked", G_CALLBACK(on_expand_all), NULL); gtk_container_add(GTK_CONTAINER(toolbar), item); + s_project_toolbar.expand = item; item = GTK_WIDGET(gtk_tool_button_new(NULL, NULL)); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON(item), "gproject-collapse"); ui_widget_set_tooltip_text(item, _("Collapse all")); g_signal_connect(item, "clicked", G_CALLBACK(on_collapse_all), NULL); gtk_container_add(GTK_CONTAINER(toolbar), item); + s_project_toolbar.collapse = item; item = GTK_WIDGET(gtk_separator_tool_item_new()); gtk_container_add(GTK_CONTAINER(toolbar), item); @@ -726,6 +771,7 @@ ui_widget_set_tooltip_text(item, _("Follow active editor")); g_signal_connect(item, "clicked", G_CALLBACK(on_follow_active), NULL); gtk_container_add(GTK_CONTAINER(toolbar), item); + s_project_toolbar.follow = item; gtk_box_pack_start(GTK_BOX(s_file_view_vbox), toolbar, FALSE, FALSE, 0); @@ -733,13 +779,13 @@ s_file_view = gtk_tree_view_new(); - s_file_store = gtk_tree_store_new(FILEVIEW_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING); + s_file_store = gtk_tree_store_new(FILEVIEW_N_COLUMNS, G_TYPE_ICON, G_TYPE_STRING); gtk_tree_view_set_model(GTK_TREE_VIEW(s_file_view), GTK_TREE_MODEL(s_file_store)); renderer = gtk_cell_renderer_pixbuf_new(); column = gtk_tree_view_column_new(); gtk_tree_view_column_pack_start(column, renderer, FALSE); - gtk_tree_view_column_set_attributes(column, renderer, "icon-name", FILEVIEW_COLUMN_ICON, NULL); + gtk_tree_view_column_set_attributes(column, renderer, "gicon", FILEVIEW_COLUMN_ICON, NULL); renderer = gtk_cell_renderer_text_new(); gtk_tree_view_column_pack_start(column, renderer, TRUE); @@ -811,11 +857,13 @@ /**** the rest ****/ + focus_chain = g_list_prepend(focus_chain, s_file_view); + gtk_container_set_focus_chain(GTK_CONTAINER(s_file_view_vbox), focus_chain); scrollwin = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_add(GTK_CONTAINER(scrollwin), s_file_view); - gtk_container_add(GTK_CONTAINER(s_file_view_vbox), scrollwin); + gtk_box_pack_start(GTK_BOX(s_file_view_vbox), scrollwin, TRUE, TRUE, 0); gtk_widget_show_all(s_file_view_vbox); gtk_notebook_append_page(GTK_NOTEBOOK(geany->main_widgets->sidebar_notebook), diff -Nru geany-plugins-1.23+dfsg/gproject/src/gproject-utils.c geany-plugins-1.24+dfsg/gproject/src/gproject-utils.c --- geany-plugins-1.23+dfsg/gproject/src/gproject-utils.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/gproject/src/gproject-utils.c 2014-04-12 14:28:39.000000000 +0000 @@ -36,7 +36,7 @@ origin = tm_get_real_path(origin_dir); dest = tm_get_real_path(dest_dir); - if (!NZV(origin) || !NZV(dest) || origin[0] != dest[0]) + if (EMPTY(origin) || EMPTY(dest) || origin[0] != dest[0]) { g_free(origin); g_free(dest); @@ -65,7 +65,7 @@ g_free(dest); g_strfreev(originv); g_strfreev(destv); - + return ret; } diff -Nru geany-plugins-1.23+dfsg/gproject/src/Makefile.in geany-plugins-1.24+dfsg/gproject/src/Makefile.in --- geany-plugins-1.23+dfsg/gproject/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/gproject/src/Makefile.in 2014-04-13 17:12:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,17 +78,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp subdir = gproject/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -74,12 +104,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -91,6 +124,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -146,9 +180,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 = gproject_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(gproject_la_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 @@ -161,20 +208,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 = $(gproject_la_SOURCES) DIST_SOURCES = $(gproject_la_SOURCES) am__can_run_installinfo = \ @@ -182,6 +225,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -190,6 +250,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -208,6 +270,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -243,6 +307,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -309,6 +376,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -445,6 +522,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -471,12 +549,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + gproject.la: $(gproject_la_OBJECTS) $(gproject_la_DEPENDENCIES) $(EXTRA_gproject_la_DEPENDENCIES) $(AM_V_CCLD)$(gproject_la_LINK) -rpath $(geanypluginsdir) $(gproject_la_OBJECTS) $(gproject_la_LIBADD) $(LIBS) @@ -497,14 +578,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 +635,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 +655,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 +668,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 @@ -748,24 +829,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/gproject/wscript_build geany-plugins-1.24+dfsg/gproject/wscript_build --- geany-plugins-1.23+dfsg/gproject/wscript_build 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/gproject/wscript_build 2014-04-12 14:28:39.000000000 +0000 @@ -29,10 +29,8 @@ build_plugin(bld, name, includes=includes) # Icons -if target_is_win32(bld): - icon_dest = '${GEANYPLUGINS_DATADIR}/icons' -else: - icon_dest = '${GEANYPLUGINS_DATADIR}/icons/hicolor/16x16/apps' +prefix = '${G_PREFIX}/' if target_is_win32(bld) else '' +icon_dest = '%s${GEANYPLUGINS_DATADIR}/icons/hicolor/16x16/apps' % prefix start_dir = bld.path.find_dir('icons') bld.install_files(icon_dest, start_dir.ant_glob('*.png'), cwd=start_dir) diff -Nru geany-plugins-1.23+dfsg/install-sh geany-plugins-1.24+dfsg/install-sh --- geany-plugins-1.23+dfsg/install-sh 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/install-sh 2014-04-13 17:12:41.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-01-19.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ # 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 @@ -156,7 +156,7 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 - # 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 @@ -190,7 +190,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,7 +202,7 @@ 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 @@ -240,7 +240,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 @@ -354,7 +354,7 @@ 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. + # other-writable 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 diff -Nru geany-plugins-1.23+dfsg/ltmain.sh geany-plugins-1.24+dfsg/ltmain.sh --- geany-plugins-1.23+dfsg/ltmain.sh 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/ltmain.sh 2014-04-13 17:12:33.000000000 +0000 @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu2 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1ubuntu2" +VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1" TIMESTAMP="" package_revision=1.3337 diff -Nru geany-plugins-1.23+dfsg/Makefile.am geany-plugins-1.24+dfsg/Makefile.am --- geany-plugins-1.23+dfsg/Makefile.am 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/Makefile.am 2014-04-12 14:28:39.000000000 +0000 @@ -1,4 +1,5 @@ -ACLOCAL_AMFLAGS = -I build/cache -I build -I build/bundled --install +ACLOCAL_AMFLAGS = -I build/cache -I build -I build/bundled -I geanypy/m4 --install +AM_DISTCHECK_CONFIGURE_FLAGS = --with-geany-libdir='$${libdir}' SUBDIRS = po @@ -6,6 +7,10 @@ SUBDIRS += addons endif +if ENABLE_AUTOCLOSE +SUBDIRS += autoclose +endif + if ENABLE_CODENAV SUBDIRS += codenav endif @@ -18,6 +23,10 @@ SUBDIRS += debugger endif +if ENABLE_DEFINEFORMAT +SUBDIRS += defineformat +endif + if ENABLE_DEVHELP SUBDIRS += devhelp endif @@ -70,6 +79,10 @@ SUBDIRS += geanyprj endif +if ENABLE_GEANYPY +SUBDIRS += geanypy +endif + if ENABLE_GEANYSENDMAIL SUBDIRS += geanysendmail endif @@ -94,6 +107,14 @@ SUBDIRS += multiterm endif +if ENABLE_PAIRTAGHIGHLIGHTER +SUBDIRS += pairtaghighlighter +endif + +if ENABLE_POHELPER +SUBDIRS += pohelper +endif + if ENABLE_PRETTY_PRINTER SUBDIRS += pretty-printer endif diff -Nru geany-plugins-1.23+dfsg/Makefile.in geany-plugins-1.24+dfsg/Makefile.in --- geany-plugins-1.23+dfsg/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/Makefile.in 2014-04-13 17:12:41.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,49 +78,57 @@ build_triplet = @build@ host_triplet = @host@ @ENABLE_ADDONS_TRUE@am__append_1 = addons -@ENABLE_CODENAV_TRUE@am__append_2 = codenav -@ENABLE_COMMANDER_TRUE@am__append_3 = commander -@ENABLE_DEBUGGER_TRUE@am__append_4 = debugger -@ENABLE_DEVHELP_TRUE@am__append_5 = devhelp -@ENABLE_GEANYDOC_TRUE@am__append_6 = geanydoc -@ENABLE_GEANYEXTRASEL_TRUE@am__append_7 = geanyextrasel -@ENABLE_GEANYGENDOC_TRUE@am__append_8 = geanygendoc -@ENABLE_GEANYINSERTNUM_TRUE@am__append_9 = geanyinsertnum -@ENABLE_GEANYLATEX_TRUE@am__append_10 = geanylatex -@ENABLE_GEANYLIPSUM_TRUE@am__append_11 = geanylipsum -@ENABLE_GEANYLUA_TRUE@am__append_12 = geanylua -@ENABLE_GEANYMACRO_TRUE@am__append_13 = geanymacro -@ENABLE_GEANYMINISCRIPT_TRUE@am__append_14 = geanyminiscript -@ENABLE_GEANYNUMBEREDBOOKMARKS_TRUE@am__append_15 = geanynumberedbookmarks -@ENABLE_GEANYPG_TRUE@am__append_16 = geanypg -@ENABLE_GEANYPRJ_TRUE@am__append_17 = geanyprj -@ENABLE_GEANYSENDMAIL_TRUE@am__append_18 = geanysendmail -@ENABLE_GEANYVC_TRUE@am__append_19 = geanyvc -@ENABLE_GENIUSPASTE_TRUE@am__append_20 = geniuspaste -@ENABLE_GPROJECT_TRUE@am__append_21 = gproject -@ENABLE_MARKDOWN_TRUE@am__append_22 = markdown -@ENABLE_MULTITERM_TRUE@am__append_23 = multiterm -@ENABLE_PRETTY_PRINTER_TRUE@am__append_24 = pretty-printer -@ENABLE_SCOPE_TRUE@am__append_25 = scope -@ENABLE_SHIFTCOLUMN_TRUE@am__append_26 = shiftcolumn -@ENABLE_SPELLCHECK_TRUE@am__append_27 = spellcheck -@ENABLE_TABLECONVERT_TRUE@am__append_28 = tableconvert -@ENABLE_TREEBROWSER_TRUE@am__append_29 = treebrowser -@ENABLE_UPDATECHECKER_TRUE@am__append_30 = updatechecker -@ENABLE_WEBHELPER_TRUE@am__append_31 = webhelper -@ENABLE_XMLSNIPPETS_TRUE@am__append_32 = xmlsnippets +@ENABLE_AUTOCLOSE_TRUE@am__append_2 = autoclose +@ENABLE_CODENAV_TRUE@am__append_3 = codenav +@ENABLE_COMMANDER_TRUE@am__append_4 = commander +@ENABLE_DEBUGGER_TRUE@am__append_5 = debugger +@ENABLE_DEFINEFORMAT_TRUE@am__append_6 = defineformat +@ENABLE_DEVHELP_TRUE@am__append_7 = devhelp +@ENABLE_GEANYDOC_TRUE@am__append_8 = geanydoc +@ENABLE_GEANYEXTRASEL_TRUE@am__append_9 = geanyextrasel +@ENABLE_GEANYGENDOC_TRUE@am__append_10 = geanygendoc +@ENABLE_GEANYINSERTNUM_TRUE@am__append_11 = geanyinsertnum +@ENABLE_GEANYLATEX_TRUE@am__append_12 = geanylatex +@ENABLE_GEANYLIPSUM_TRUE@am__append_13 = geanylipsum +@ENABLE_GEANYLUA_TRUE@am__append_14 = geanylua +@ENABLE_GEANYMACRO_TRUE@am__append_15 = geanymacro +@ENABLE_GEANYMINISCRIPT_TRUE@am__append_16 = geanyminiscript +@ENABLE_GEANYNUMBEREDBOOKMARKS_TRUE@am__append_17 = geanynumberedbookmarks +@ENABLE_GEANYPG_TRUE@am__append_18 = geanypg +@ENABLE_GEANYPRJ_TRUE@am__append_19 = geanyprj +@ENABLE_GEANYPY_TRUE@am__append_20 = geanypy +@ENABLE_GEANYSENDMAIL_TRUE@am__append_21 = geanysendmail +@ENABLE_GEANYVC_TRUE@am__append_22 = geanyvc +@ENABLE_GENIUSPASTE_TRUE@am__append_23 = geniuspaste +@ENABLE_GPROJECT_TRUE@am__append_24 = gproject +@ENABLE_MARKDOWN_TRUE@am__append_25 = markdown +@ENABLE_MULTITERM_TRUE@am__append_26 = multiterm +@ENABLE_PAIRTAGHIGHLIGHTER_TRUE@am__append_27 = pairtaghighlighter +@ENABLE_POHELPER_TRUE@am__append_28 = pohelper +@ENABLE_PRETTY_PRINTER_TRUE@am__append_29 = pretty-printer +@ENABLE_SCOPE_TRUE@am__append_30 = scope +@ENABLE_SHIFTCOLUMN_TRUE@am__append_31 = shiftcolumn +@ENABLE_SPELLCHECK_TRUE@am__append_32 = spellcheck +@ENABLE_TABLECONVERT_TRUE@am__append_33 = tableconvert +@ENABLE_TREEBROWSER_TRUE@am__append_34 = treebrowser +@ENABLE_UPDATECHECKER_TRUE@am__append_35 = updatechecker +@ENABLE_WEBHELPER_TRUE@am__append_36 = webhelper +@ENABLE_XMLSNIPPETS_TRUE@am__append_37 = xmlsnippets subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure NEWS config.guess config.sub depcomp \ - install-sh ltmain.sh missing +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in NEWS README compile config.guess \ + config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -106,12 +141,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -123,6 +161,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -140,21 +179,28 @@ CONFIG_HEADER = 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;; \ @@ -162,16 +208,39 @@ 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 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 -DIST_SUBDIRS = po addons codenav commander debugger devhelp geanydoc \ - geanyextrasel geanygendoc geanyinsertnum geanylatex \ - geanylipsum geanylua geanymacro geanyminiscript \ - geanynumberedbookmarks geanypg geanyprj geanysendmail geanyvc \ - geniuspaste gproject markdown multiterm pretty-printer scope \ +CSCOPE = cscope +DIST_SUBDIRS = po addons autoclose codenav commander debugger \ + defineformat devhelp geanydoc geanyextrasel geanygendoc \ + geanyinsertnum geanylatex geanylipsum geanylua geanymacro \ + geanyminiscript geanynumberedbookmarks geanypg geanyprj \ + geanypy geanysendmail geanyvc geniuspaste gproject markdown \ + multiterm pairtaghighlighter pohelper pretty-printer scope \ shiftcolumn spellcheck tableconvert treebrowser updatechecker \ webhelper xmlsnippets DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -183,6 +252,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,'; \ @@ -210,6 +280,7 @@ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best +DIST_TARGETS = dist-bzip2 dist-gzip distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -219,6 +290,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -237,6 +310,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -272,6 +347,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -338,6 +416,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -409,7 +497,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I build/cache -I build -I build/bundled --install +ACLOCAL_AMFLAGS = -I build/cache -I build -I build/bundled -I geanypy/m4 --install +AM_DISTCHECK_CONFIGURE_FLAGS = --with-geany-libdir='$${libdir}' SUBDIRS = po $(am__append_1) $(am__append_2) $(am__append_3) \ $(am__append_4) $(am__append_5) $(am__append_6) \ $(am__append_7) $(am__append_8) $(am__append_9) \ @@ -420,7 +509,9 @@ $(am__append_22) $(am__append_23) $(am__append_24) \ $(am__append_25) $(am__append_26) $(am__append_27) \ $(am__append_28) $(am__append_29) $(am__append_30) \ - $(am__append_31) $(am__append_32) + $(am__append_31) $(am__append_32) $(am__append_33) \ + $(am__append_34) $(am__append_35) $(am__append_36) \ + $(am__append_37) EXTRA_DIST = \ build/__init__.py \ build/wafcache.py \ @@ -470,8 +561,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 @@ -494,22 +585,25 @@ -rm -f libtool config.lt # 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; \ @@ -524,57 +618,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 \ @@ -590,12 +639,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; \ @@ -607,15 +651,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 @@ -624,9 +664,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) @@ -694,40 +756,41 @@ || 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 shar distribution archives 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 distribution archives compressed with" \ + "legacy program 'compress' 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) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(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 @@ -738,8 +801,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*) \ @@ -751,18 +812,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)/_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" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -785,7 +847,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' @@ -920,24 +982,24 @@ uninstall-am: -.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 am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzip dist-lzma 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 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 \ + 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-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 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 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru geany-plugins-1.23+dfsg/markdown/docs/Makefile.in geany-plugins-1.24+dfsg/markdown/docs/Makefile.in --- geany-plugins-1.23+dfsg/markdown/docs/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/markdown/docs/Makefile.in 2014-04-13 17:12:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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,15 +79,18 @@ build_triplet = @build@ host_triplet = @host@ subdir = markdown/docs -DIST_COMMON = $(dist_help_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(dist_help_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -73,12 +103,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -90,6 +123,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -105,12 +139,18 @@ 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 = \ @@ -147,12 +187,15 @@ } am__installdirs = "$(DESTDIR)$(helpdir)" DATA = $(dist_help_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -171,6 +214,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -206,6 +251,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -272,6 +320,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -413,11 +471,11 @@ @list='$(dist_help_DATA)'; test -n "$(helpdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(helpdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -556,16 +614,17 @@ .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-dist_helpDATA 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-dist_helpDATA + 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-dist_helpDATA 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-dist_helpDATA # To update the HTML help file diff -Nru geany-plugins-1.23+dfsg/markdown/Makefile.in geany-plugins-1.24+dfsg/markdown/Makefile.in --- geany-plugins-1.23+dfsg/markdown/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/markdown/Makefile.in 2014-04-13 17:12:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,19 +78,22 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - NEWS +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog NEWS README @MARKDOWN_PEG_MARKDOWN_TRUE@am__append_1 = peg-markdown subdir = markdown ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -76,12 +106,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -93,6 +126,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -108,21 +142,28 @@ 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;; \ @@ -159,9 +200,29 @@ DATA = $(dist_plugindoc_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 = peg-markdown src docs @@ -196,6 +257,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -214,6 +277,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -249,6 +314,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -315,6 +383,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -468,22 +546,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -498,57 +579,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 \ @@ -564,12 +600,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; \ @@ -581,15 +612,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 @@ -598,6 +625,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 @@ -761,22 +803,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/markdown/peg-markdown/Makefile.in geany-plugins-1.24+dfsg/markdown/peg-markdown/Makefile.in --- geany-plugins-1.23+dfsg/markdown/peg-markdown/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/markdown/peg-markdown/Makefile.in 2014-04-13 17:12:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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,14 +79,18 @@ build_triplet = @build@ host_triplet = @host@ subdir = markdown/peg-markdown -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -72,12 +103,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -89,6 +123,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -116,6 +151,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 @@ -128,29 +176,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 = $(libpegmarkdown_la_SOURCES) DIST_SOURCES = $(libpegmarkdown_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;; \ @@ -158,9 +203,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 = $(SUBDIRS) @@ -195,6 +260,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +280,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +317,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +386,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -442,12 +524,15 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_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='$(noinst_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}; \ + } + libpegmarkdown.la: $(libpegmarkdown_la_OBJECTS) $(libpegmarkdown_la_DEPENDENCIES) $(EXTRA_libpegmarkdown_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libpegmarkdown_la_OBJECTS) $(libpegmarkdown_la_LIBADD) $(LIBS) @@ -469,14 +554,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 $@ $< @@ -534,22 +619,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; \ @@ -564,57 +652,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 \ @@ -630,12 +673,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; \ @@ -647,15 +685,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 @@ -664,6 +698,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 @@ -830,12 +879,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 \ - clean-noinstLTLIBRARIES ctags ctags-recursive distclean \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool \ + clean-noinstLTLIBRARIES 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 \ @@ -845,8 +893,8 @@ 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 + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am $(LEG): diff -Nru geany-plugins-1.23+dfsg/markdown/peg-markdown/peg-0.1.9/Makefile.in geany-plugins-1.24+dfsg/markdown/peg-markdown/peg-0.1.9/Makefile.in --- geany-plugins-1.23+dfsg/markdown/peg-markdown/peg-0.1.9/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/markdown/peg-markdown/peg-0.1.9/Makefile.in 2014-04-13 17:12:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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,14 +80,18 @@ host_triplet = @host@ noinst_PROGRAMS = leg$(EXEEXT) subdir = markdown/peg-markdown/peg-0.1.9 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -73,12 +104,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -90,6 +124,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -112,6 +147,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 @@ -124,20 +172,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 = $(leg_SOURCES) DIST_SOURCES = $(leg_SOURCES) am__can_run_installinfo = \ @@ -145,6 +189,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -153,6 +214,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -171,6 +234,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -206,6 +271,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -272,6 +340,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -394,6 +472,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + leg$(EXEEXT): $(leg_OBJECTS) $(leg_DEPENDENCIES) $(EXTRA_leg_DEPENDENCIES) @rm -f leg$(EXEEXT) $(AM_V_CCLD)$(LINK) $(leg_OBJECTS) $(leg_LDADD) $(LIBS) @@ -413,14 +492,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 $@ $< @@ -435,26 +514,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; \ @@ -466,15 +534,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 @@ -483,6 +547,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 @@ -624,18 +703,19 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - 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-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-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 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru geany-plugins-1.23+dfsg/markdown/src/conf.c geany-plugins-1.24+dfsg/markdown/src/conf.c --- geany-plugins-1.23+dfsg/markdown/src/conf.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/markdown/src/conf.c 2013-06-30 11:40:06.000000000 +0000 @@ -26,6 +26,7 @@ #include #include #include "conf.h" +#include "markdown-gtk-compat.h" #define FONT_NAME_MAX 256 #define COLOR_CODE_MAX 8 @@ -470,18 +471,11 @@ static gchar * color_button_get_color(GtkColorButton *color_button) { - GdkColor color; - guint r, g, b; - gchar *color_str; - - gtk_color_button_get_color(color_button, &color); - - r = color.red / 256; - g = color.green / 256; - b = color.blue / 256; - color_str = g_strdup_printf("#%02x%02x%02x", r, g, b); + MarkdownColor color; - return color_str; + markdown_gtk_color_button_get_color(color_button, &color); + + return g_strdup_printf("#%02x%02x%02x", color.red, color.green, color.blue); } static gboolean @@ -563,15 +557,16 @@ "template-file", &tmpl_file, NULL); - table = gtk_table_new(6, 2, FALSE); - gtk_table_set_col_spacings(GTK_TABLE(table), 6); - gtk_table_set_row_spacings(GTK_TABLE(table), 6); + table = markdown_gtk_table_new(6, 2, FALSE); + markdown_gtk_table_set_col_spacing(MARKDOWN_GTK_TABLE(table), 6); + markdown_gtk_table_set_row_spacing(MARKDOWN_GTK_TABLE(table), 6); + conf->priv->widgets.table = table; { /* POSITION OF VIEW */ label = gtk_label_new(_("Position:")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0); + markdown_gtk_table_attach(MARKDOWN_GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL); hbox = gtk_hbox_new(FALSE, 6); @@ -591,7 +586,7 @@ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wid), TRUE); } - gtk_table_attach(GTK_TABLE(table), hbox, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0); + markdown_gtk_table_attach(MARKDOWN_GTK_TABLE(table), hbox, 1, 2, 0, 1, GTK_FILL, GTK_FILL); } { /* FONT BUTTON */ @@ -599,15 +594,14 @@ label = gtk_label_new(_("Font:")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0); + markdown_gtk_table_attach(MARKDOWN_GTK_TABLE(table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL); font_desc = g_strdup_printf("%s %d", fnt, fnt_sz); wid = gtk_font_button_new_with_font(font_desc); conf->priv->widgets.font_button = wid; g_free(font_desc); - gtk_table_attach(GTK_TABLE(table), wid, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, - GTK_FILL, 0, 0); + markdown_gtk_table_attach(MARKDOWN_GTK_TABLE(table), wid, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL); g_free(fnt); } @@ -617,49 +611,46 @@ label = gtk_label_new(_("Code Font:")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 0, 0); + markdown_gtk_table_attach(MARKDOWN_GTK_TABLE(table), label, 0, 1, 2, 3, GTK_FILL, GTK_FILL); font_desc = g_strdup_printf("%s %d", code_fnt, code_fnt_sz); wid = gtk_font_button_new_with_font(font_desc); conf->priv->widgets.code_font_button = wid; g_free(font_desc); - gtk_table_attach(GTK_TABLE(table), wid, 1, 2, 2, 3, GTK_FILL | GTK_EXPAND, - GTK_FILL, 0, 0); + markdown_gtk_table_attach(MARKDOWN_GTK_TABLE(table), wid, 1, 2, 2, 3, GTK_FILL | GTK_EXPAND, GTK_FILL); g_free(code_fnt); } { /* BG COLOR */ - GdkColor bgclr; + MarkdownColor bgclr; label = gtk_label_new(_("BG Color:")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, GTK_FILL, GTK_FILL, 0, 0); + markdown_gtk_table_attach(MARKDOWN_GTK_TABLE(table), label, 0, 1, 3, 4, GTK_FILL, GTK_FILL); - gdk_color_parse(bg, &bgclr); + markdown_color_parse(bg, &bgclr); - wid = gtk_color_button_new_with_color(&bgclr); + wid = markdown_gtk_color_button_new_with_color(&bgclr); conf->priv->widgets.bg_color_button = wid; - gtk_table_attach(GTK_TABLE(table), wid, 1, 2, 3, 4, GTK_FILL | GTK_EXPAND, - GTK_FILL, 0, 0); + markdown_gtk_table_attach(MARKDOWN_GTK_TABLE(table), wid, 1, 2, 3, 4, GTK_FILL | GTK_EXPAND, GTK_FILL); g_free(bg); } { /* FG COLOR */ - GdkColor fgclr; + MarkdownColor fgclr; label = gtk_label_new(_("FG Color:")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 4, 5, GTK_FILL, GTK_FILL, 0, 0); + markdown_gtk_table_attach(MARKDOWN_GTK_TABLE(table), label, 0, 1, 4, 5, GTK_FILL, GTK_FILL); - gdk_color_parse(fg, &fgclr); + markdown_color_parse(fg, &fgclr); - wid = gtk_color_button_new_with_color(&fgclr); + wid = markdown_gtk_color_button_new_with_color(&fgclr); conf->priv->widgets.fg_color_button = wid; - gtk_table_attach(GTK_TABLE(table), wid, 1, 2, 4, 5, GTK_FILL | GTK_EXPAND, - GTK_FILL, 0, 0); + markdown_gtk_table_attach(MARKDOWN_GTK_TABLE(table), wid, 1, 2, 4, 5, GTK_FILL | GTK_EXPAND, GTK_FILL); g_free(fg); } @@ -667,7 +658,7 @@ { /* TEMPLATE FILE */ label = gtk_label_new(_("Template:")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 5, 6, GTK_FILL, GTK_FILL, 0, 0); + markdown_gtk_table_attach(MARKDOWN_GTK_TABLE(table), label, 0, 1, 5, 6, GTK_FILL, GTK_FILL); wid = gtk_file_chooser_button_new(_("Select Template File"), GTK_FILE_CHOOSER_ACTION_OPEN); @@ -676,8 +667,7 @@ if (tmpl_file && tmpl_file[0]) { gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(wid), tmpl_file); } - gtk_table_attach(GTK_TABLE(table), wid, 1, 2, 5, 6, GTK_FILL | GTK_EXPAND, - GTK_FILL, 0, 0); + markdown_gtk_table_attach(MARKDOWN_GTK_TABLE(table), wid, 1, 2, 5, 6, GTK_FILL | GTK_EXPAND, GTK_FILL); g_free(tmpl_file); } diff -Nru geany-plugins-1.23+dfsg/markdown/src/Makefile.am geany-plugins-1.24+dfsg/markdown/src/Makefile.am --- geany-plugins-1.23+dfsg/markdown/src/Makefile.am 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/markdown/src/Makefile.am 2013-06-30 11:40:06.000000000 +0000 @@ -7,11 +7,13 @@ markdown_la_SOURCES = \ conf.c \ plugin.c \ - viewer.c + viewer.c \ + markdown-gtk-compat.c noinst_HEADERS = \ conf.h \ - viewer.h + viewer.h \ + markdown-gtk-compat.h markdown_la_CFLAGS = \ $(AM_CFLAGS) \ diff -Nru geany-plugins-1.23+dfsg/markdown/src/Makefile.in geany-plugins-1.24+dfsg/markdown/src/Makefile.in --- geany-plugins-1.23+dfsg/markdown/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/markdown/src/Makefile.in 2014-04-13 17:12:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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,21 +79,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp $(noinst_HEADERS) @MARKDOWN_PEG_MARKDOWN_TRUE@am__append_1 = -DFULL_PRICE -I$(top_srcdir)/markdown/peg-markdown @MARKDOWN_PEG_MARKDOWN_TRUE@am__append_2 = $(top_builddir)/markdown/peg-markdown/libpegmarkdown.la @MARKDOWN_PEG_MARKDOWN_FALSE@am__append_3 = $(LIBMARKDOWN_CFLAGS) @MARKDOWN_PEG_MARKDOWN_FALSE@am__append_4 = $(LIBMARKDOWN_LIBS) subdir = markdown/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -79,12 +109,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -96,6 +129,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -146,14 +180,27 @@ markdown_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__append_2) \ $(am__DEPENDENCIES_2) am_markdown_la_OBJECTS = markdown_la-conf.lo markdown_la-plugin.lo \ - markdown_la-viewer.lo + markdown_la-viewer.lo markdown_la-markdown-gtk-compat.lo markdown_la_OBJECTS = $(am_markdown_la_OBJECTS) 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 = markdown_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(markdown_la_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 @@ -166,20 +213,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 = $(markdown_la_SOURCES) DIST_SOURCES = $(markdown_la_SOURCES) am__can_run_installinfo = \ @@ -188,6 +231,23 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac HEADERS = $(noinst_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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -196,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -214,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -249,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -315,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -407,11 +484,13 @@ markdown_la_SOURCES = \ conf.c \ plugin.c \ - viewer.c + viewer.c \ + markdown-gtk-compat.c noinst_HEADERS = \ conf.h \ - viewer.h + viewer.h \ + markdown-gtk-compat.h markdown_la_CFLAGS = $(AM_CFLAGS) $(MARKDOWN_CFLAGS) \ -DMARKDOWN_DATA_DIR=\"$(pkgdatadir)/markdown\" \ @@ -454,6 +533,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -480,12 +560,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + markdown.la: $(markdown_la_OBJECTS) $(markdown_la_DEPENDENCIES) $(EXTRA_markdown_la_DEPENDENCIES) $(AM_V_CCLD)$(markdown_la_LINK) -rpath $(geanypluginsdir) $(markdown_la_OBJECTS) $(markdown_la_LIBADD) $(LIBS) @@ -496,6 +579,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markdown_la-conf.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markdown_la-markdown-gtk-compat.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markdown_la-plugin.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markdown_la-viewer.Plo@am__quote@ @@ -504,14 +588,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 $@ $< @@ -541,32 +625,28 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(markdown_la_CFLAGS) $(CFLAGS) -c -o markdown_la-viewer.lo `test -f 'viewer.c' || echo '$(srcdir)/'`viewer.c +markdown_la-markdown-gtk-compat.lo: markdown-gtk-compat.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(markdown_la_CFLAGS) $(CFLAGS) -MT markdown_la-markdown-gtk-compat.lo -MD -MP -MF $(DEPDIR)/markdown_la-markdown-gtk-compat.Tpo -c -o markdown_la-markdown-gtk-compat.lo `test -f 'markdown-gtk-compat.c' || echo '$(srcdir)/'`markdown-gtk-compat.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/markdown_la-markdown-gtk-compat.Tpo $(DEPDIR)/markdown_la-markdown-gtk-compat.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='markdown-gtk-compat.c' object='markdown_la-markdown-gtk-compat.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(markdown_la_CFLAGS) $(CFLAGS) -c -o markdown_la-markdown-gtk-compat.lo `test -f 'markdown-gtk-compat.c' || echo '$(srcdir)/'`markdown-gtk-compat.c + mostlyclean-libtool: -rm -f *.lo 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; \ @@ -578,15 +658,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 @@ -595,6 +671,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 @@ -741,24 +832,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/markdown/src/markdown-gtk-compat.c geany-plugins-1.24+dfsg/markdown/src/markdown-gtk-compat.c --- geany-plugins-1.23+dfsg/markdown/src/markdown-gtk-compat.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/markdown/src/markdown-gtk-compat.c 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,147 @@ +/* + * markdown-gtk-compat.c - Part of the Geany Markdown plugin + * + * Copyright 2012 Matthew Brush + * + * 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., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * + */ + +#include +#include "markdown-gtk-compat.h" + +GtkWidget *markdown_gtk_table_new(guint rows, guint columns, gboolean homogeneous) +{ + GtkWidget *table; + +#if !GTK_CHECK_VERSION(3, 4, 0) + table = gtk_table_new(rows, columns, homogeneous); +#else + guint row_cnt, col_cnt; + + table = gtk_grid_new(); + + gtk_grid_set_row_homogeneous(MARKDOWN_GTK_TABLE(table), homogeneous); + gtk_grid_set_column_homogeneous(MARKDOWN_GTK_TABLE(table), homogeneous); + + for (row_cnt=0; row_cnt < rows; row_cnt++) + gtk_grid_insert_row(MARKDOWN_GTK_TABLE(table), row_cnt); + + for (col_cnt=0; col_cnt < columns; col_cnt++) + gtk_grid_insert_column(MARKDOWN_GTK_TABLE(table), col_cnt); +#endif + + return table; +} + +void markdown_gtk_table_attach(MarkdownGtkTable *table, GtkWidget *child, + guint left_attach, guint right_attach, guint top_attach, guint bottom_attach, + GtkAttachOptions xoptions, GtkAttachOptions yoptions) +{ +#if !GTK_CHECK_VERSION(3, 4, 0) + gtk_table_attach(table, child, left_attach, right_attach, top_attach, + bottom_attach, xoptions, yoptions, 0, 0); +#else + gtk_grid_attach(table, child, left_attach, top_attach, + right_attach - left_attach, bottom_attach - top_attach); +#endif +} + +GtkWidget *markdown_gtk_color_button_new_with_color(MarkdownColor *color) +{ + GtkWidget *btn; + + btn = gtk_color_button_new(); + +#if !GTK_CHECK_VERSION(3, 0, 0) +{ + GdkColor clr; + clr.red = color->red * 256; + clr.green = color->green * 256; + clr.blue = color->blue * 256; + gtk_color_button_set_color(GTK_COLOR_BUTTON(btn), &clr); +} +#else +{ + GdkRGBA clr; + clr.red = color->red / 256.0; + clr.green = color->green / 256.0; + clr.blue = color->blue / 256.0; +# if !GTK_CHECK_VERSION(3, 4, 0) + gtk_color_button_set_rgba(GTK_COLOR_BUTTON(btn), &clr); +# else + gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(btn), &clr); +# endif +} +#endif + + return btn; +} + +gboolean markdown_color_parse(const gchar *spec, MarkdownColor *color) +{ + gboolean result; + g_return_val_if_fail(spec && color, FALSE); + +#if !GTK_CHECK_VERSION(3, 0, 0) +{ + GdkColor clr; + result = gdk_color_parse(spec, &clr); + if (result) { + color->red = clr.red / 256; + color->green = clr.green / 256; + color->blue = clr.blue / 256; + } +} +#else +{ + GdkRGBA clr; + result = gdk_rgba_parse(&clr, spec); + if (result) { + color->red = (guint8) (clr.red * 256.0); + color->green = (guint8) (clr.green * 256.0); + color->blue = (guint8) (clr.blue * 256.0); + } +} +#endif + + return result; +} + +void markdown_gtk_color_button_get_color(GtkColorButton *button, MarkdownColor *color) +{ + g_return_if_fail(button); + g_return_if_fail(color); + +#if !GTK_CHECK_VERSION(3, 0, 0) + GdkColor clr; + gtk_color_button_get_color(button, &clr); + color->red = clr.red / 256; + color->green = clr.green / 256; + color->blue = clr.blue / 256; +#else + GdkRGBA clr; +# if !GTK_CHECK_VERSION(3, 4, 0) + gtk_color_button_get_rgba(button, &clr); +# else + gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(button), &clr); +# endif + color->red = (guint8) (clr.red * 256.0); + color->green = (guint8) (clr.green * 256.0); + color->blue = (guint8) (clr.blue * 256.0); +#endif +} diff -Nru geany-plugins-1.23+dfsg/markdown/src/markdown-gtk-compat.h geany-plugins-1.24+dfsg/markdown/src/markdown-gtk-compat.h --- geany-plugins-1.23+dfsg/markdown/src/markdown-gtk-compat.h 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/markdown/src/markdown-gtk-compat.h 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,61 @@ +/* + * markdown-gtk-compat.h - Part of the Geany Markdown plugin + * + * Copyright 2012 Matthew Brush + * + * 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., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * + */ + +#ifndef MARKDOWN_GTK_COMPAT_H_ +#define MARKDOWN_GTK_COMPAT_H_ + +#if !GTK_CHECK_VERSION(3, 4, 0) +# define MarkdownGtkTable GtkTable +# define MARKDOWN_GTK_TABLE GTK_TABLE +# define markdown_gtk_table_set_row_spacing(table, spacing) \ + gtk_table_set_row_spacings(table, spacing) +# define markdown_gtk_table_set_col_spacing(table, spacing) \ + gtk_table_set_col_spacings(table, spacing) +#else +# define MarkdownGtkTable GtkGrid +# define MARKDOWN_GTK_TABLE GTK_GRID +# define markdown_gtk_table_set_row_spacing(table, spacing) \ + gtk_grid_set_row_spacing(table, spacing) +# define markdown_gtk_table_set_col_spacing(table, spacing) \ + gtk_grid_set_column_spacing(table, spacing) +#endif + +typedef struct { + guint8 red; + guint8 green; + guint8 blue; +} MarkdownColor; + +GtkWidget *markdown_gtk_table_new(guint rows, guint columns, gboolean homogeneous); + +void markdown_gtk_table_attach(MarkdownGtkTable *table, GtkWidget *child, + guint left_attach, guint right_attach, guint top_attach, guint bottom_attach, + GtkAttachOptions xoptions, GtkAttachOptions yoptions); + +GtkWidget *markdown_gtk_color_button_new_with_color(MarkdownColor *color); + +gboolean markdown_color_parse(const gchar *spec, MarkdownColor *color); + +void markdown_gtk_color_button_get_color(GtkColorButton *button, MarkdownColor *color); + +#endif /* MARKDOWN_GTK_COMPAT_H_ */ diff -Nru geany-plugins-1.23+dfsg/markdown/src/viewer.c geany-plugins-1.24+dfsg/markdown/src/viewer.c --- geany-plugins-1.23+dfsg/markdown/src/viewer.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/markdown/src/viewer.c 2014-04-12 14:28:39.000000000 +0000 @@ -249,9 +249,14 @@ if (GTK_IS_SCROLLED_WINDOW(parent)) { GtkAdjustment *adj; adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(parent)); - self->priv->vscroll_pos = gtk_adjustment_get_value(adj); + /* Another hack to try and keep scroll position from + * resetting to top while typing, just don't store the new + * scroll positions if they're 0. */ + if (gtk_adjustment_get_value(adj) != 0) + self->priv->vscroll_pos = gtk_adjustment_get_value(adj); adj = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(parent)); - self->priv->hscroll_pos = gtk_adjustment_get_value(adj); + if (gtk_adjustment_get_value(adj) != 0) + self->priv->hscroll_pos = gtk_adjustment_get_value(adj); pushed = TRUE; } diff -Nru geany-plugins-1.23+dfsg/markdown/wscript_build geany-plugins-1.24+dfsg/markdown/wscript_build --- geany-plugins-1.23+dfsg/markdown/wscript_build 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/markdown/wscript_build 2013-06-30 11:40:06.000000000 +0000 @@ -33,6 +33,7 @@ subst_vars('MARKDOWN_HELP_FILE="${DOCDIR}/markdown/html/help.html"', bld.env) ] libraries = [ 'GTK', 'GTHREAD', 'WEBKIT', 'DISCOUNT' ] sources = [ "src/conf.c", + "src/markdown-gtk-compat.c", "src/plugin.c", "src/viewer.c" ] @@ -79,7 +80,8 @@ features = ['c'], use = libraries, target = 'markdown_parser.c', - source = 'peg-markdown/markdown_parser.leg') + source = 'peg-markdown/markdown_parser.leg', + includes = ['peg-markdown']) # tell the code about what we want defines.append('FULL_PRICE=1') diff -Nru geany-plugins-1.23+dfsg/markdown/wscript_configure geany-plugins-1.24+dfsg/markdown/wscript_configure --- geany-plugins-1.23+dfsg/markdown/wscript_configure 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/markdown/wscript_configure 2013-06-30 11:40:06.000000000 +0000 @@ -21,7 +21,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. from build.wafutils import check_cfg_cached -from waflib.Errors import ConfigurationError packages = [ ('gtk+-2.0', '2.16', 'GTK'), diff -Nru geany-plugins-1.23+dfsg/missing geany-plugins-1.24+dfsg/missing --- geany-plugins-1.23+dfsg/missing 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/missing 2014-04-13 17:12:41.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-2013 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 geany-plugins-1.23+dfsg/multiterm/Makefile.in geany-plugins-1.24+dfsg/multiterm/Makefile.in --- geany-plugins-1.23+dfsg/multiterm/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/multiterm/Makefile.in 2014-04-13 17:12:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,18 +78,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(dist_plugindoc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build/vars.auxfiles.mk \ - $(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \ - NEWS TODO +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog NEWS README TODO subdir = multiterm ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -75,12 +105,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -92,6 +125,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -107,21 +141,28 @@ 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;; \ @@ -158,9 +199,29 @@ DATA = $(dist_plugindoc_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) @@ -195,6 +256,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -213,6 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -248,6 +313,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -314,6 +382,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -468,22 +546,25 @@ dir='$(DESTDIR)$(plugindocdir)'; $(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; \ @@ -498,57 +579,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 \ @@ -564,12 +600,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; \ @@ -581,15 +612,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 @@ -598,6 +625,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 @@ -761,22 +803,21 @@ uninstall-am: uninstall-dist_plugindocDATA -.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-dist_plugindocDATA 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-dist_plugindocDATA 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 \ uninstall-dist_plugindocDATA diff -Nru geany-plugins-1.23+dfsg/multiterm/src/config.c geany-plugins-1.24+dfsg/multiterm/src/config.c --- geany-plugins-1.23+dfsg/multiterm/src/config.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/multiterm/src/config.c 2014-04-13 17:17:56.000000000 +0000 @@ -1,4 +1,4 @@ -/* config.c generated by valac 0.16.1, the Vala compiler +/* config.c generated by valac 0.22.1, the Vala compiler * generated from config.vala, do not modify */ /* @@ -74,8 +74,8 @@ MultiTermConfig* multi_term_config_construct (GType object_type, const gchar* filename) { MultiTermConfig* self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + const gchar* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; g_return_val_if_fail (filename != NULL, NULL); self = (MultiTermConfig*) g_type_create_instance (object_type); _tmp0_ = filename; @@ -94,16 +94,16 @@ gboolean multi_term_config_store (MultiTermConfig* self) { gboolean result = FALSE; - GKeyFile* _tmp0_; + gchar* data = NULL; + GKeyFile* _tmp0_ = NULL; gchar* _tmp1_ = NULL; - gchar* data; GError * _inner_error_ = NULL; g_return_val_if_fail (self != NULL, FALSE); _tmp0_ = self->kf; _tmp1_ = g_key_file_to_data (_tmp0_, NULL, NULL); data = _tmp1_; { - const gchar* _tmp2_; + const gchar* _tmp2_ = NULL; _tmp2_ = self->priv->_filename; g_file_set_contents (_tmp2_, data, (gssize) (-1), &_inner_error_); if (_inner_error_ != NULL) { @@ -123,9 +123,9 @@ __catch0_g_file_error: { GError* err = NULL; - const gchar* _tmp3_; - GError* _tmp4_; - const gchar* _tmp5_; + const gchar* _tmp3_ = NULL; + GError* _tmp4_ = NULL; + const gchar* _tmp5_ = NULL; err = _inner_error_; _inner_error_ = NULL; _tmp3_ = self->priv->_filename; @@ -171,13 +171,13 @@ GError * _inner_error_ = NULL; g_return_if_fail (self != NULL); { - GKeyFile* _tmp0_; - GKeyFile* _tmp1_; + GKeyFile* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; gsize _tmp2_; gchar** _tmp3_ = NULL; - GKeyFile* _tmp16_; - const gchar* _tmp17_; - GKeyFile* _tmp18_; + GKeyFile* _tmp16_ = NULL; + const gchar* _tmp17_ = NULL; + GKeyFile* _tmp18_ = NULL; gsize _tmp19_; gchar** _tmp20_ = NULL; _tmp0_ = g_key_file_new (); @@ -193,26 +193,26 @@ group_collection = _tmp3_; group_collection_length1 = _tmp2_; for (group_it = 0; group_it < _tmp2_; group_it = group_it + 1) { - gchar* _tmp4_; + gchar* _tmp4_ = NULL; gchar* group = NULL; _tmp4_ = g_strdup (group_collection[group_it]); group = _tmp4_; { - GKeyFile* _tmp5_; - const gchar* _tmp6_; - gsize _tmp7_; - gchar** _tmp8_ = NULL; - gchar** _tmp9_; - gint _tmp9__length1; - gint __tmp9__size_; - GKeyFile* _tmp14_; - const gchar* _tmp15_; - _tmp5_ = self->kf; - _tmp6_ = group; - _tmp8_ = g_key_file_get_keys (_tmp5_, _tmp6_, &_tmp7_, &_inner_error_); - _tmp9_ = _tmp8_; - _tmp9__length1 = _tmp7_; - __tmp9__size_ = _tmp9__length1; + gchar** _tmp5_ = NULL; + GKeyFile* _tmp6_ = NULL; + const gchar* _tmp7_ = NULL; + gsize _tmp8_; + gchar** _tmp9_ = NULL; + gint _tmp5__length1 = 0; + gint __tmp5__size_ = 0; + GKeyFile* _tmp14_ = NULL; + const gchar* _tmp15_ = NULL; + _tmp6_ = self->kf; + _tmp7_ = group; + _tmp9_ = g_key_file_get_keys (_tmp6_, _tmp7_, &_tmp8_, &_inner_error_); + _tmp5_ = _tmp9_; + _tmp5__length1 = _tmp8_; + __tmp5__size_ = _tmp5__length1; if (_inner_error_ != NULL) { _g_free0 (group); group_collection = (_vala_array_free (group_collection, group_collection_length1, (GDestroyNotify) g_free), NULL); @@ -233,17 +233,17 @@ gint key_collection_length1 = 0; gint _key_collection_size_ = 0; gint key_it = 0; - key_collection = _tmp9_; - key_collection_length1 = _tmp9__length1; - for (key_it = 0; key_it < _tmp9__length1; key_it = key_it + 1) { - gchar* _tmp10_; + key_collection = _tmp5_; + key_collection_length1 = _tmp5__length1; + for (key_it = 0; key_it < _tmp5__length1; key_it = key_it + 1) { + gchar* _tmp10_ = NULL; gchar* key = NULL; _tmp10_ = g_strdup (key_collection[key_it]); key = _tmp10_; { - GKeyFile* _tmp11_; - const gchar* _tmp12_; - const gchar* _tmp13_; + GKeyFile* _tmp11_ = NULL; + const gchar* _tmp12_ = NULL; + const gchar* _tmp13_ = NULL; _tmp11_ = self->kf; _tmp12_ = group; _tmp13_ = key; @@ -321,18 +321,18 @@ section_collection = _tmp20_; section_collection_length1 = _tmp19_; for (section_it = 0; section_it < _tmp19_; section_it = section_it + 1) { - gchar* _tmp21_; + gchar* _tmp21_ = NULL; gchar* section = NULL; _tmp21_ = g_strdup (section_collection[section_it]); section = _tmp21_; { - const gchar* _tmp22_; + const gchar* _tmp22_ = NULL; gboolean _tmp23_ = FALSE; _tmp22_ = section; _tmp23_ = g_str_has_prefix (_tmp22_, "shell="); if (_tmp23_) { - const gchar* _tmp24_; - MultiTermShellConfig* _tmp25_; + const gchar* _tmp24_ = NULL; + MultiTermShellConfig* _tmp25_ = NULL; _tmp24_ = section; _tmp25_ = multi_term_shell_config_new (self, _tmp24_); self->priv->_shell_configs = g_list_append (self->priv->_shell_configs, _tmp25_); @@ -347,9 +347,9 @@ __catch1_g_key_file_error: { GError* err = NULL; - const gchar* _tmp26_; - GError* _tmp27_; - const gchar* _tmp28_; + const gchar* _tmp26_ = NULL; + GError* _tmp27_ = NULL; + const gchar* _tmp28_ = NULL; err = _inner_error_; _inner_error_ = NULL; _tmp26_ = self->priv->_filename; @@ -362,9 +362,9 @@ __catch1_g_file_error: { GError* err = NULL; - const gchar* _tmp29_; - GError* _tmp30_; - const gchar* _tmp31_; + const gchar* _tmp29_ = NULL; + GError* _tmp30_ = NULL; + const gchar* _tmp31_ = NULL; err = _inner_error_; _inner_error_ = NULL; _tmp29_ = self->priv->_filename; @@ -384,7 +384,7 @@ const gchar* multi_term_config_get_filename (MultiTermConfig* self) { const gchar* result; - const gchar* _tmp0_; + const gchar* _tmp0_ = NULL; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = self->priv->_filename; result = _tmp0_; @@ -397,12 +397,12 @@ GError * _inner_error_ = NULL; g_return_val_if_fail (self != NULL, FALSE); { - GKeyFile* _tmp0_; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_; - _tmp0_ = self->kf; - _tmp1_ = g_key_file_get_boolean (_tmp0_, "general", "show_tabs", &_inner_error_); - _tmp2_ = _tmp1_; + gboolean _tmp0_ = FALSE; + GKeyFile* _tmp1_ = NULL; + gboolean _tmp2_ = FALSE; + _tmp1_ = self->kf; + _tmp2_ = g_key_file_get_boolean (_tmp1_, "general", "show_tabs", &_inner_error_); + _tmp0_ = _tmp2_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { goto __catch2_g_key_file_error; @@ -411,7 +411,7 @@ g_clear_error (&_inner_error_); return FALSE; } - result = _tmp2_; + result = _tmp0_; return result; } goto __finally2; @@ -432,8 +432,8 @@ void multi_term_config_set_show_tabs (MultiTermConfig* self, gboolean value) { - GKeyFile* _tmp0_; - gboolean _tmp1_; + GKeyFile* _tmp0_ = NULL; + gboolean _tmp1_ = FALSE; g_return_if_fail (self != NULL); _tmp0_ = self->kf; _tmp1_ = value; @@ -447,12 +447,12 @@ GError * _inner_error_ = NULL; g_return_val_if_fail (self != NULL, NULL); { - GKeyFile* _tmp0_; - gchar* _tmp1_ = NULL; - gchar* _tmp2_; - _tmp0_ = self->kf; - _tmp1_ = g_key_file_get_string (_tmp0_, "general", "external_terminal", &_inner_error_); - _tmp2_ = _tmp1_; + gchar* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + gchar* _tmp2_ = NULL; + _tmp1_ = self->kf; + _tmp2_ = g_key_file_get_string (_tmp1_, "general", "external_terminal", &_inner_error_); + _tmp0_ = _tmp2_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { goto __catch3_g_key_file_error; @@ -461,14 +461,14 @@ g_clear_error (&_inner_error_); return NULL; } - result = _tmp2_; + result = _tmp0_; return result; } goto __finally3; __catch3_g_key_file_error: { GError* err = NULL; - gchar* _tmp3_; + gchar* _tmp3_ = NULL; err = _inner_error_; _inner_error_ = NULL; _tmp3_ = g_strdup ("xterm"); @@ -484,8 +484,8 @@ void multi_term_config_set_external_terminal (MultiTermConfig* self, const gchar* value) { - GKeyFile* _tmp0_; - const gchar* _tmp1_; + GKeyFile* _tmp0_ = NULL; + const gchar* _tmp1_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = self->kf; _tmp1_ = value; @@ -499,12 +499,12 @@ GError * _inner_error_ = NULL; g_return_val_if_fail (self != NULL, NULL); { - GKeyFile* _tmp0_; - gchar* _tmp1_ = NULL; - gchar* _tmp2_; - _tmp0_ = self->kf; - _tmp1_ = g_key_file_get_string (_tmp0_, "general", "location", &_inner_error_); - _tmp2_ = _tmp1_; + gchar* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + gchar* _tmp2_ = NULL; + _tmp1_ = self->kf; + _tmp2_ = g_key_file_get_string (_tmp1_, "general", "location", &_inner_error_); + _tmp0_ = _tmp2_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { goto __catch4_g_key_file_error; @@ -513,14 +513,14 @@ g_clear_error (&_inner_error_); return NULL; } - result = _tmp2_; + result = _tmp0_; return result; } goto __finally4; __catch4_g_key_file_error: { GError* err = NULL; - gchar* _tmp3_; + gchar* _tmp3_ = NULL; err = _inner_error_; _inner_error_ = NULL; _tmp3_ = g_strdup ("msgwin"); @@ -536,8 +536,8 @@ void multi_term_config_set_location (MultiTermConfig* self, const gchar* value) { - GKeyFile* _tmp0_; - const gchar* _tmp1_; + GKeyFile* _tmp0_ = NULL; + const gchar* _tmp1_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = self->kf; _tmp1_ = value; @@ -548,7 +548,7 @@ GList* multi_term_config_get_shell_configs (MultiTermConfig* self) { GList* result; - GList* _tmp0_; + GList* _tmp0_ = NULL; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = self->priv->_shell_configs; result = _tmp0_; @@ -682,7 +682,7 @@ static void multi_term_config_finalize (MultiTermConfig* obj) { MultiTermConfig * self; - self = MULTI_TERM_CONFIG (obj); + self = G_TYPE_CHECK_INSTANCE_CAST (obj, MULTI_TERM_TYPE_CONFIG, MultiTermConfig); _g_key_file_free0 (self->kf); _g_free0 (self->priv->_filename); __g_list_free__multi_term_shell_config_unref0_0 (self->priv->_shell_configs); diff -Nru geany-plugins-1.23+dfsg/multiterm/src/context-menu.c geany-plugins-1.24+dfsg/multiterm/src/context-menu.c --- geany-plugins-1.23+dfsg/multiterm/src/context-menu.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/multiterm/src/context-menu.c 2014-04-13 17:17:56.000000000 +0000 @@ -1,4 +1,4 @@ -/* context-menu.c generated by valac 0.16.1, the Vala compiler +/* context-menu.c generated by valac 0.22.1, the Vala compiler * generated from context-menu.vala, do not modify */ /* @@ -85,9 +85,9 @@ static void multi_term_context_menu_on_show_tabs_activate (MultiTermContextMenu* self, GtkCheckMenuItem* item) { - GtkCheckMenuItem* _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_; + GtkCheckMenuItem* _tmp0_ = NULL; + gboolean _tmp1_ = FALSE; + gboolean _tmp2_ = FALSE; g_return_if_fail (self != NULL); g_return_if_fail (item != NULL); _tmp0_ = item; @@ -99,9 +99,9 @@ static void multi_term_context_menu_on_next_previous_tab_activate (MultiTermContextMenu* self, GtkMenuItem* item, gboolean next) { gboolean _tmp0_ = FALSE; - gboolean _tmp1_; - GtkMenuItem* _tmp4_; - gboolean _tmp5_; + gboolean _tmp1_ = FALSE; + GtkMenuItem* _tmp4_ = NULL; + gboolean _tmp5_ = FALSE; g_return_if_fail (self != NULL); g_return_if_fail (item != NULL); _tmp1_ = next; @@ -121,40 +121,39 @@ static void multi_term_context_menu_on_move_to_location (MultiTermContextMenu* self, GtkMenuItem* item) { - GtkMenuItem* _tmp0_; + GtkMenuItem* _tmp0_ = NULL; gconstpointer _tmp1_ = NULL; g_return_if_fail (self != NULL); g_return_if_fail (item != NULL); _tmp0_ = item; _tmp1_ = g_object_get_data ((GObject*) _tmp0_, "location_is_msgwin"); - if (GPOINTER_TO_INT (_tmp1_)) { - GtkMenuItem* _tmp2_; - GtkMenuItem* _tmp3_; + if ((gboolean) ((gintptr) _tmp1_)) { + GtkMenuItem* _tmp2_ = NULL; + GtkMenuItem* _tmp3_ = NULL; _tmp2_ = item; gtk_menu_item_set_label (_tmp2_, "Move to message window"); _tmp3_ = item; - g_object_set_data_full ((GObject*) _tmp3_, "location_is_msgwin", GINT_TO_POINTER (FALSE), NULL); + g_object_set_data_full ((GObject*) _tmp3_, "location_is_msgwin", (gpointer) ((gintptr) FALSE), NULL); g_signal_emit_by_name (self, "move-to-location-activate", "sidebar"); } else { - GtkMenuItem* _tmp4_; - GtkMenuItem* _tmp5_; + GtkMenuItem* _tmp4_ = NULL; + GtkMenuItem* _tmp5_ = NULL; _tmp4_ = item; gtk_menu_item_set_label (_tmp4_, "Move to sidebar"); _tmp5_ = item; - g_object_set_data_full ((GObject*) _tmp5_, "location_is_msgwin", GINT_TO_POINTER (TRUE), NULL); + g_object_set_data_full ((GObject*) _tmp5_, "location_is_msgwin", (gpointer) ((gintptr) TRUE), NULL); g_signal_emit_by_name (self, "move-to-location-activate", "msgwin"); } } static void multi_term_context_menu_add_separator (MultiTermContextMenu* self) { - GtkSeparatorMenuItem* _tmp0_; - GtkSeparatorMenuItem* _tmp1_; - GtkSeparatorMenuItem* item; + GtkSeparatorMenuItem* item = NULL; + GtkSeparatorMenuItem* _tmp0_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = (GtkSeparatorMenuItem*) gtk_separator_menu_item_new (); - _tmp1_ = g_object_ref_sink (_tmp0_); - item = _tmp1_; + g_object_ref_sink (_tmp0_); + item = _tmp0_; gtk_menu_shell_append ((GtkMenuShell*) self, (GtkWidget*) ((GtkMenuItem*) item)); gtk_widget_show ((GtkWidget*) item); _g_object_unref0 (item); @@ -209,7 +208,7 @@ static void _____lambda3_ (Block2Data* _data2_) { Block1Data* _data1_; MultiTermContextMenu * self; - MultiTermShellConfig* _tmp0_; + MultiTermShellConfig* _tmp0_ = NULL; _data1_ = _data2_->_data1_; self = _data1_->self; _tmp0_ = _data2_->sh; @@ -234,7 +233,7 @@ static void __lambda5_ (Block1Data* _data1_) { MultiTermContextMenu * self; - GtkMenuItem* _tmp0_; + GtkMenuItem* _tmp0_ = NULL; self = _data1_->self; _tmp0_ = _data1_->item; multi_term_context_menu_on_next_previous_tab_activate (self, _tmp0_, TRUE); @@ -248,7 +247,7 @@ static void __lambda6_ (Block1Data* _data1_) { MultiTermContextMenu * self; - GtkMenuItem* _tmp0_; + GtkMenuItem* _tmp0_ = NULL; self = _data1_->self; _tmp0_ = _data1_->item; multi_term_context_menu_on_next_previous_tab_activate (self, _tmp0_, FALSE); @@ -282,7 +281,7 @@ static void __lambda9_ (Block1Data* _data1_) { MultiTermContextMenu * self; - GtkCheckMenuItem* _tmp0_; + GtkCheckMenuItem* _tmp0_ = NULL; self = _data1_->self; _tmp0_ = _data1_->check_item; multi_term_context_menu_on_show_tabs_activate (self, _tmp0_); @@ -296,7 +295,7 @@ static void __lambda10_ (Block1Data* _data1_) { MultiTermContextMenu * self; - GtkMenuItem* _tmp0_; + GtkMenuItem* _tmp0_ = NULL; self = _data1_->self; _tmp0_ = _data1_->item; multi_term_context_menu_on_move_to_location (self, _tmp0_); @@ -323,244 +322,232 @@ Block1Data* _data1_; GtkMenu* menu = NULL; GtkImageMenuItem* image_item = NULL; - GtkMenu* _tmp0_; - GtkMenu* _tmp1_; - GtkMenu* _tmp2_; - GtkMenuItem* _tmp3_; - GtkMenuItem* _tmp4_; - GtkMenuItem* _tmp5_; - GtkMenu* _tmp6_; - GtkMenuItem* _tmp7_; - GtkMenuItem* _tmp8_; - MultiTermConfig* _tmp9_; - GList* _tmp10_; - GList* _tmp11_; - guint _tmp12_ = 0U; - guint len; - GtkMenuItem* _tmp34_; - GtkMenuItem* _tmp35_; - GtkMenuItem* _tmp36_; - GtkMenuItem* _tmp37_; - GtkMenuItem* _tmp38_; - GtkMenuItem* _tmp39_; - GtkMenuItem* _tmp40_; - GtkMenuItem* _tmp41_; - GtkMenuItem* _tmp42_; - GtkMenuItem* _tmp43_; - GtkMenuItem* _tmp44_; - GtkImageMenuItem* _tmp45_; - GtkImageMenuItem* _tmp46_; - GtkImageMenuItem* _tmp47_; - GtkImageMenuItem* _tmp48_; - GtkImageMenuItem* _tmp49_; - GtkImageMenuItem* _tmp50_; - GtkCheckMenuItem* _tmp51_; - GtkCheckMenuItem* _tmp52_; - GtkCheckMenuItem* _tmp53_; - MultiTermConfig* _tmp54_; - gboolean _tmp55_; - gboolean _tmp56_; - GtkCheckMenuItem* _tmp57_; - GtkCheckMenuItem* _tmp58_; - GtkCheckMenuItem* _tmp59_; - MultiTermConfig* _tmp60_; - gchar* _tmp61_; - gchar* _tmp62_; - gchar* _tmp63_; - gboolean _tmp64_; - GtkMenuItem* _tmp71_; - GtkMenuItem* _tmp72_; - GtkMenuItem* _tmp73_; - GtkImageMenuItem* _tmp74_; - GtkImageMenuItem* _tmp75_; - GtkImageMenuItem* _tmp76_; + GtkMenu* _tmp0_ = NULL; + GtkMenu* _tmp1_ = NULL; + GtkMenuItem* _tmp2_ = NULL; + GtkMenuItem* _tmp3_ = NULL; + GtkMenu* _tmp4_ = NULL; + GtkMenuItem* _tmp5_ = NULL; + GtkMenuItem* _tmp6_ = NULL; + guint len = 0U; + MultiTermConfig* _tmp7_ = NULL; + GList* _tmp8_ = NULL; + GList* _tmp9_ = NULL; + guint _tmp10_ = 0U; + GtkMenuItem* _tmp31_ = NULL; + GtkMenuItem* _tmp32_ = NULL; + GtkMenuItem* _tmp33_ = NULL; + GtkMenuItem* _tmp34_ = NULL; + GtkMenuItem* _tmp35_ = NULL; + GtkMenuItem* _tmp36_ = NULL; + GtkMenuItem* _tmp37_ = NULL; + GtkMenuItem* _tmp38_ = NULL; + GtkImageMenuItem* _tmp39_ = NULL; + GtkImageMenuItem* _tmp40_ = NULL; + GtkImageMenuItem* _tmp41_ = NULL; + GtkImageMenuItem* _tmp42_ = NULL; + GtkCheckMenuItem* _tmp43_ = NULL; + GtkCheckMenuItem* _tmp44_ = NULL; + MultiTermConfig* _tmp45_ = NULL; + gboolean _tmp46_ = FALSE; + gboolean _tmp47_ = FALSE; + GtkCheckMenuItem* _tmp48_ = NULL; + GtkCheckMenuItem* _tmp49_ = NULL; + GtkCheckMenuItem* _tmp50_ = NULL; + MultiTermConfig* _tmp51_ = NULL; + gchar* _tmp52_ = NULL; + gchar* _tmp53_ = NULL; + gchar* _tmp54_ = NULL; + gboolean _tmp55_ = FALSE; + GtkMenuItem* _tmp60_ = NULL; + GtkMenuItem* _tmp61_ = NULL; + GtkMenuItem* _tmp62_ = NULL; + GtkImageMenuItem* _tmp63_ = NULL; + GtkImageMenuItem* _tmp64_ = NULL; _data1_ = g_slice_new0 (Block1Data); _data1_->_ref_count_ = 1; self = (MultiTermContextMenu*) g_object_new (object_type, NULL); _data1_->self = g_object_ref (self); _tmp0_ = (GtkMenu*) gtk_menu_new (); - _tmp1_ = g_object_ref_sink (_tmp0_); + g_object_ref_sink (_tmp0_); _g_object_unref0 (menu); - menu = _tmp1_; - _tmp2_ = menu; - gtk_widget_show ((GtkWidget*) _tmp2_); - _tmp3_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Open Tab"); - _tmp4_ = g_object_ref_sink (_tmp3_); + menu = _tmp0_; + _tmp1_ = menu; + gtk_widget_show ((GtkWidget*) _tmp1_); + _tmp2_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Open Tab"); + g_object_ref_sink (_tmp2_); _g_object_unref0 (_data1_->item); - _data1_->item = _tmp4_; + _data1_->item = _tmp2_; + _tmp3_ = _data1_->item; + _tmp4_ = menu; + gtk_menu_item_set_submenu (_tmp3_, (GtkWidget*) _tmp4_); _tmp5_ = _data1_->item; - _tmp6_ = menu; - gtk_menu_item_set_submenu (_tmp5_, (GtkWidget*) _tmp6_); - _tmp7_ = _data1_->item; - gtk_widget_show ((GtkWidget*) _tmp7_); - _tmp8_ = _data1_->item; - gtk_menu_shell_append ((GtkMenuShell*) self, (GtkWidget*) _tmp8_); - _tmp9_ = cfg; - _tmp10_ = multi_term_config_get_shell_configs (_tmp9_); - _tmp11_ = _tmp10_; - _tmp12_ = g_list_length (_tmp11_); - len = _tmp12_; + gtk_widget_show ((GtkWidget*) _tmp5_); + _tmp6_ = _data1_->item; + gtk_menu_shell_append ((GtkMenuShell*) self, (GtkWidget*) _tmp6_); + _tmp7_ = cfg; + _tmp8_ = multi_term_config_get_shell_configs (_tmp7_); + _tmp9_ = _tmp8_; + _tmp10_ = g_list_length (_tmp9_); + len = _tmp10_; { - guint i; + guint i = 0U; i = (guint) 0; { - gboolean _tmp13_; - _tmp13_ = TRUE; + gboolean _tmp11_ = FALSE; + _tmp11_ = TRUE; while (TRUE) { Block2Data* _data2_; - gboolean _tmp14_; - guint _tmp16_; - guint _tmp17_; - MultiTermConfig* _tmp18_; - GList* _tmp19_; - GList* _tmp20_; - guint _tmp21_; - gconstpointer _tmp22_ = NULL; - MultiTermShellConfig* _tmp23_; - MultiTermShellConfig* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; - gchar* _tmp27_; - GtkMenuItem* _tmp28_; - GtkMenuItem* _tmp29_; - GtkMenuItem* _tmp30_; - GtkMenu* _tmp31_; - GtkMenuItem* _tmp32_; - GtkMenuItem* _tmp33_; + gboolean _tmp12_ = FALSE; + guint _tmp14_ = 0U; + guint _tmp15_ = 0U; + MultiTermConfig* _tmp16_ = NULL; + GList* _tmp17_ = NULL; + GList* _tmp18_ = NULL; + guint _tmp19_ = 0U; + gconstpointer _tmp20_ = NULL; + MultiTermShellConfig* _tmp21_ = NULL; + MultiTermShellConfig* _tmp22_ = NULL; + gchar* _tmp23_ = NULL; + gchar* _tmp24_ = NULL; + gchar* _tmp25_ = NULL; + GtkMenuItem* _tmp26_ = NULL; + GtkMenuItem* _tmp27_ = NULL; + GtkMenu* _tmp28_ = NULL; + GtkMenuItem* _tmp29_ = NULL; + GtkMenuItem* _tmp30_ = NULL; _data2_ = g_slice_new0 (Block2Data); _data2_->_ref_count_ = 1; _data2_->_data1_ = block1_data_ref (_data1_); - _tmp14_ = _tmp13_; - if (!_tmp14_) { - guint _tmp15_; - _tmp15_ = i; - i = _tmp15_ + 1; + _tmp12_ = _tmp11_; + if (!_tmp12_) { + guint _tmp13_ = 0U; + _tmp13_ = i; + i = _tmp13_ + 1; } - _tmp13_ = FALSE; - _tmp16_ = i; - _tmp17_ = len; - if (!(_tmp16_ < _tmp17_)) { + _tmp11_ = FALSE; + _tmp14_ = i; + _tmp15_ = len; + if (!(_tmp14_ < _tmp15_)) { block2_data_unref (_data2_); _data2_ = NULL; break; } - _tmp18_ = cfg; - _tmp19_ = multi_term_config_get_shell_configs (_tmp18_); - _tmp20_ = _tmp19_; - _tmp21_ = i; - _tmp22_ = g_list_nth_data (_tmp20_, _tmp21_); - _tmp23_ = _multi_term_shell_config_ref0 ((MultiTermShellConfig*) _tmp22_); - _data2_->sh = _tmp23_; - _tmp24_ = _data2_->sh; - _tmp25_ = multi_term_shell_config_get_name (_tmp24_); - _tmp26_ = _tmp25_; - _tmp27_ = _tmp26_; - _tmp28_ = (GtkMenuItem*) gtk_menu_item_new_with_label (_tmp27_); - _tmp29_ = g_object_ref_sink (_tmp28_); + _tmp16_ = cfg; + _tmp17_ = multi_term_config_get_shell_configs (_tmp16_); + _tmp18_ = _tmp17_; + _tmp19_ = i; + _tmp20_ = g_list_nth_data (_tmp18_, _tmp19_); + _tmp21_ = _multi_term_shell_config_ref0 ((MultiTermShellConfig*) _tmp20_); + _data2_->sh = _tmp21_; + _tmp22_ = _data2_->sh; + _tmp23_ = multi_term_shell_config_get_name (_tmp22_); + _tmp24_ = _tmp23_; + _tmp25_ = _tmp24_; + _tmp26_ = (GtkMenuItem*) gtk_menu_item_new_with_label (_tmp25_); + g_object_ref_sink (_tmp26_); _g_object_unref0 (_data1_->item); - _data1_->item = _tmp29_; - _g_free0 (_tmp27_); + _data1_->item = _tmp26_; + _g_free0 (_tmp25_); + _tmp27_ = _data1_->item; + g_signal_connect_data (_tmp27_, "activate", (GCallback) ______lambda3__gtk_menu_item_activate, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0); + _tmp28_ = menu; + _tmp29_ = _data1_->item; + gtk_menu_shell_append ((GtkMenuShell*) _tmp28_, (GtkWidget*) _tmp29_); _tmp30_ = _data1_->item; - g_signal_connect_data (_tmp30_, "activate", (GCallback) ______lambda3__gtk_menu_item_activate, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0); - _tmp31_ = menu; - _tmp32_ = _data1_->item; - gtk_menu_shell_append ((GtkMenuShell*) _tmp31_, (GtkWidget*) _tmp32_); - _tmp33_ = _data1_->item; - gtk_widget_show ((GtkWidget*) _tmp33_); + gtk_widget_show ((GtkWidget*) _tmp30_); block2_data_unref (_data2_); _data2_ = NULL; } } } - _tmp34_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Open Window"); - _tmp35_ = g_object_ref_sink (_tmp34_); + _tmp31_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Open Window"); + g_object_ref_sink (_tmp31_); _g_object_unref0 (_data1_->item); - _data1_->item = _tmp35_; - _tmp36_ = _data1_->item; - g_signal_connect_object (_tmp36_, "activate", (GCallback) ___lambda4__gtk_menu_item_activate, self, 0); - _tmp37_ = _data1_->item; - gtk_menu_shell_append ((GtkMenuShell*) self, (GtkWidget*) _tmp37_); - _tmp38_ = _data1_->item; - gtk_widget_show ((GtkWidget*) _tmp38_); + _data1_->item = _tmp31_; + _tmp32_ = _data1_->item; + g_signal_connect_object (_tmp32_, "activate", (GCallback) ___lambda4__gtk_menu_item_activate, self, 0); + _tmp33_ = _data1_->item; + gtk_menu_shell_append ((GtkMenuShell*) self, (GtkWidget*) _tmp33_); + _tmp34_ = _data1_->item; + gtk_widget_show ((GtkWidget*) _tmp34_); multi_term_context_menu_add_separator (self); - _tmp39_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Next tab"); - _tmp40_ = g_object_ref_sink (_tmp39_); + _tmp35_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Next tab"); + g_object_ref_sink (_tmp35_); _g_object_unref0 (_data1_->item); - _data1_->item = _tmp40_; - _tmp41_ = _data1_->item; - g_signal_connect_data (_tmp41_, "activate", (GCallback) ___lambda5__gtk_menu_item_activate, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); - _tmp42_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Previous tab"); - _tmp43_ = g_object_ref_sink (_tmp42_); + _data1_->item = _tmp35_; + _tmp36_ = _data1_->item; + g_signal_connect_data (_tmp36_, "activate", (GCallback) ___lambda5__gtk_menu_item_activate, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); + _tmp37_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Previous tab"); + g_object_ref_sink (_tmp37_); _g_object_unref0 (_data1_->item); - _data1_->item = _tmp43_; - _tmp44_ = _data1_->item; - g_signal_connect_data (_tmp44_, "activate", (GCallback) ___lambda6__gtk_menu_item_activate, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); - _tmp45_ = (GtkImageMenuItem*) gtk_image_menu_item_new_from_stock (GTK_STOCK_COPY, NULL); - _tmp46_ = g_object_ref_sink (_tmp45_); + _data1_->item = _tmp37_; + _tmp38_ = _data1_->item; + g_signal_connect_data (_tmp38_, "activate", (GCallback) ___lambda6__gtk_menu_item_activate, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); + _tmp39_ = (GtkImageMenuItem*) gtk_image_menu_item_new_from_stock (GTK_STOCK_COPY, NULL); + g_object_ref_sink (_tmp39_); _g_object_unref0 (image_item); - image_item = _tmp46_; - _tmp47_ = image_item; - g_signal_connect_object ((GtkMenuItem*) _tmp47_, "activate", (GCallback) ___lambda7__gtk_menu_item_activate, self, 0); - _tmp48_ = (GtkImageMenuItem*) gtk_image_menu_item_new_from_stock (GTK_STOCK_PASTE, NULL); - _tmp49_ = g_object_ref_sink (_tmp48_); + image_item = _tmp39_; + _tmp40_ = image_item; + g_signal_connect_object ((GtkMenuItem*) _tmp40_, "activate", (GCallback) ___lambda7__gtk_menu_item_activate, self, 0); + _tmp41_ = (GtkImageMenuItem*) gtk_image_menu_item_new_from_stock (GTK_STOCK_PASTE, NULL); + g_object_ref_sink (_tmp41_); _g_object_unref0 (image_item); - image_item = _tmp49_; - _tmp50_ = image_item; - g_signal_connect_object ((GtkMenuItem*) _tmp50_, "activate", (GCallback) ___lambda8__gtk_menu_item_activate, self, 0); - _tmp51_ = (GtkCheckMenuItem*) gtk_check_menu_item_new_with_label ("Show Tabs"); - _tmp52_ = g_object_ref_sink (_tmp51_); + image_item = _tmp41_; + _tmp42_ = image_item; + g_signal_connect_object ((GtkMenuItem*) _tmp42_, "activate", (GCallback) ___lambda8__gtk_menu_item_activate, self, 0); + _tmp43_ = (GtkCheckMenuItem*) gtk_check_menu_item_new_with_label ("Show Tabs"); + g_object_ref_sink (_tmp43_); _g_object_unref0 (_data1_->check_item); - _data1_->check_item = _tmp52_; - _tmp53_ = _data1_->check_item; - _tmp54_ = cfg; - _tmp55_ = multi_term_config_get_show_tabs (_tmp54_); - _tmp56_ = _tmp55_; - gtk_check_menu_item_set_active (_tmp53_, _tmp56_); - _tmp57_ = _data1_->check_item; - g_signal_connect_data ((GtkMenuItem*) _tmp57_, "activate", (GCallback) ___lambda9__gtk_menu_item_activate, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); - _tmp58_ = _data1_->check_item; - gtk_menu_shell_append ((GtkMenuShell*) self, (GtkWidget*) ((GtkMenuItem*) _tmp58_)); - _tmp59_ = _data1_->check_item; - gtk_widget_show ((GtkWidget*) _tmp59_); - _tmp60_ = cfg; - _tmp61_ = multi_term_config_get_location (_tmp60_); - _tmp62_ = _tmp61_; - _tmp63_ = _tmp62_; - _tmp64_ = g_strcmp0 (_tmp63_, "msgwin") == 0; - _g_free0 (_tmp63_); - if (_tmp64_) { - GtkMenuItem* _tmp65_; - GtkMenuItem* _tmp66_; - GtkMenuItem* _tmp67_; - _tmp65_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Move to sidebar"); - _tmp66_ = g_object_ref_sink (_tmp65_); + _data1_->check_item = _tmp43_; + _tmp44_ = _data1_->check_item; + _tmp45_ = cfg; + _tmp46_ = multi_term_config_get_show_tabs (_tmp45_); + _tmp47_ = _tmp46_; + gtk_check_menu_item_set_active (_tmp44_, _tmp47_); + _tmp48_ = _data1_->check_item; + g_signal_connect_data ((GtkMenuItem*) _tmp48_, "activate", (GCallback) ___lambda9__gtk_menu_item_activate, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); + _tmp49_ = _data1_->check_item; + gtk_menu_shell_append ((GtkMenuShell*) self, (GtkWidget*) ((GtkMenuItem*) _tmp49_)); + _tmp50_ = _data1_->check_item; + gtk_widget_show ((GtkWidget*) _tmp50_); + _tmp51_ = cfg; + _tmp52_ = multi_term_config_get_location (_tmp51_); + _tmp53_ = _tmp52_; + _tmp54_ = _tmp53_; + _tmp55_ = g_strcmp0 (_tmp54_, "msgwin") == 0; + _g_free0 (_tmp54_); + if (_tmp55_) { + GtkMenuItem* _tmp56_ = NULL; + GtkMenuItem* _tmp57_ = NULL; + _tmp56_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Move to sidebar"); + g_object_ref_sink (_tmp56_); _g_object_unref0 (_data1_->item); - _data1_->item = _tmp66_; - _tmp67_ = _data1_->item; - g_object_set_data_full ((GObject*) _tmp67_, "location_is_msgwin", GINT_TO_POINTER (TRUE), NULL); + _data1_->item = _tmp56_; + _tmp57_ = _data1_->item; + g_object_set_data_full ((GObject*) _tmp57_, "location_is_msgwin", (gpointer) ((gintptr) TRUE), NULL); } else { - GtkMenuItem* _tmp68_; - GtkMenuItem* _tmp69_; - GtkMenuItem* _tmp70_; - _tmp68_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Move to message window"); - _tmp69_ = g_object_ref_sink (_tmp68_); + GtkMenuItem* _tmp58_ = NULL; + GtkMenuItem* _tmp59_ = NULL; + _tmp58_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Move to message window"); + g_object_ref_sink (_tmp58_); _g_object_unref0 (_data1_->item); - _data1_->item = _tmp69_; - _tmp70_ = _data1_->item; - g_object_set_data_full ((GObject*) _tmp70_, "location_is_msgwin", GINT_TO_POINTER (FALSE), NULL); + _data1_->item = _tmp58_; + _tmp59_ = _data1_->item; + g_object_set_data_full ((GObject*) _tmp59_, "location_is_msgwin", (gpointer) ((gintptr) FALSE), NULL); } - _tmp71_ = _data1_->item; - g_signal_connect_data (_tmp71_, "activate", (GCallback) ___lambda10__gtk_menu_item_activate, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); - _tmp72_ = _data1_->item; - gtk_menu_shell_append ((GtkMenuShell*) self, (GtkWidget*) _tmp72_); - _tmp73_ = _data1_->item; - gtk_widget_show ((GtkWidget*) _tmp73_); - _tmp74_ = (GtkImageMenuItem*) gtk_image_menu_item_new_from_stock (GTK_STOCK_PREFERENCES, NULL); - _tmp75_ = g_object_ref_sink (_tmp74_); + _tmp60_ = _data1_->item; + g_signal_connect_data (_tmp60_, "activate", (GCallback) ___lambda10__gtk_menu_item_activate, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); + _tmp61_ = _data1_->item; + gtk_menu_shell_append ((GtkMenuShell*) self, (GtkWidget*) _tmp61_); + _tmp62_ = _data1_->item; + gtk_widget_show ((GtkWidget*) _tmp62_); + _tmp63_ = (GtkImageMenuItem*) gtk_image_menu_item_new_from_stock (GTK_STOCK_PREFERENCES, NULL); + g_object_ref_sink (_tmp63_); _g_object_unref0 (image_item); - image_item = _tmp75_; - _tmp76_ = image_item; - g_signal_connect_object ((GtkMenuItem*) _tmp76_, "activate", (GCallback) ___lambda11__gtk_menu_item_activate, self, 0); + image_item = _tmp63_; + _tmp64_ = image_item; + g_signal_connect_object ((GtkMenuItem*) _tmp64_, "activate", (GCallback) ___lambda11__gtk_menu_item_activate, self, 0); _g_object_unref0 (image_item); _g_object_unref0 (menu); block1_data_unref (_data1_); diff -Nru geany-plugins-1.23+dfsg/multiterm/src/defconf.c geany-plugins-1.24+dfsg/multiterm/src/defconf.c --- geany-plugins-1.23+dfsg/multiterm/src/defconf.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/multiterm/src/defconf.c 2014-04-13 17:17:56.000000000 +0000 @@ -1,4 +1,4 @@ -/* defconf.c generated by valac 0.16.1, the Vala compiler +/* defconf.c generated by valac 0.22.1, the Vala compiler * generated from defconf.vala, do not modify */ /* diff -Nru geany-plugins-1.23+dfsg/multiterm/src/defconf.vala geany-plugins-1.24+dfsg/multiterm/src/defconf.vala --- geany-plugins-1.23+dfsg/multiterm/src/defconf.vala 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/multiterm/src/defconf.vala 2013-06-30 11:40:06.000000000 +0000 @@ -102,14 +102,6 @@ # Make the tab's label track the VTE title track_title=true -# Save and restore the current working directory each close/open -track_cwd=true - -# Stores the CWD to change to on loading, blank for no change dir. -# If track_cwd is set to true, this value will be automatically updated -# otherwise this same value will be changed to each load. -terminal_cwd= - # Background color, foreground color and font for the VTE bg_color=#ffffff fg_color=#000000 @@ -130,17 +122,20 @@ #cursor_shape=block # Controls how erasing characters is handled, one of: -# auto, ascii_backspace, ascii_delete, delete_sequences, tty +# auto, ascii_backspace, ascii_delete, delete_sequence, tty #backspace_binding=auto # Whether to hide the mouse pointer on key press if it's in the -# terminal window pointer_autohide=false +# terminal window +#pointer_autohide=false # Scroll to the prompt at the bottom of the scrollback buffer on key -# press scroll_on_keystroke=true +# press +#scroll_on_keystroke=true # Scroll to the bottom of the scrollback buffer when the child sends -# output scroll_on_output=false +# output +#scroll_on_output=false # The number of lines to keep in the scrollback buffer #scrollback_lines=512 @@ -155,7 +150,7 @@ # the word-chars characters as parts of words, and all other # characters as word separators. Ranges of characters can be # specified by separating them with a hyphen. -#word_chars= +word_chars=-A-Za-z0-9,./\\?%&#:_ #======================================================================= diff -Nru geany-plugins-1.23+dfsg/multiterm/src/Makefile.in geany-plugins-1.24+dfsg/multiterm/src/Makefile.in --- geany-plugins-1.23+dfsg/multiterm/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/multiterm/src/Makefile.in 2014-04-13 17:12:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,19 +78,23 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/vars.build.mk \ - $(top_srcdir)/build/vars.docs.mk config.c context-menu.c \ - defconf.c multiterm.h multiterm_la_vala.stamp notebook.c \ - plugin.c shell-config.c tab-label.c terminal.c +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am config.c context-menu.c defconf.c \ + notebook.c plugin.c shell-config.c tab-label.c terminal.c \ + $(top_srcdir)/depcomp $(srcdir)/multiterm.h \ + $(srcdir)/multiterm_la_vala.stamp subdir = multiterm/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -76,12 +107,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -93,6 +127,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -148,9 +183,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 = multiterm_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(multiterm_la_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 @@ -163,27 +211,24 @@ $(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_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = VALACOMPILE = $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) LTVALACOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(VALAC) $(AM_VALAFLAGS) \ $(VALAFLAGS) AM_V_VALAC = $(am__v_VALAC_@AM_V@) am__v_VALAC_ = $(am__v_VALAC_@AM_DEFAULT_V@) -am__v_VALAC_0 = @echo " VALAC " $@; -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_VALAC_0 = @echo " VALAC " $@; +am__v_VALAC_1 = SOURCES = $(multiterm_la_SOURCES) DIST_SOURCES = $(multiterm_la_SOURCES) am__can_run_installinfo = \ @@ -191,6 +236,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -199,6 +261,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -217,6 +281,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -252,6 +318,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -318,6 +387,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -472,6 +551,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -498,12 +578,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + multiterm.la: $(multiterm_la_OBJECTS) $(multiterm_la_DEPENDENCIES) $(EXTRA_multiterm_la_DEPENDENCIES) $(AM_V_CCLD)$(multiterm_la_LINK) -rpath $(geanypluginsdir) $(multiterm_la_OBJECTS) $(multiterm_la_LIBADD) $(LIBS) @@ -527,14 +610,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 +737,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 +757,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 +770,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 @@ -773,11 +856,19 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -rm -f $(srcdir)/config.c + -rm -f $(srcdir)/context-menu.c + -rm -f $(srcdir)/defconf.c + -rm -f $(srcdir)/multiterm.h + -rm -f $(srcdir)/multiterm_la_vala.stamp + -rm -f $(srcdir)/notebook.c + -rm -f $(srcdir)/plugin.c + -rm -f $(srcdir)/shell-config.c + -rm -f $(srcdir)/tab-label.c + -rm -f $(srcdir)/terminal.c -rm -f config.c -rm -f context-menu.c -rm -f defconf.c - -rm -f multiterm.h - -rm -f multiterm_la_vala.stamp -rm -f notebook.c -rm -f plugin.c -rm -f shell-config.c @@ -856,20 +947,20 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru geany-plugins-1.23+dfsg/multiterm/src/multiterm.h geany-plugins-1.24+dfsg/multiterm/src/multiterm.h --- geany-plugins-1.23+dfsg/multiterm/src/multiterm.h 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/multiterm/src/multiterm.h 2014-04-13 17:17:56.000000000 +0000 @@ -1,4 +1,4 @@ -/* multiterm.h generated by valac 0.16.1, the Vala compiler, do not modify */ +/* multiterm.h generated by valac 0.22.1, the Vala compiler, do not modify */ #ifndef __MULTITERM_H__ @@ -274,15 +274,6 @@ "# Make the tab's label track the VTE title\n" \ "track_title=true\n" \ "\n" \ -"# Save and restore the current working directory each close/open\n" \ -"track_cwd=true\n" \ -"\n" \ -"# Stores the CWD to change to on loading, blank for no change dir.\n" \ -"# If track_cwd is set to true, this value will be automatically update" \ -"d\n" \ -"# otherwise this same value will be changed to each load.\n" \ -"terminal_cwd=\n" \ -"\n" \ "# Background color, foreground color and font for the VTE\n" \ "bg_color=#ffffff\n" \ "fg_color=#000000\n" \ @@ -303,17 +294,20 @@ "#cursor_shape=block\n" \ "\n" \ "# Controls how erasing characters is handled, one of:\n" \ -"# auto, ascii_backspace, ascii_delete, delete_sequences, tty\n" \ +"# auto, ascii_backspace, ascii_delete, delete_sequence, tty\n" \ "#backspace_binding=auto\n" \ "\n" \ "# Whether to hide the mouse pointer on key press if it's in the\n" \ -"# terminal window pointer_autohide=false\n" \ +"# terminal window\n" \ +"#pointer_autohide=false\n" \ "\n" \ "# Scroll to the prompt at the bottom of the scrollback buffer on key\n" \ -"# press scroll_on_keystroke=true\n" \ +"# press\n" \ +"#scroll_on_keystroke=true\n" \ "\n" \ "# Scroll to the bottom of the scrollback buffer when the child sends\n" \ -"# output scroll_on_output=false\n" \ +"# output\n" \ +"#scroll_on_output=false\n" \ "\n" \ "# The number of lines to keep in the scrollback buffer\n" \ "#scrollback_lines=512\n" \ @@ -328,7 +322,7 @@ "# the word-chars characters as parts of words, and all other\n" \ "# characters as word separators. Ranges of characters can be\n" \ "# specified by separating them with a hyphen.\n" \ -"#word_chars=\n" \ +"word_chars=-A-Za-z0-9,./\\\\?%&#:_\n" \ "\n" \ "\n" \ "#=====================================================================" \ @@ -377,6 +371,28 @@ void multi_term_shell_config_set_foreground_color (MultiTermShellConfig* self, const gchar* value); gchar* multi_term_shell_config_get_font (MultiTermShellConfig* self); void multi_term_shell_config_set_font (MultiTermShellConfig* self, const gchar* value); +gboolean multi_term_shell_config_get_allow_bold (MultiTermShellConfig* self); +void multi_term_shell_config_set_allow_bold (MultiTermShellConfig* self, gboolean value); +gboolean multi_term_shell_config_get_audible_bell (MultiTermShellConfig* self); +void multi_term_shell_config_set_audible_bell (MultiTermShellConfig* self, gboolean value); +VteTerminalCursorBlinkMode multi_term_shell_config_get_cursor_blink_mode (MultiTermShellConfig* self); +void multi_term_shell_config_set_cursor_blink_mode (MultiTermShellConfig* self, VteTerminalCursorBlinkMode value); +VteTerminalCursorShape multi_term_shell_config_get_cursor_shape (MultiTermShellConfig* self); +void multi_term_shell_config_set_cursor_shape (MultiTermShellConfig* self, VteTerminalCursorShape value); +VteTerminalEraseBinding multi_term_shell_config_get_backspace_binding (MultiTermShellConfig* self); +void multi_term_shell_config_set_backspace_binding (MultiTermShellConfig* self, VteTerminalEraseBinding value); +gboolean multi_term_shell_config_get_pointer_autohide (MultiTermShellConfig* self); +void multi_term_shell_config_set_pointer_autohide (MultiTermShellConfig* self, gboolean value); +gboolean multi_term_shell_config_get_scroll_on_keystroke (MultiTermShellConfig* self); +void multi_term_shell_config_set_scroll_on_keystroke (MultiTermShellConfig* self, gboolean value); +gboolean multi_term_shell_config_get_scroll_on_output (MultiTermShellConfig* self); +void multi_term_shell_config_set_scroll_on_output (MultiTermShellConfig* self, gboolean value); +gint multi_term_shell_config_get_scrollback_lines (MultiTermShellConfig* self); +void multi_term_shell_config_set_scrollback_lines (MultiTermShellConfig* self, gint value); +gboolean multi_term_shell_config_get_visible_bell (MultiTermShellConfig* self); +void multi_term_shell_config_set_visible_bell (MultiTermShellConfig* self, gboolean value); +gchar* multi_term_shell_config_get_word_chars (MultiTermShellConfig* self); +void multi_term_shell_config_set_word_chars (MultiTermShellConfig* self, const gchar* value); GType multi_term_tab_label_get_type (void) G_GNUC_CONST; MultiTermTabLabel* multi_term_tab_label_new (const gchar* text); MultiTermTabLabel* multi_term_tab_label_construct (GType object_type, const gchar* text); diff -Nru geany-plugins-1.23+dfsg/multiterm/src/notebook.c geany-plugins-1.24+dfsg/multiterm/src/notebook.c --- geany-plugins-1.23+dfsg/multiterm/src/notebook.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/multiterm/src/notebook.c 2014-04-13 17:17:56.000000000 +0000 @@ -1,4 +1,4 @@ -/* notebook.c generated by valac 0.16.1, the Vala compiler +/* notebook.c generated by valac 0.22.1, the Vala compiler * generated from notebook.vala, do not modify */ /* @@ -78,7 +78,7 @@ g_return_if_fail (self != NULL); _tmp0_ = gtk_notebook_get_n_pages ((GtkNotebook*) self); if (_tmp0_ > 1) { - gint _tmp1_; + gint _tmp1_ = 0; _tmp1_ = tab_num; multi_term_notebook_remove_terminal (self, _tmp1_); } @@ -86,9 +86,9 @@ static void multi_term_notebook_on_show_tabs_activate (MultiTermNotebook* self, gboolean show_tabs) { - gboolean _tmp0_; - MultiTermConfig* _tmp1_; - gboolean _tmp2_; + gboolean _tmp0_ = FALSE; + MultiTermConfig* _tmp1_ = NULL; + gboolean _tmp2_ = FALSE; g_return_if_fail (self != NULL); _tmp0_ = show_tabs; gtk_notebook_set_show_tabs ((GtkNotebook*) self, _tmp0_); @@ -100,16 +100,16 @@ static gboolean multi_term_notebook_on_next_tab_activate (MultiTermNotebook* self) { gboolean result = FALSE; + gint n_tabs = 0; gint _tmp0_ = 0; - gint n_tabs; + gint current = 0; gint _tmp1_ = 0; - gint current; - gint _tmp2_; - gint _tmp3_; + gint _tmp2_ = 0; + gint _tmp3_ = 0; gboolean _tmp6_ = FALSE; - gint _tmp7_; - gint _tmp8_; - gboolean _tmp9_; + gint _tmp7_ = 0; + gint _tmp8_ = 0; + gboolean _tmp9_ = FALSE; g_return_val_if_fail (self != NULL, FALSE); _tmp0_ = gtk_notebook_get_n_pages ((GtkNotebook*) self); n_tabs = _tmp0_; @@ -118,8 +118,8 @@ _tmp2_ = current; _tmp3_ = n_tabs; if (_tmp2_ < (_tmp3_ - 1)) { - gint _tmp4_; - gint _tmp5_; + gint _tmp4_ = 0; + gint _tmp5_ = 0; _tmp4_ = current; current = _tmp4_ + 1; _tmp5_ = current; @@ -140,19 +140,19 @@ static gboolean multi_term_notebook_on_previous_tab_activate (MultiTermNotebook* self) { gboolean result = FALSE; + gint current = 0; gint _tmp0_ = 0; - gint current; - gint _tmp1_; + gint _tmp1_ = 0; gboolean _tmp4_ = FALSE; - gint _tmp5_; - gboolean _tmp6_; + gint _tmp5_ = 0; + gboolean _tmp6_ = FALSE; g_return_val_if_fail (self != NULL, FALSE); _tmp0_ = gtk_notebook_get_current_page ((GtkNotebook*) self); current = _tmp0_; _tmp1_ = current; if (_tmp1_ > 0) { - gint _tmp2_; - gint _tmp3_; + gint _tmp2_ = 0; + gint _tmp3_ = 0; _tmp2_ = current; current = _tmp2_ - 1; _tmp3_ = current; @@ -171,9 +171,9 @@ static void multi_term_notebook_on_new_shell_activate (MultiTermNotebook* self, MultiTermShellConfig* cfg) { - MultiTermShellConfig* _tmp0_; + MultiTermShellConfig* _tmp0_ = NULL; MultiTermTerminal* _tmp1_ = NULL; - MultiTermTerminal* _tmp2_; + MultiTermTerminal* _tmp2_ = NULL; g_return_if_fail (self != NULL); g_return_if_fail (cfg != NULL); _tmp0_ = cfg; @@ -185,13 +185,13 @@ static void multi_term_notebook_on_new_window_activate (MultiTermNotebook* self) { GPid pid = 0; - MultiTermConfig* _tmp0_; - gchar* _tmp1_; - gchar* _tmp2_; + gchar** args = NULL; + MultiTermConfig* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; + gchar* _tmp2_ = NULL; gchar** _tmp3_ = NULL; - gchar** args; - gint args_length1; - gint _args_size_; + gint args_length1 = 0; + gint _args_size_ = 0; GError * _inner_error_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = self->cfg; @@ -204,12 +204,12 @@ args_length1 = 2; _args_size_ = args_length1; { - GPid _tmp4_ = 0; - gboolean _tmp5_ = FALSE; - gboolean _tmp6_; - _tmp5_ = g_spawn_async (NULL, args, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &_tmp4_, &_inner_error_); - pid = _tmp4_; - _tmp6_ = _tmp5_; + gboolean _tmp4_ = FALSE; + GPid _tmp5_ = 0; + gboolean _tmp6_ = FALSE; + _tmp6_ = g_spawn_async (NULL, args, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &_tmp5_, &_inner_error_); + pid = _tmp5_; + _tmp4_ = _tmp6_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_SPAWN_ERROR) { goto __catch5_g_spawn_error; @@ -219,8 +219,8 @@ g_clear_error (&_inner_error_); return; } - if (_tmp6_) { - const gchar* _tmp7_; + if (_tmp4_) { + const gchar* _tmp7_ = NULL; _tmp7_ = args[0]; g_debug ("notebook.vala:87: Started external terminal '%s' with pid of '%d'", _tmp7_, (gint) pid); } @@ -229,10 +229,10 @@ __catch5_g_spawn_error: { GError* err = NULL; - GError* _tmp8_; - const gchar* _tmp9_; + GError* _tmp8_ = NULL; + const gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; - gchar* _tmp11_; + gchar* _tmp11_ = NULL; err = _inner_error_; _inner_error_ = NULL; _tmp8_ = err; @@ -260,31 +260,31 @@ static void multi_term_notebook_on_move_to_location (MultiTermNotebook* self, const gchar* location) { + GtkContainer* frame = NULL; GtkWidget* _tmp0_ = NULL; - GtkContainer* _tmp1_; - GtkContainer* frame; - GtkContainer* _tmp2_; + GtkContainer* _tmp1_ = NULL; + GtkContainer* parent = NULL; + GtkContainer* _tmp2_ = NULL; GtkWidget* _tmp3_ = NULL; - GtkContainer* _tmp4_; - GtkContainer* parent; + GtkContainer* _tmp4_ = NULL; GtkNotebook* new_nb = NULL; - GtkContainer* _tmp5_; - GtkContainer* _tmp6_; - const gchar* _tmp7_; - GtkNotebook* _tmp18_; - GtkNotebook* _tmp19_; - GtkContainer* _tmp20_; + GtkContainer* _tmp5_ = NULL; + GtkContainer* _tmp6_ = NULL; + const gchar* _tmp7_ = NULL; + GtkNotebook* _tmp18_ = NULL; + GtkNotebook* _tmp19_ = NULL; + GtkContainer* _tmp20_ = NULL; gint _tmp21_ = 0; - MultiTermConfig* _tmp22_; - const gchar* _tmp23_; + MultiTermConfig* _tmp22_ = NULL; + const gchar* _tmp23_ = NULL; g_return_if_fail (self != NULL); g_return_if_fail (location != NULL); _tmp0_ = gtk_widget_get_parent ((GtkWidget*) self); - _tmp1_ = _g_object_ref0 (GTK_IS_CONTAINER (_tmp0_) ? ((GtkContainer*) _tmp0_) : NULL); + _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, GTK_TYPE_CONTAINER) ? ((GtkContainer*) _tmp0_) : NULL); frame = _tmp1_; _tmp2_ = frame; _tmp3_ = gtk_widget_get_parent ((GtkWidget*) _tmp2_); - _tmp4_ = _g_object_ref0 (GTK_IS_CONTAINER (_tmp3_) ? ((GtkContainer*) _tmp3_) : NULL); + _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, GTK_TYPE_CONTAINER) ? ((GtkContainer*) _tmp3_) : NULL); parent = _tmp4_; _tmp5_ = parent; _tmp6_ = frame; @@ -292,9 +292,9 @@ _tmp7_ = location; if (g_strcmp0 (_tmp7_, "msgwin") == 0) { gconstpointer _tmp8_ = NULL; - GtkNotebook* _tmp9_; - GtkNotebook* _tmp10_; - GtkContainer* _tmp11_; + GtkNotebook* _tmp9_ = NULL; + GtkNotebook* _tmp10_ = NULL; + GtkContainer* _tmp11_ = NULL; gconstpointer _tmp12_ = NULL; _tmp8_ = g_object_get_data ((GObject*) self, "msgwin_notebook"); _tmp9_ = _g_object_ref0 ((GtkNotebook*) ((MultiTermNotebook*) _tmp8_)); @@ -306,9 +306,9 @@ gtk_notebook_append_page (_tmp10_, (GtkWidget*) _tmp11_, (GtkWidget*) ((GtkLabel*) _tmp12_)); } else { gconstpointer _tmp13_ = NULL; - GtkNotebook* _tmp14_; - GtkNotebook* _tmp15_; - GtkContainer* _tmp16_; + GtkNotebook* _tmp14_ = NULL; + GtkNotebook* _tmp15_ = NULL; + GtkContainer* _tmp16_ = NULL; gconstpointer _tmp17_ = NULL; _tmp13_ = g_object_get_data ((GObject*) self, "sidebar_notebook"); _tmp14_ = _g_object_ref0 ((GtkNotebook*) ((MultiTermNotebook*) _tmp13_)); @@ -336,11 +336,11 @@ static void multi_term_notebook_on_add_button_style_set (MultiTermNotebook* self) { gint w = 0; gint h = 0; - GtkButton* _tmp0_; + GtkButton* _tmp0_ = NULL; GtkSettings* _tmp1_ = NULL; gint _tmp2_ = 0; gint _tmp3_ = 0; - GtkButton* _tmp4_; + GtkButton* _tmp4_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = self->priv->add_button; _tmp1_ = gtk_widget_get_settings ((GtkWidget*) _tmp0_); @@ -359,9 +359,9 @@ static gchar* string_strip (const gchar* self) { gchar* result = NULL; + gchar* _result_ = NULL; gchar* _tmp0_ = NULL; - gchar* _result_; - const gchar* _tmp1_; + const gchar* _tmp1_ = NULL; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = g_strdup (self); _result_ = _tmp0_; @@ -373,9 +373,9 @@ static void multi_term_notebook_on_add_button_clicked (MultiTermNotebook* self) { - MultiTermConfig* _tmp0_; - GList* _tmp1_; - GList* _tmp2_; + MultiTermConfig* _tmp0_ = NULL; + GList* _tmp1_ = NULL; + GList* _tmp2_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = self->cfg; _tmp1_ = multi_term_config_get_shell_configs (_tmp0_); @@ -385,17 +385,17 @@ GList* sh_it = NULL; sh_collection = _tmp2_; for (sh_it = sh_collection; sh_it != NULL; sh_it = sh_it->next) { - MultiTermShellConfig* _tmp3_; + MultiTermShellConfig* _tmp3_ = NULL; MultiTermShellConfig* sh = NULL; _tmp3_ = _multi_term_shell_config_ref0 ((MultiTermShellConfig*) sh_it->data); sh = _tmp3_; { - MultiTermShellConfig* _tmp4_; - const gchar* _tmp5_; - const gchar* _tmp6_; + MultiTermShellConfig* _tmp4_ = NULL; + const gchar* _tmp5_ = NULL; + const gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; - gchar* _tmp8_; - gboolean _tmp9_; + gchar* _tmp8_ = NULL; + gboolean _tmp9_ = FALSE; _tmp4_ = sh; _tmp5_ = multi_term_shell_config_get_section (_tmp4_); _tmp6_ = _tmp5_; @@ -404,9 +404,9 @@ _tmp9_ = g_strcmp0 (_tmp8_, "shell=default") == 0; _g_free0 (_tmp8_); if (_tmp9_) { - MultiTermShellConfig* _tmp10_; + MultiTermShellConfig* _tmp10_ = NULL; MultiTermTerminal* _tmp11_ = NULL; - MultiTermTerminal* _tmp12_; + MultiTermTerminal* _tmp12_ = NULL; _tmp10_ = sh; _tmp11_ = multi_term_notebook_add_terminal (self, _tmp10_); _tmp12_ = _tmp11_; @@ -459,49 +459,48 @@ static gboolean multi_term_notebook_on_terminal_right_click_event (MultiTermNotebook* self, GdkEventButton* event) { gboolean result = FALSE; - MultiTermContextMenu* _tmp0_; - MultiTermContextMenu* _tmp10_; - GdkEventButton _tmp11_; - guint _tmp12_; - GdkEventButton _tmp13_; - guint32 _tmp14_; + MultiTermContextMenu* _tmp0_ = NULL; + MultiTermContextMenu* _tmp9_ = NULL; + GdkEventButton _tmp10_ = {0}; + guint _tmp11_ = 0U; + GdkEventButton _tmp12_ = {0}; + guint32 _tmp13_ = 0U; g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (event != NULL, FALSE); _tmp0_ = self->priv->context_menu; if (_tmp0_ == NULL) { - MultiTermConfig* _tmp1_; - MultiTermContextMenu* _tmp2_; - MultiTermContextMenu* _tmp3_; - MultiTermContextMenu* _tmp4_; - MultiTermContextMenu* _tmp5_; - MultiTermContextMenu* _tmp6_; - MultiTermContextMenu* _tmp7_; - MultiTermContextMenu* _tmp8_; - MultiTermContextMenu* _tmp9_; + MultiTermConfig* _tmp1_ = NULL; + MultiTermContextMenu* _tmp2_ = NULL; + MultiTermContextMenu* _tmp3_ = NULL; + MultiTermContextMenu* _tmp4_ = NULL; + MultiTermContextMenu* _tmp5_ = NULL; + MultiTermContextMenu* _tmp6_ = NULL; + MultiTermContextMenu* _tmp7_ = NULL; + MultiTermContextMenu* _tmp8_ = NULL; _tmp1_ = self->cfg; _tmp2_ = multi_term_context_menu_new (_tmp1_); - _tmp3_ = g_object_ref_sink (_tmp2_); + g_object_ref_sink (_tmp2_); _g_object_unref0 (self->priv->context_menu); - self->priv->context_menu = _tmp3_; + self->priv->context_menu = _tmp2_; + _tmp3_ = self->priv->context_menu; + g_signal_connect_object (_tmp3_, "show-tabs-activate", (GCallback) _multi_term_notebook_on_show_tabs_activate_multi_term_context_menu_show_tabs_activate, self, 0); _tmp4_ = self->priv->context_menu; - g_signal_connect_object (_tmp4_, "show-tabs-activate", (GCallback) _multi_term_notebook_on_show_tabs_activate_multi_term_context_menu_show_tabs_activate, self, 0); + g_signal_connect_object (_tmp4_, "next-tab-activate", (GCallback) _multi_term_notebook_on_next_tab_activate_multi_term_context_menu_next_tab_activate, self, 0); _tmp5_ = self->priv->context_menu; - g_signal_connect_object (_tmp5_, "next-tab-activate", (GCallback) _multi_term_notebook_on_next_tab_activate_multi_term_context_menu_next_tab_activate, self, 0); + g_signal_connect_object (_tmp5_, "previous-tab-activate", (GCallback) _multi_term_notebook_on_previous_tab_activate_multi_term_context_menu_previous_tab_activate, self, 0); _tmp6_ = self->priv->context_menu; - g_signal_connect_object (_tmp6_, "previous-tab-activate", (GCallback) _multi_term_notebook_on_previous_tab_activate_multi_term_context_menu_previous_tab_activate, self, 0); + g_signal_connect_object (_tmp6_, "new-shell-activate", (GCallback) _multi_term_notebook_on_new_shell_activate_multi_term_context_menu_new_shell_activate, self, 0); _tmp7_ = self->priv->context_menu; - g_signal_connect_object (_tmp7_, "new-shell-activate", (GCallback) _multi_term_notebook_on_new_shell_activate_multi_term_context_menu_new_shell_activate, self, 0); + g_signal_connect_object (_tmp7_, "new-window-activate", (GCallback) _multi_term_notebook_on_new_window_activate_multi_term_context_menu_new_window_activate, self, 0); _tmp8_ = self->priv->context_menu; - g_signal_connect_object (_tmp8_, "new-window-activate", (GCallback) _multi_term_notebook_on_new_window_activate_multi_term_context_menu_new_window_activate, self, 0); - _tmp9_ = self->priv->context_menu; - g_signal_connect_object (_tmp9_, "move-to-location-activate", (GCallback) _multi_term_notebook_on_move_to_location_multi_term_context_menu_move_to_location_activate, self, 0); - } - _tmp10_ = self->priv->context_menu; - _tmp11_ = *event; - _tmp12_ = _tmp11_.button; - _tmp13_ = *event; - _tmp14_ = _tmp13_.time; - gtk_menu_popup ((GtkMenu*) _tmp10_, NULL, NULL, NULL, NULL, _tmp12_, _tmp14_); + g_signal_connect_object (_tmp8_, "move-to-location-activate", (GCallback) _multi_term_notebook_on_move_to_location_multi_term_context_menu_move_to_location_activate, self, 0); + } + _tmp9_ = self->priv->context_menu; + _tmp10_ = *event; + _tmp11_ = _tmp10_.button; + _tmp12_ = *event; + _tmp13_ = _tmp12_.time; + gtk_menu_popup ((GtkMenu*) _tmp9_, NULL, NULL, NULL, NULL, _tmp11_, _tmp13_); result = TRUE; return result; } @@ -521,20 +520,18 @@ MultiTermTerminal* multi_term_notebook_add_terminal (MultiTermNotebook* self, MultiTermShellConfig* cfg) { MultiTermTerminal* result = NULL; - MultiTermShellConfig* _tmp0_; - gchar* _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; - MultiTermTabLabel* _tmp4_; - MultiTermTabLabel* _tmp5_; - MultiTermTabLabel* _tmp6_; - MultiTermTabLabel* label; - MultiTermShellConfig* _tmp7_; - MultiTermTerminal* _tmp8_; - MultiTermTerminal* _tmp9_; - MultiTermTerminal* term; - MultiTermTerminal* _tmp10_; - MultiTermTabLabel* _tmp11_; + MultiTermTabLabel* label = NULL; + MultiTermShellConfig* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; + gchar* _tmp2_ = NULL; + gchar* _tmp3_ = NULL; + MultiTermTabLabel* _tmp4_ = NULL; + MultiTermTabLabel* _tmp5_ = NULL; + MultiTermTerminal* term = NULL; + MultiTermShellConfig* _tmp6_ = NULL; + MultiTermTerminal* _tmp7_ = NULL; + MultiTermTerminal* _tmp8_ = NULL; + MultiTermTabLabel* _tmp9_ = NULL; g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (cfg != NULL, NULL); _tmp0_ = cfg; @@ -542,20 +539,20 @@ _tmp2_ = _tmp1_; _tmp3_ = _tmp2_; _tmp4_ = multi_term_tab_label_new (_tmp3_); - _tmp5_ = g_object_ref_sink (_tmp4_); - _tmp6_ = _tmp5_; + g_object_ref_sink (_tmp4_); + _tmp5_ = _tmp4_; _g_free0 (_tmp3_); - label = _tmp6_; - _tmp7_ = cfg; - _tmp8_ = multi_term_terminal_new (_tmp7_); - _tmp9_ = g_object_ref_sink (_tmp8_); - term = _tmp9_; + label = _tmp5_; + _tmp6_ = cfg; + _tmp7_ = multi_term_terminal_new (_tmp6_); + g_object_ref_sink (_tmp7_); + term = _tmp7_; gtk_widget_show_all ((GtkWidget*) label); g_signal_connect_object (label, "close-clicked", (GCallback) _multi_term_notebook_on_tab_label_close_clicked_multi_term_tab_label_close_clicked, self, 0); - _tmp10_ = _g_object_ref0 (term); - g_object_set_data_full ((GObject*) label, "terminal", _tmp10_, g_object_unref); - _tmp11_ = _g_object_ref0 (label); - g_object_set_data_full ((GObject*) term, "label", _tmp11_, g_object_unref); + _tmp8_ = _g_object_ref0 (term); + g_object_set_data_full ((GObject*) label, "terminal", _tmp8_, g_object_unref); + _tmp9_ = _g_object_ref0 (label); + g_object_set_data_full ((GObject*) term, "label", _tmp9_, g_object_unref); gtk_widget_show_all ((GtkWidget*) term); g_signal_connect_object (term, "right-click-event", (GCallback) _multi_term_notebook_on_terminal_right_click_event_multi_term_terminal_right_click_event, self, 0); gtk_notebook_append_page ((GtkNotebook*) self, (GtkWidget*) term, (GtkWidget*) label); @@ -569,7 +566,7 @@ void multi_term_notebook_remove_terminal (MultiTermNotebook* self, gint tab_num) { - gint _tmp0_; + gint _tmp0_ = 0; g_return_if_fail (self != NULL); _tmp0_ = tab_num; gtk_notebook_remove_page ((GtkNotebook*) self, _tmp0_); @@ -590,32 +587,30 @@ MultiTermNotebook * self = NULL; GtkImage* img = NULL; GtkRcStyle* style = NULL; - const gchar* _tmp0_; - MultiTermConfig* _tmp1_; - GtkRcStyle* _tmp2_; - GtkRcStyle* _tmp3_; - GtkRcStyle* _tmp4_; - GtkImage* _tmp5_; - GtkImage* _tmp6_; - GtkButton* _tmp7_; - GtkButton* _tmp8_; - GtkButton* _tmp9_; - GtkRcStyle* _tmp10_; - GtkButton* _tmp11_; - GtkButton* _tmp12_; - GtkButton* _tmp13_; - GtkButton* _tmp14_; - GtkButton* _tmp15_; - GtkImage* _tmp16_; - GtkButton* _tmp17_; - GtkButton* _tmp18_; - GtkButton* _tmp19_; - MultiTermConfig* _tmp20_; - gboolean _tmp21_; - gboolean _tmp22_; - MultiTermConfig* _tmp23_; - GList* _tmp24_; - GList* _tmp25_; + const gchar* _tmp0_ = NULL; + MultiTermConfig* _tmp1_ = NULL; + GtkRcStyle* _tmp2_ = NULL; + GtkRcStyle* _tmp3_ = NULL; + GtkRcStyle* _tmp4_ = NULL; + GtkImage* _tmp5_ = NULL; + GtkButton* _tmp6_ = NULL; + GtkButton* _tmp7_ = NULL; + GtkRcStyle* _tmp8_ = NULL; + GtkButton* _tmp9_ = NULL; + GtkButton* _tmp10_ = NULL; + GtkButton* _tmp11_ = NULL; + GtkButton* _tmp12_ = NULL; + GtkButton* _tmp13_ = NULL; + GtkImage* _tmp14_ = NULL; + GtkButton* _tmp15_ = NULL; + GtkButton* _tmp16_ = NULL; + GtkButton* _tmp17_ = NULL; + MultiTermConfig* _tmp18_ = NULL; + gboolean _tmp19_ = FALSE; + gboolean _tmp20_ = FALSE; + MultiTermConfig* _tmp21_ = NULL; + GList* _tmp22_ = NULL; + GList* _tmp23_ = NULL; g_return_val_if_fail (config_filename != NULL, NULL); self = (MultiTermNotebook*) g_object_new (object_type, NULL); _tmp0_ = config_filename; @@ -630,59 +625,59 @@ _tmp4_ = style; _tmp4_->ythickness = 0; _tmp5_ = (GtkImage*) gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU); - _tmp6_ = g_object_ref_sink (_tmp5_); + g_object_ref_sink (_tmp5_); _g_object_unref0 (img); - img = _tmp6_; - _tmp7_ = (GtkButton*) gtk_button_new (); - _tmp8_ = g_object_ref_sink (_tmp7_); + img = _tmp5_; + _tmp6_ = (GtkButton*) gtk_button_new (); + g_object_ref_sink (_tmp6_); _g_object_unref0 (self->priv->add_button); - self->priv->add_button = _tmp8_; + self->priv->add_button = _tmp6_; + _tmp7_ = self->priv->add_button; + _tmp8_ = style; + gtk_widget_modify_style ((GtkWidget*) _tmp7_, _tmp8_); _tmp9_ = self->priv->add_button; - _tmp10_ = style; - gtk_widget_modify_style ((GtkWidget*) _tmp9_, _tmp10_); + gtk_button_set_relief (_tmp9_, GTK_RELIEF_NONE); + _tmp10_ = self->priv->add_button; + gtk_button_set_focus_on_click (_tmp10_, FALSE); _tmp11_ = self->priv->add_button; - gtk_button_set_relief (_tmp11_, GTK_RELIEF_NONE); + gtk_container_set_border_width ((GtkContainer*) _tmp11_, (guint) 2); _tmp12_ = self->priv->add_button; - gtk_button_set_focus_on_click (_tmp12_, FALSE); + gtk_widget_set_tooltip_text ((GtkWidget*) _tmp12_, "New terminal"); _tmp13_ = self->priv->add_button; - gtk_container_set_border_width ((GtkContainer*) _tmp13_, (guint) 2); - _tmp14_ = self->priv->add_button; - gtk_widget_set_tooltip_text ((GtkWidget*) _tmp14_, "New terminal"); + _tmp14_ = img; + gtk_container_add ((GtkContainer*) _tmp13_, (GtkWidget*) _tmp14_); _tmp15_ = self->priv->add_button; - _tmp16_ = img; - gtk_container_add ((GtkContainer*) _tmp15_, (GtkWidget*) _tmp16_); + g_signal_connect_object (_tmp15_, "clicked", (GCallback) _multi_term_notebook_on_add_button_clicked_gtk_button_clicked, self, 0); + _tmp16_ = self->priv->add_button; + gtk_widget_show_all ((GtkWidget*) _tmp16_); _tmp17_ = self->priv->add_button; - g_signal_connect_object (_tmp17_, "clicked", (GCallback) _multi_term_notebook_on_add_button_clicked_gtk_button_clicked, self, 0); - _tmp18_ = self->priv->add_button; - gtk_widget_show_all ((GtkWidget*) _tmp18_); - _tmp19_ = self->priv->add_button; - g_signal_connect_object ((GtkWidget*) _tmp19_, "style-set", (GCallback) _multi_term_notebook_on_add_button_style_set_gtk_widget_style_set, self, 0); - _tmp20_ = self->cfg; - _tmp21_ = multi_term_config_get_show_tabs (_tmp20_); - _tmp22_ = _tmp21_; - gtk_notebook_set_show_tabs ((GtkNotebook*) self, _tmp22_); - _tmp23_ = self->cfg; - _tmp24_ = multi_term_config_get_shell_configs (_tmp23_); - _tmp25_ = _tmp24_; + g_signal_connect_object ((GtkWidget*) _tmp17_, "style-set", (GCallback) _multi_term_notebook_on_add_button_style_set_gtk_widget_style_set, self, 0); + _tmp18_ = self->cfg; + _tmp19_ = multi_term_config_get_show_tabs (_tmp18_); + _tmp20_ = _tmp19_; + gtk_notebook_set_show_tabs ((GtkNotebook*) self, _tmp20_); + _tmp21_ = self->cfg; + _tmp22_ = multi_term_config_get_shell_configs (_tmp21_); + _tmp23_ = _tmp22_; { GList* sh_collection = NULL; GList* sh_it = NULL; - sh_collection = _tmp25_; + sh_collection = _tmp23_; for (sh_it = sh_collection; sh_it != NULL; sh_it = sh_it->next) { - MultiTermShellConfig* _tmp26_; + MultiTermShellConfig* _tmp24_ = NULL; MultiTermShellConfig* sh = NULL; - _tmp26_ = _multi_term_shell_config_ref0 ((MultiTermShellConfig*) sh_it->data); - sh = _tmp26_; + _tmp24_ = _multi_term_shell_config_ref0 ((MultiTermShellConfig*) sh_it->data); + sh = _tmp24_; { - MultiTermShellConfig* _tmp27_; - MultiTermTerminal* _tmp28_ = NULL; - MultiTermTerminal* term; - MultiTermTerminal* _tmp29_; - _tmp27_ = sh; - _tmp28_ = multi_term_notebook_add_terminal (self, _tmp27_); - term = _tmp28_; - _tmp29_ = term; - g_signal_connect_object (_tmp29_, "right-click-event", (GCallback) _multi_term_notebook_on_terminal_right_click_event_multi_term_terminal_right_click_event, self, 0); + MultiTermTerminal* term = NULL; + MultiTermShellConfig* _tmp25_ = NULL; + MultiTermTerminal* _tmp26_ = NULL; + MultiTermTerminal* _tmp27_ = NULL; + _tmp25_ = sh; + _tmp26_ = multi_term_notebook_add_terminal (self, _tmp25_); + term = _tmp26_; + _tmp27_ = term; + g_signal_connect_object (_tmp27_, "right-click-event", (GCallback) _multi_term_notebook_on_terminal_right_click_event_multi_term_terminal_right_click_event, self, 0); _g_object_unref0 (term); _multi_term_shell_config_unref0 (sh); } @@ -713,7 +708,7 @@ static void multi_term_notebook_finalize (GObject* obj) { MultiTermNotebook * self; - self = MULTI_TERM_NOTEBOOK (obj); + self = G_TYPE_CHECK_INSTANCE_CAST (obj, MULTI_TERM_TYPE_NOTEBOOK, MultiTermNotebook); _g_object_unref0 (self->priv->add_button); _multi_term_config_unref0 (self->cfg); _g_object_unref0 (self->priv->context_menu); diff -Nru geany-plugins-1.23+dfsg/multiterm/src/plugin.c geany-plugins-1.24+dfsg/multiterm/src/plugin.c --- geany-plugins-1.23+dfsg/multiterm/src/plugin.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/multiterm/src/plugin.c 2014-04-13 17:17:56.000000000 +0000 @@ -1,4 +1,4 @@ -/* plugin.c generated by valac 0.16.1, the Vala compiler +/* plugin.c generated by valac 0.22.1, the Vala compiler * generated from plugin.vala, do not modify */ /* @@ -46,9 +46,9 @@ static gint geany_vala_plugin_VERSION_CHECK (gint abi_version, gint api_required) { gint result = 0; - gint _tmp0_; - gint _tmp1_; - gint _tmp2_; + gint _tmp0_ = 0; + gint _tmp1_ = 0; + gint _tmp2_ = 0; _tmp0_ = abi_version; _tmp1_ = GEANY_ABI_VERSION; if (_tmp0_ != _tmp1_) { @@ -63,7 +63,7 @@ gint plugin_version_check (gint abi_version) { gint result = 0; - gint _tmp0_; + gint _tmp0_ = 0; gint _tmp1_ = 0; _tmp0_ = abi_version; _tmp1_ = geany_vala_plugin_VERSION_CHECK (_tmp0_, 185); @@ -73,10 +73,10 @@ static void geany_vala_plugin_SET_INFO (PluginInfo* self, const gchar* name, const gchar* description, const gchar* version, const gchar* author) { - const gchar* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; + const gchar* _tmp0_ = NULL; + const gchar* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; g_return_if_fail (self != NULL); g_return_if_fail (name != NULL); _tmp0_ = name; @@ -91,7 +91,7 @@ void plugin_set_info (PluginInfo* info) { - PluginInfo* _tmp0_; + PluginInfo* _tmp0_ = NULL; g_return_if_fail (info != NULL); _tmp0_ = info; geany_vala_plugin_SET_INFO (_tmp0_, "MultiTerm", "Multi-tabbed virtual terminal emulator.", "0.1", "Matthew Brush "); @@ -105,20 +105,20 @@ static GtkNotebook* geany_vala_plugin_main_widgets_get_message_window_notebook (GeanyMainWidgets* self) { GtkNotebook* result; - GtkWidget* _tmp0_; + GtkWidget* _tmp0_ = NULL; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = self->message_window_notebook; - result = GTK_IS_NOTEBOOK (_tmp0_) ? ((GtkNotebook*) _tmp0_) : NULL; + result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, GTK_TYPE_NOTEBOOK) ? ((GtkNotebook*) _tmp0_) : NULL; return result; } static GtkNotebook* geany_vala_plugin_main_widgets_get_sidebar_notebook (GeanyMainWidgets* self) { GtkNotebook* result; - GtkWidget* _tmp0_; + GtkWidget* _tmp0_ = NULL; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = self->sidebar_notebook; - result = GTK_IS_NOTEBOOK (_tmp0_) ? ((GtkNotebook*) _tmp0_) : NULL; + result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, GTK_TYPE_NOTEBOOK) ? ((GtkNotebook*) _tmp0_) : NULL; return result; } @@ -129,47 +129,44 @@ GtkLabel* label = NULL; GtkAlignment* align = NULL; MultiTermNotebook* notebook = NULL; - GeanyPlugin* _tmp0_; - GeanyData* _tmp1_; - GeanyApp* _tmp2_; - const gchar* _tmp3_; + GeanyPlugin* _tmp0_ = NULL; + GeanyData* _tmp1_ = NULL; + GeanyApp* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; - const gchar* _tmp5_; + const gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; - const gchar* _tmp7_; - GtkAlignment* _tmp13_; - GtkAlignment* _tmp14_; - const gchar* _tmp15_; - MultiTermNotebook* _tmp16_; - MultiTermNotebook* _tmp17_; - GtkAlignment* _tmp18_; - MultiTermNotebook* _tmp19_; - GtkAlignment* _tmp20_; - GtkAlignment* _tmp21_; - GtkWidget* _tmp22_; - GtkLabel* _tmp23_; - GtkLabel* _tmp24_; - MultiTermNotebook* _tmp25_; - GtkLabel* _tmp26_; - GtkLabel* _tmp27_; - MultiTermNotebook* _tmp28_; - GeanyData* _tmp29_; - GeanyMainWidgets* _tmp30_; - GtkNotebook* _tmp31_; - GtkNotebook* _tmp32_; - GtkNotebook* _tmp33_; - MultiTermNotebook* _tmp34_; - GeanyData* _tmp35_; - GeanyMainWidgets* _tmp36_; - GtkNotebook* _tmp37_; - GtkNotebook* _tmp38_; - GtkNotebook* _tmp39_; - MultiTermNotebook* _tmp40_; - MultiTermConfig* _tmp41_; - gchar* _tmp42_; - gchar* _tmp43_; - gchar* _tmp44_; - gboolean _tmp45_; + const gchar* _tmp7_ = NULL; + GtkAlignment* _tmp13_ = NULL; + const gchar* _tmp14_ = NULL; + MultiTermNotebook* _tmp15_ = NULL; + GtkAlignment* _tmp16_ = NULL; + MultiTermNotebook* _tmp17_ = NULL; + GtkAlignment* _tmp18_ = NULL; + GtkAlignment* _tmp19_ = NULL; + GtkWidget* _tmp20_ = NULL; + GtkLabel* _tmp21_ = NULL; + MultiTermNotebook* _tmp22_ = NULL; + GtkLabel* _tmp23_ = NULL; + GtkLabel* _tmp24_ = NULL; + MultiTermNotebook* _tmp25_ = NULL; + GeanyData* _tmp26_ = NULL; + GeanyMainWidgets* _tmp27_ = NULL; + GtkNotebook* _tmp28_ = NULL; + GtkNotebook* _tmp29_ = NULL; + GtkNotebook* _tmp30_ = NULL; + MultiTermNotebook* _tmp31_ = NULL; + GeanyData* _tmp32_ = NULL; + GeanyMainWidgets* _tmp33_ = NULL; + GtkNotebook* _tmp34_ = NULL; + GtkNotebook* _tmp35_ = NULL; + GtkNotebook* _tmp36_ = NULL; + MultiTermNotebook* _tmp37_ = NULL; + MultiTermConfig* _tmp38_ = NULL; + gchar* _tmp39_ = NULL; + gchar* _tmp40_ = NULL; + gchar* _tmp41_ = NULL; + gboolean _tmp42_ = FALSE; GError * _inner_error_ = NULL; g_return_if_fail (data != NULL); _tmp0_ = geany_plugin; @@ -187,12 +184,12 @@ _tmp7_ = config_dir; g_mkdir_with_parents (_tmp7_, 0755); { - const gchar* _tmp8_; + const gchar* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; _tmp8_ = config_file; _tmp9_ = g_file_test (_tmp8_, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR); if (!_tmp9_) { - const gchar* _tmp10_; + const gchar* _tmp10_ = NULL; _tmp10_ = config_file; g_file_set_contents (_tmp10_, MULTI_TERM_default_config, (gssize) (-1), &_inner_error_); if (_inner_error_ != NULL) { @@ -214,8 +211,8 @@ __catch6_g_file_error: { GError* err = NULL; - GError* _tmp11_; - const gchar* _tmp12_; + GError* _tmp11_ = NULL; + const gchar* _tmp12_ = NULL; err = _inner_error_; _inner_error_ = NULL; _tmp11_ = err; @@ -235,121 +232,121 @@ return; } _tmp13_ = (GtkAlignment*) gtk_alignment_new (0.5f, 0.5f, 1.0f, 1.0f); - _tmp14_ = g_object_ref_sink (_tmp13_); + g_object_ref_sink (_tmp13_); _g_object_unref0 (align); - align = _tmp14_; - _tmp15_ = config_file; - _tmp16_ = multi_term_notebook_new (_tmp15_); - _tmp17_ = g_object_ref_sink (_tmp16_); + align = _tmp13_; + _tmp14_ = config_file; + _tmp15_ = multi_term_notebook_new (_tmp14_); + g_object_ref_sink (_tmp15_); _g_object_unref0 (notebook); - notebook = _tmp17_; + notebook = _tmp15_; + _tmp16_ = align; + _tmp17_ = notebook; + gtk_container_add ((GtkContainer*) _tmp16_, (GtkWidget*) (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, GTK_TYPE_NOTEBOOK) ? ((GtkNotebook*) _tmp17_) : NULL)); _tmp18_ = align; - _tmp19_ = notebook; - gtk_container_add ((GtkContainer*) _tmp18_, (GtkWidget*) (GTK_IS_NOTEBOOK (_tmp19_) ? ((GtkNotebook*) _tmp19_) : NULL)); - _tmp20_ = align; - gtk_widget_show_all ((GtkWidget*) _tmp20_); - _tmp21_ = align; - _tmp22_ = _g_object_ref0 ((GtkWidget*) _tmp21_); - toplevel_widgets = g_list_append (toplevel_widgets, _tmp22_); - _tmp23_ = (GtkLabel*) gtk_label_new ("MultiTerm"); - _tmp24_ = g_object_ref_sink (_tmp23_); + gtk_widget_show_all ((GtkWidget*) _tmp18_); + _tmp19_ = align; + _tmp20_ = _g_object_ref0 ((GtkWidget*) _tmp19_); + toplevel_widgets = g_list_append (toplevel_widgets, _tmp20_); + _tmp21_ = (GtkLabel*) gtk_label_new ("MultiTerm"); + g_object_ref_sink (_tmp21_); _g_object_unref0 (label); - label = _tmp24_; + label = _tmp21_; + _tmp22_ = notebook; + _tmp23_ = label; + _tmp24_ = _g_object_ref0 (_tmp23_); + g_object_set_data_full ((GObject*) _tmp22_, "label", _tmp24_, g_object_unref); _tmp25_ = notebook; - _tmp26_ = label; - _tmp27_ = _g_object_ref0 (_tmp26_); - g_object_set_data_full ((GObject*) _tmp25_, "label", _tmp27_, g_object_unref); - _tmp28_ = notebook; - _tmp29_ = data; - _tmp30_ = _tmp29_->main_widgets; - _tmp31_ = geany_vala_plugin_main_widgets_get_message_window_notebook (_tmp30_); - _tmp32_ = _tmp31_; - _tmp33_ = _g_object_ref0 (_tmp32_); - g_object_set_data_full ((GObject*) _tmp28_, "msgwin_notebook", _tmp33_, g_object_unref); - _tmp34_ = notebook; - _tmp35_ = data; - _tmp36_ = _tmp35_->main_widgets; - _tmp37_ = geany_vala_plugin_main_widgets_get_sidebar_notebook (_tmp36_); - _tmp38_ = _tmp37_; - _tmp39_ = _g_object_ref0 (_tmp38_); - g_object_set_data_full ((GObject*) _tmp34_, "sidebar_notebook", _tmp39_, g_object_unref); - _tmp40_ = notebook; - _tmp41_ = _tmp40_->cfg; - _tmp42_ = multi_term_config_get_location (_tmp41_); - _tmp43_ = _tmp42_; - _tmp44_ = _tmp43_; - _tmp45_ = g_strcmp0 (_tmp44_, "msgwin") == 0; - _g_free0 (_tmp44_); - if (_tmp45_) { - GeanyData* _tmp46_; - GeanyMainWidgets* _tmp47_; - GtkNotebook* _tmp48_; - GtkNotebook* _tmp49_; - GtkAlignment* _tmp50_; - GtkLabel* _tmp51_; - GeanyData* _tmp52_; - GeanyMainWidgets* _tmp53_; - GtkNotebook* _tmp54_; - GtkNotebook* _tmp55_; - GeanyData* _tmp56_; - GeanyMainWidgets* _tmp57_; - GtkNotebook* _tmp58_; - GtkNotebook* _tmp59_; - GtkAlignment* _tmp60_; - gint _tmp61_ = 0; - _tmp46_ = data; - _tmp47_ = _tmp46_->main_widgets; - _tmp48_ = geany_vala_plugin_main_widgets_get_message_window_notebook (_tmp47_); - _tmp49_ = _tmp48_; - _tmp50_ = align; - _tmp51_ = label; - gtk_notebook_append_page (_tmp49_, (GtkWidget*) _tmp50_, (GtkWidget*) _tmp51_); - _tmp52_ = data; - _tmp53_ = _tmp52_->main_widgets; - _tmp54_ = geany_vala_plugin_main_widgets_get_message_window_notebook (_tmp53_); - _tmp55_ = _tmp54_; - _tmp56_ = data; - _tmp57_ = _tmp56_->main_widgets; - _tmp58_ = geany_vala_plugin_main_widgets_get_message_window_notebook (_tmp57_); - _tmp59_ = _tmp58_; - _tmp60_ = align; - _tmp61_ = gtk_notebook_page_num (_tmp59_, (GtkWidget*) _tmp60_); - gtk_notebook_set_current_page (_tmp55_, _tmp61_); + _tmp26_ = data; + _tmp27_ = _tmp26_->main_widgets; + _tmp28_ = geany_vala_plugin_main_widgets_get_message_window_notebook (_tmp27_); + _tmp29_ = _tmp28_; + _tmp30_ = _g_object_ref0 (_tmp29_); + g_object_set_data_full ((GObject*) _tmp25_, "msgwin_notebook", _tmp30_, g_object_unref); + _tmp31_ = notebook; + _tmp32_ = data; + _tmp33_ = _tmp32_->main_widgets; + _tmp34_ = geany_vala_plugin_main_widgets_get_sidebar_notebook (_tmp33_); + _tmp35_ = _tmp34_; + _tmp36_ = _g_object_ref0 (_tmp35_); + g_object_set_data_full ((GObject*) _tmp31_, "sidebar_notebook", _tmp36_, g_object_unref); + _tmp37_ = notebook; + _tmp38_ = _tmp37_->cfg; + _tmp39_ = multi_term_config_get_location (_tmp38_); + _tmp40_ = _tmp39_; + _tmp41_ = _tmp40_; + _tmp42_ = g_strcmp0 (_tmp41_, "msgwin") == 0; + _g_free0 (_tmp41_); + if (_tmp42_) { + GeanyData* _tmp43_ = NULL; + GeanyMainWidgets* _tmp44_ = NULL; + GtkNotebook* _tmp45_ = NULL; + GtkNotebook* _tmp46_ = NULL; + GtkAlignment* _tmp47_ = NULL; + GtkLabel* _tmp48_ = NULL; + GeanyData* _tmp49_ = NULL; + GeanyMainWidgets* _tmp50_ = NULL; + GtkNotebook* _tmp51_ = NULL; + GtkNotebook* _tmp52_ = NULL; + GeanyData* _tmp53_ = NULL; + GeanyMainWidgets* _tmp54_ = NULL; + GtkNotebook* _tmp55_ = NULL; + GtkNotebook* _tmp56_ = NULL; + GtkAlignment* _tmp57_ = NULL; + gint _tmp58_ = 0; + _tmp43_ = data; + _tmp44_ = _tmp43_->main_widgets; + _tmp45_ = geany_vala_plugin_main_widgets_get_message_window_notebook (_tmp44_); + _tmp46_ = _tmp45_; + _tmp47_ = align; + _tmp48_ = label; + gtk_notebook_append_page (_tmp46_, (GtkWidget*) _tmp47_, (GtkWidget*) _tmp48_); + _tmp49_ = data; + _tmp50_ = _tmp49_->main_widgets; + _tmp51_ = geany_vala_plugin_main_widgets_get_message_window_notebook (_tmp50_); + _tmp52_ = _tmp51_; + _tmp53_ = data; + _tmp54_ = _tmp53_->main_widgets; + _tmp55_ = geany_vala_plugin_main_widgets_get_message_window_notebook (_tmp54_); + _tmp56_ = _tmp55_; + _tmp57_ = align; + _tmp58_ = gtk_notebook_page_num (_tmp56_, (GtkWidget*) _tmp57_); + gtk_notebook_set_current_page (_tmp52_, _tmp58_); } else { - GeanyData* _tmp62_; - GeanyMainWidgets* _tmp63_; - GtkNotebook* _tmp64_; - GtkNotebook* _tmp65_; - GtkAlignment* _tmp66_; - GtkLabel* _tmp67_; - GeanyData* _tmp68_; - GeanyMainWidgets* _tmp69_; - GtkNotebook* _tmp70_; - GtkNotebook* _tmp71_; - GeanyData* _tmp72_; - GeanyMainWidgets* _tmp73_; - GtkNotebook* _tmp74_; - GtkNotebook* _tmp75_; - GtkAlignment* _tmp76_; - gint _tmp77_ = 0; - _tmp62_ = data; - _tmp63_ = _tmp62_->main_widgets; - _tmp64_ = geany_vala_plugin_main_widgets_get_sidebar_notebook (_tmp63_); - _tmp65_ = _tmp64_; - _tmp66_ = align; - _tmp67_ = label; - gtk_notebook_append_page (_tmp65_, (GtkWidget*) _tmp66_, (GtkWidget*) _tmp67_); - _tmp68_ = data; - _tmp69_ = _tmp68_->main_widgets; - _tmp70_ = geany_vala_plugin_main_widgets_get_sidebar_notebook (_tmp69_); - _tmp71_ = _tmp70_; - _tmp72_ = data; - _tmp73_ = _tmp72_->main_widgets; - _tmp74_ = geany_vala_plugin_main_widgets_get_sidebar_notebook (_tmp73_); - _tmp75_ = _tmp74_; - _tmp76_ = align; - _tmp77_ = gtk_notebook_page_num (_tmp75_, (GtkWidget*) _tmp76_); - gtk_notebook_set_current_page (_tmp71_, _tmp77_); + GeanyData* _tmp59_ = NULL; + GeanyMainWidgets* _tmp60_ = NULL; + GtkNotebook* _tmp61_ = NULL; + GtkNotebook* _tmp62_ = NULL; + GtkAlignment* _tmp63_ = NULL; + GtkLabel* _tmp64_ = NULL; + GeanyData* _tmp65_ = NULL; + GeanyMainWidgets* _tmp66_ = NULL; + GtkNotebook* _tmp67_ = NULL; + GtkNotebook* _tmp68_ = NULL; + GeanyData* _tmp69_ = NULL; + GeanyMainWidgets* _tmp70_ = NULL; + GtkNotebook* _tmp71_ = NULL; + GtkNotebook* _tmp72_ = NULL; + GtkAlignment* _tmp73_ = NULL; + gint _tmp74_ = 0; + _tmp59_ = data; + _tmp60_ = _tmp59_->main_widgets; + _tmp61_ = geany_vala_plugin_main_widgets_get_sidebar_notebook (_tmp60_); + _tmp62_ = _tmp61_; + _tmp63_ = align; + _tmp64_ = label; + gtk_notebook_append_page (_tmp62_, (GtkWidget*) _tmp63_, (GtkWidget*) _tmp64_); + _tmp65_ = data; + _tmp66_ = _tmp65_->main_widgets; + _tmp67_ = geany_vala_plugin_main_widgets_get_sidebar_notebook (_tmp66_); + _tmp68_ = _tmp67_; + _tmp69_ = data; + _tmp70_ = _tmp69_->main_widgets; + _tmp71_ = geany_vala_plugin_main_widgets_get_sidebar_notebook (_tmp70_); + _tmp72_ = _tmp71_; + _tmp73_ = align; + _tmp74_ = gtk_notebook_page_num (_tmp72_, (GtkWidget*) _tmp73_); + gtk_notebook_set_current_page (_tmp68_, _tmp74_); } _g_object_unref0 (notebook); _g_object_unref0 (align); @@ -360,19 +357,19 @@ void plugin_cleanup (void) { - GList* _tmp0_; + GList* _tmp0_ = NULL; _tmp0_ = toplevel_widgets; { GList* wid_collection = NULL; GList* wid_it = NULL; wid_collection = _tmp0_; for (wid_it = wid_collection; wid_it != NULL; wid_it = wid_it->next) { - GtkWidget* _tmp1_; + GtkWidget* _tmp1_ = NULL; GtkWidget* wid = NULL; _tmp1_ = _g_object_ref0 ((GtkWidget*) wid_it->data); wid = _tmp1_; { - GtkWidget* _tmp2_; + GtkWidget* _tmp2_ = NULL; _tmp2_ = wid; gtk_object_destroy ((GtkObject*) _tmp2_); _g_object_unref0 (wid); diff -Nru geany-plugins-1.23+dfsg/multiterm/src/shell-config.c geany-plugins-1.24+dfsg/multiterm/src/shell-config.c --- geany-plugins-1.23+dfsg/multiterm/src/shell-config.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/multiterm/src/shell-config.c 2014-04-13 17:17:56.000000000 +0000 @@ -1,4 +1,4 @@ -/* shell-config.c generated by valac 0.16.1, the Vala compiler +/* shell-config.c generated by valac 0.22.1, the Vala compiler * generated from shell-config.vala, do not modify */ /* @@ -27,6 +27,7 @@ #include "multiterm.h" #include #include +#include #include #define _multi_term_config_unref0(var) ((var == NULL) ? NULL : (var = (multi_term_config_unref (var), NULL))) @@ -62,10 +63,10 @@ MultiTermShellConfig* multi_term_shell_config_construct (GType object_type, MultiTermConfig* cfg, const gchar* section) { MultiTermShellConfig* self = NULL; - MultiTermConfig* _tmp0_; - MultiTermConfig* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_; + MultiTermConfig* _tmp0_ = NULL; + MultiTermConfig* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + gchar* _tmp3_ = NULL; g_return_val_if_fail (cfg != NULL, NULL); g_return_val_if_fail (section != NULL, NULL); self = (MultiTermShellConfig*) g_type_create_instance (object_type); @@ -88,7 +89,7 @@ MultiTermConfig* multi_term_shell_config_get_cfg (MultiTermShellConfig* self) { MultiTermConfig* result; - MultiTermConfig* _tmp0_; + MultiTermConfig* _tmp0_ = NULL; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = self->_cfg; result = _tmp0_; @@ -98,9 +99,9 @@ GKeyFile* multi_term_shell_config_get_kf (MultiTermShellConfig* self) { GKeyFile* result; - MultiTermConfig* _tmp0_; - MultiTermConfig* _tmp1_; - GKeyFile* _tmp2_; + MultiTermConfig* _tmp0_ = NULL; + MultiTermConfig* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = multi_term_shell_config_get_cfg (self); _tmp1_ = _tmp0_; @@ -112,7 +113,7 @@ const gchar* multi_term_shell_config_get_section (MultiTermShellConfig* self) { const gchar* result; - const gchar* _tmp0_; + const gchar* _tmp0_ = NULL; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = self->priv->_section; result = _tmp0_; @@ -125,16 +126,16 @@ GError * _inner_error_ = NULL; g_return_val_if_fail (self != NULL, NULL); { - GKeyFile* _tmp0_; - GKeyFile* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_ = NULL; - gchar* _tmp4_; - _tmp0_ = multi_term_shell_config_get_kf (self); - _tmp1_ = _tmp0_; - _tmp2_ = self->priv->_section; - _tmp3_ = g_key_file_get_string (_tmp1_, _tmp2_, "name", &_inner_error_); - _tmp4_ = _tmp3_; + gchar* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + gchar* _tmp4_ = NULL; + _tmp1_ = multi_term_shell_config_get_kf (self); + _tmp2_ = _tmp1_; + _tmp3_ = self->priv->_section; + _tmp4_ = g_key_file_get_string (_tmp2_, _tmp3_, "name", &_inner_error_); + _tmp0_ = _tmp4_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { goto __catch7_g_key_file_error; @@ -143,14 +144,14 @@ g_clear_error (&_inner_error_); return NULL; } - result = _tmp4_; + result = _tmp0_; return result; } goto __finally7; __catch7_g_key_file_error: { GError* err = NULL; - gchar* _tmp5_; + gchar* _tmp5_ = NULL; err = _inner_error_; _inner_error_ = NULL; _tmp5_ = g_strdup ("Default"); @@ -166,12 +167,12 @@ void multi_term_shell_config_set_name (MultiTermShellConfig* self, const gchar* value) { - GKeyFile* _tmp0_; - GKeyFile* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - MultiTermConfig* _tmp4_; - MultiTermConfig* _tmp5_; + GKeyFile* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + MultiTermConfig* _tmp4_ = NULL; + MultiTermConfig* _tmp5_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = multi_term_shell_config_get_kf (self); _tmp1_ = _tmp0_; @@ -189,16 +190,16 @@ GError * _inner_error_ = NULL; g_return_val_if_fail (self != NULL, NULL); { - GKeyFile* _tmp0_; - GKeyFile* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_ = NULL; - gchar* _tmp4_; - _tmp0_ = multi_term_shell_config_get_kf (self); - _tmp1_ = _tmp0_; - _tmp2_ = self->priv->_section; - _tmp3_ = g_key_file_get_string (_tmp1_, _tmp2_, "command", &_inner_error_); - _tmp4_ = _tmp3_; + gchar* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + gchar* _tmp4_ = NULL; + _tmp1_ = multi_term_shell_config_get_kf (self); + _tmp2_ = _tmp1_; + _tmp3_ = self->priv->_section; + _tmp4_ = g_key_file_get_string (_tmp2_, _tmp3_, "command", &_inner_error_); + _tmp0_ = _tmp4_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { goto __catch8_g_key_file_error; @@ -207,14 +208,14 @@ g_clear_error (&_inner_error_); return NULL; } - result = _tmp4_; + result = _tmp0_; return result; } goto __finally8; __catch8_g_key_file_error: { GError* err = NULL; - gchar* _tmp5_; + gchar* _tmp5_ = NULL; err = _inner_error_; _inner_error_ = NULL; _tmp5_ = g_strdup ("sh"); @@ -230,12 +231,12 @@ void multi_term_shell_config_set_command (MultiTermShellConfig* self, const gchar* value) { - GKeyFile* _tmp0_; - GKeyFile* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - MultiTermConfig* _tmp4_; - MultiTermConfig* _tmp5_; + GKeyFile* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + MultiTermConfig* _tmp4_ = NULL; + MultiTermConfig* _tmp5_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = multi_term_shell_config_get_kf (self); _tmp1_ = _tmp0_; @@ -253,16 +254,16 @@ GError * _inner_error_ = NULL; g_return_val_if_fail (self != NULL, FALSE); { - GKeyFile* _tmp0_; - GKeyFile* _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_; - _tmp0_ = multi_term_shell_config_get_kf (self); - _tmp1_ = _tmp0_; - _tmp2_ = self->priv->_section; - _tmp3_ = g_key_file_get_boolean (_tmp1_, _tmp2_, "track_title", &_inner_error_); - _tmp4_ = _tmp3_; + gboolean _tmp0_ = FALSE; + GKeyFile* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + gboolean _tmp4_ = FALSE; + _tmp1_ = multi_term_shell_config_get_kf (self); + _tmp2_ = _tmp1_; + _tmp3_ = self->priv->_section; + _tmp4_ = g_key_file_get_boolean (_tmp2_, _tmp3_, "track_title", &_inner_error_); + _tmp0_ = _tmp4_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { goto __catch9_g_key_file_error; @@ -271,7 +272,7 @@ g_clear_error (&_inner_error_); return FALSE; } - result = _tmp4_; + result = _tmp0_; return result; } goto __finally9; @@ -292,12 +293,12 @@ void multi_term_shell_config_set_track_title (MultiTermShellConfig* self, gboolean value) { - GKeyFile* _tmp0_; - GKeyFile* _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; - MultiTermConfig* _tmp4_; - MultiTermConfig* _tmp5_; + GKeyFile* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + gboolean _tmp3_ = FALSE; + MultiTermConfig* _tmp4_ = NULL; + MultiTermConfig* _tmp5_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = multi_term_shell_config_get_kf (self); _tmp1_ = _tmp0_; @@ -315,16 +316,16 @@ GError * _inner_error_ = NULL; g_return_val_if_fail (self != NULL, NULL); { - GKeyFile* _tmp0_; - GKeyFile* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_ = NULL; - gchar* _tmp4_; - _tmp0_ = multi_term_shell_config_get_kf (self); - _tmp1_ = _tmp0_; - _tmp2_ = self->priv->_section; - _tmp3_ = g_key_file_get_string (_tmp1_, _tmp2_, "bg_color", &_inner_error_); - _tmp4_ = _tmp3_; + gchar* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + gchar* _tmp4_ = NULL; + _tmp1_ = multi_term_shell_config_get_kf (self); + _tmp2_ = _tmp1_; + _tmp3_ = self->priv->_section; + _tmp4_ = g_key_file_get_string (_tmp2_, _tmp3_, "bg_color", &_inner_error_); + _tmp0_ = _tmp4_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { goto __catch10_g_key_file_error; @@ -333,14 +334,14 @@ g_clear_error (&_inner_error_); return NULL; } - result = _tmp4_; + result = _tmp0_; return result; } goto __finally10; __catch10_g_key_file_error: { GError* err = NULL; - gchar* _tmp5_; + gchar* _tmp5_ = NULL; err = _inner_error_; _inner_error_ = NULL; _tmp5_ = g_strdup ("#ffffff"); @@ -356,12 +357,12 @@ void multi_term_shell_config_set_background_color (MultiTermShellConfig* self, const gchar* value) { - GKeyFile* _tmp0_; - GKeyFile* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - MultiTermConfig* _tmp4_; - MultiTermConfig* _tmp5_; + GKeyFile* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + MultiTermConfig* _tmp4_ = NULL; + MultiTermConfig* _tmp5_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = multi_term_shell_config_get_kf (self); _tmp1_ = _tmp0_; @@ -379,16 +380,16 @@ GError * _inner_error_ = NULL; g_return_val_if_fail (self != NULL, NULL); { - GKeyFile* _tmp0_; - GKeyFile* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_ = NULL; - gchar* _tmp4_; - _tmp0_ = multi_term_shell_config_get_kf (self); - _tmp1_ = _tmp0_; - _tmp2_ = self->priv->_section; - _tmp3_ = g_key_file_get_string (_tmp1_, _tmp2_, "fg_color", &_inner_error_); - _tmp4_ = _tmp3_; + gchar* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + gchar* _tmp4_ = NULL; + _tmp1_ = multi_term_shell_config_get_kf (self); + _tmp2_ = _tmp1_; + _tmp3_ = self->priv->_section; + _tmp4_ = g_key_file_get_string (_tmp2_, _tmp3_, "fg_color", &_inner_error_); + _tmp0_ = _tmp4_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { goto __catch11_g_key_file_error; @@ -397,14 +398,14 @@ g_clear_error (&_inner_error_); return NULL; } - result = _tmp4_; + result = _tmp0_; return result; } goto __finally11; __catch11_g_key_file_error: { GError* err = NULL; - gchar* _tmp5_; + gchar* _tmp5_ = NULL; err = _inner_error_; _inner_error_ = NULL; _tmp5_ = g_strdup ("#000000"); @@ -420,12 +421,12 @@ void multi_term_shell_config_set_foreground_color (MultiTermShellConfig* self, const gchar* value) { - GKeyFile* _tmp0_; - GKeyFile* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - MultiTermConfig* _tmp4_; - MultiTermConfig* _tmp5_; + GKeyFile* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + MultiTermConfig* _tmp4_ = NULL; + MultiTermConfig* _tmp5_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = multi_term_shell_config_get_kf (self); _tmp1_ = _tmp0_; @@ -443,16 +444,16 @@ GError * _inner_error_ = NULL; g_return_val_if_fail (self != NULL, NULL); { - GKeyFile* _tmp0_; - GKeyFile* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_ = NULL; - gchar* _tmp4_; - _tmp0_ = multi_term_shell_config_get_kf (self); - _tmp1_ = _tmp0_; - _tmp2_ = self->priv->_section; - _tmp3_ = g_key_file_get_string (_tmp1_, _tmp2_, "font", &_inner_error_); - _tmp4_ = _tmp3_; + gchar* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + gchar* _tmp4_ = NULL; + _tmp1_ = multi_term_shell_config_get_kf (self); + _tmp2_ = _tmp1_; + _tmp3_ = self->priv->_section; + _tmp4_ = g_key_file_get_string (_tmp2_, _tmp3_, "font", &_inner_error_); + _tmp0_ = _tmp4_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { goto __catch12_g_key_file_error; @@ -461,14 +462,14 @@ g_clear_error (&_inner_error_); return NULL; } - result = _tmp4_; + result = _tmp0_; return result; } goto __finally12; __catch12_g_key_file_error: { GError* err = NULL; - gchar* _tmp5_; + gchar* _tmp5_ = NULL; err = _inner_error_; _inner_error_ = NULL; _tmp5_ = g_strdup ("Monospace 9"); @@ -484,12 +485,12 @@ void multi_term_shell_config_set_font (MultiTermShellConfig* self, const gchar* value) { - GKeyFile* _tmp0_; - GKeyFile* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - MultiTermConfig* _tmp4_; - MultiTermConfig* _tmp5_; + GKeyFile* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + MultiTermConfig* _tmp4_ = NULL; + MultiTermConfig* _tmp5_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = multi_term_shell_config_get_kf (self); _tmp1_ = _tmp0_; @@ -502,6 +503,913 @@ } +gboolean multi_term_shell_config_get_allow_bold (MultiTermShellConfig* self) { + gboolean result; + GError * _inner_error_ = NULL; + g_return_val_if_fail (self != NULL, FALSE); + { + gboolean _tmp0_ = FALSE; + GKeyFile* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + gboolean _tmp4_ = FALSE; + _tmp1_ = multi_term_shell_config_get_kf (self); + _tmp2_ = _tmp1_; + _tmp3_ = self->priv->_section; + _tmp4_ = g_key_file_get_boolean (_tmp2_, _tmp3_, "allow_bold", &_inner_error_); + _tmp0_ = _tmp4_; + if (_inner_error_ != NULL) { + if (_inner_error_->domain == G_KEY_FILE_ERROR) { + goto __catch13_g_key_file_error; + } + g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return FALSE; + } + result = _tmp0_; + return result; + } + goto __finally13; + __catch13_g_key_file_error: + { + GError* err = NULL; + err = _inner_error_; + _inner_error_ = NULL; + result = TRUE; + _g_error_free0 (err); + return result; + } + __finally13: + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return FALSE; +} + + +void multi_term_shell_config_set_allow_bold (MultiTermShellConfig* self, gboolean value) { + GKeyFile* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + gboolean _tmp3_ = FALSE; + MultiTermConfig* _tmp4_ = NULL; + MultiTermConfig* _tmp5_ = NULL; + g_return_if_fail (self != NULL); + _tmp0_ = multi_term_shell_config_get_kf (self); + _tmp1_ = _tmp0_; + _tmp2_ = self->priv->_section; + _tmp3_ = value; + g_key_file_set_boolean (_tmp1_, _tmp2_, "allow_bold", _tmp3_); + _tmp4_ = multi_term_shell_config_get_cfg (self); + _tmp5_ = _tmp4_; + multi_term_config_store_eventually (_tmp5_); +} + + +gboolean multi_term_shell_config_get_audible_bell (MultiTermShellConfig* self) { + gboolean result; + GError * _inner_error_ = NULL; + g_return_val_if_fail (self != NULL, FALSE); + { + gboolean _tmp0_ = FALSE; + GKeyFile* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + gboolean _tmp4_ = FALSE; + _tmp1_ = multi_term_shell_config_get_kf (self); + _tmp2_ = _tmp1_; + _tmp3_ = self->priv->_section; + _tmp4_ = g_key_file_get_boolean (_tmp2_, _tmp3_, "audible_bell", &_inner_error_); + _tmp0_ = _tmp4_; + if (_inner_error_ != NULL) { + if (_inner_error_->domain == G_KEY_FILE_ERROR) { + goto __catch14_g_key_file_error; + } + g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return FALSE; + } + result = _tmp0_; + return result; + } + goto __finally14; + __catch14_g_key_file_error: + { + GError* err = NULL; + err = _inner_error_; + _inner_error_ = NULL; + result = TRUE; + _g_error_free0 (err); + return result; + } + __finally14: + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return FALSE; +} + + +void multi_term_shell_config_set_audible_bell (MultiTermShellConfig* self, gboolean value) { + GKeyFile* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + gboolean _tmp3_ = FALSE; + MultiTermConfig* _tmp4_ = NULL; + MultiTermConfig* _tmp5_ = NULL; + g_return_if_fail (self != NULL); + _tmp0_ = multi_term_shell_config_get_kf (self); + _tmp1_ = _tmp0_; + _tmp2_ = self->priv->_section; + _tmp3_ = value; + g_key_file_set_boolean (_tmp1_, _tmp2_, "audible_bell", _tmp3_); + _tmp4_ = multi_term_shell_config_get_cfg (self); + _tmp5_ = _tmp4_; + multi_term_config_store_eventually (_tmp5_); +} + + +VteTerminalCursorBlinkMode multi_term_shell_config_get_cursor_blink_mode (MultiTermShellConfig* self) { + VteTerminalCursorBlinkMode result; + GError * _inner_error_ = NULL; + g_return_val_if_fail (self != NULL, 0); + { + gchar* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + gchar* _tmp4_ = NULL; + gchar* blink_mode = NULL; + gchar* _tmp5_ = NULL; + gchar* _tmp6_ = NULL; + gchar* _tmp7_ = NULL; + gboolean _tmp8_ = FALSE; + const gchar* _tmp9_ = NULL; + gboolean _tmp11_ = FALSE; + _tmp1_ = multi_term_shell_config_get_kf (self); + _tmp2_ = _tmp1_; + _tmp3_ = self->priv->_section; + _tmp4_ = g_key_file_get_string (_tmp2_, _tmp3_, "cursor_blink_mode", &_inner_error_); + _tmp0_ = _tmp4_; + if (_inner_error_ != NULL) { + if (_inner_error_->domain == G_KEY_FILE_ERROR) { + goto __catch15_g_key_file_error; + } + g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return 0; + } + _tmp5_ = _tmp0_; + _tmp6_ = g_utf8_strdown (_tmp5_, (gssize) (-1)); + _tmp7_ = _tmp6_; + _g_free0 (_tmp5_); + blink_mode = _tmp7_; + _tmp9_ = blink_mode; + if (g_strcmp0 (_tmp9_, "on") == 0) { + _tmp8_ = TRUE; + } else { + const gchar* _tmp10_ = NULL; + _tmp10_ = blink_mode; + _tmp8_ = g_strcmp0 (_tmp10_, "true") == 0; + } + _tmp11_ = _tmp8_; + if (_tmp11_) { + result = VTE_CURSOR_BLINK_ON; + _g_free0 (blink_mode); + return result; + } else { + gboolean _tmp12_ = FALSE; + const gchar* _tmp13_ = NULL; + gboolean _tmp15_ = FALSE; + _tmp13_ = blink_mode; + if (g_strcmp0 (_tmp13_, "off") == 0) { + _tmp12_ = TRUE; + } else { + const gchar* _tmp14_ = NULL; + _tmp14_ = blink_mode; + _tmp12_ = g_strcmp0 (_tmp14_, "false") == 0; + } + _tmp15_ = _tmp12_; + if (_tmp15_) { + result = VTE_CURSOR_BLINK_OFF; + _g_free0 (blink_mode); + return result; + } else { + result = VTE_CURSOR_BLINK_SYSTEM; + _g_free0 (blink_mode); + return result; + } + } + _g_free0 (blink_mode); + } + goto __finally15; + __catch15_g_key_file_error: + { + GError* err = NULL; + err = _inner_error_; + _inner_error_ = NULL; + result = VTE_CURSOR_BLINK_SYSTEM; + _g_error_free0 (err); + return result; + } + __finally15: + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return 0; +} + + +void multi_term_shell_config_set_cursor_blink_mode (MultiTermShellConfig* self, VteTerminalCursorBlinkMode value) { + VteTerminalCursorBlinkMode _tmp0_ = 0; + MultiTermConfig* _tmp10_ = NULL; + MultiTermConfig* _tmp11_ = NULL; + g_return_if_fail (self != NULL); + _tmp0_ = value; + switch (_tmp0_) { + case VTE_CURSOR_BLINK_ON: + { + GKeyFile* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + _tmp1_ = multi_term_shell_config_get_kf (self); + _tmp2_ = _tmp1_; + _tmp3_ = self->priv->_section; + g_key_file_set_string (_tmp2_, _tmp3_, "cursor_blink_mode", "on"); + break; + } + case VTE_CURSOR_BLINK_OFF: + { + GKeyFile* _tmp4_ = NULL; + GKeyFile* _tmp5_ = NULL; + const gchar* _tmp6_ = NULL; + _tmp4_ = multi_term_shell_config_get_kf (self); + _tmp5_ = _tmp4_; + _tmp6_ = self->priv->_section; + g_key_file_set_string (_tmp5_, _tmp6_, "cursor_blink_mode", "off"); + break; + } + default: + { + GKeyFile* _tmp7_ = NULL; + GKeyFile* _tmp8_ = NULL; + const gchar* _tmp9_ = NULL; + _tmp7_ = multi_term_shell_config_get_kf (self); + _tmp8_ = _tmp7_; + _tmp9_ = self->priv->_section; + g_key_file_set_string (_tmp8_, _tmp9_, "cursor_blink_mode", "system"); + break; + } + } + _tmp10_ = multi_term_shell_config_get_cfg (self); + _tmp11_ = _tmp10_; + multi_term_config_store_eventually (_tmp11_); +} + + +VteTerminalCursorShape multi_term_shell_config_get_cursor_shape (MultiTermShellConfig* self) { + VteTerminalCursorShape result; + GError * _inner_error_ = NULL; + g_return_val_if_fail (self != NULL, 0); + { + gchar* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + gchar* _tmp4_ = NULL; + gchar* shape = NULL; + gchar* _tmp5_ = NULL; + gchar* _tmp6_ = NULL; + gchar* _tmp7_ = NULL; + const gchar* _tmp8_ = NULL; + _tmp1_ = multi_term_shell_config_get_kf (self); + _tmp2_ = _tmp1_; + _tmp3_ = self->priv->_section; + _tmp4_ = g_key_file_get_string (_tmp2_, _tmp3_, "cursor_shape", &_inner_error_); + _tmp0_ = _tmp4_; + if (_inner_error_ != NULL) { + if (_inner_error_->domain == G_KEY_FILE_ERROR) { + goto __catch16_g_key_file_error; + } + g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return 0; + } + _tmp5_ = _tmp0_; + _tmp6_ = g_utf8_strdown (_tmp5_, (gssize) (-1)); + _tmp7_ = _tmp6_; + _g_free0 (_tmp5_); + shape = _tmp7_; + _tmp8_ = shape; + if (g_strcmp0 (_tmp8_, "ibeam") == 0) { + result = VTE_CURSOR_SHAPE_IBEAM; + _g_free0 (shape); + return result; + } else { + const gchar* _tmp9_ = NULL; + _tmp9_ = shape; + if (g_strcmp0 (_tmp9_, "underline") == 0) { + result = VTE_CURSOR_SHAPE_UNDERLINE; + _g_free0 (shape); + return result; + } else { + result = VTE_CURSOR_SHAPE_BLOCK; + _g_free0 (shape); + return result; + } + } + _g_free0 (shape); + } + goto __finally16; + __catch16_g_key_file_error: + { + GError* err = NULL; + err = _inner_error_; + _inner_error_ = NULL; + result = VTE_CURSOR_SHAPE_BLOCK; + _g_error_free0 (err); + return result; + } + __finally16: + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return 0; +} + + +void multi_term_shell_config_set_cursor_shape (MultiTermShellConfig* self, VteTerminalCursorShape value) { + VteTerminalCursorShape _tmp0_ = 0; + MultiTermConfig* _tmp10_ = NULL; + MultiTermConfig* _tmp11_ = NULL; + g_return_if_fail (self != NULL); + _tmp0_ = value; + switch (_tmp0_) { + case VTE_CURSOR_SHAPE_IBEAM: + { + GKeyFile* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + _tmp1_ = multi_term_shell_config_get_kf (self); + _tmp2_ = _tmp1_; + _tmp3_ = self->priv->_section; + g_key_file_set_string (_tmp2_, _tmp3_, "cursor_shape", "ibeam"); + break; + } + case VTE_CURSOR_SHAPE_UNDERLINE: + { + GKeyFile* _tmp4_ = NULL; + GKeyFile* _tmp5_ = NULL; + const gchar* _tmp6_ = NULL; + _tmp4_ = multi_term_shell_config_get_kf (self); + _tmp5_ = _tmp4_; + _tmp6_ = self->priv->_section; + g_key_file_set_string (_tmp5_, _tmp6_, "cursor_shape", "underline"); + break; + } + default: + { + GKeyFile* _tmp7_ = NULL; + GKeyFile* _tmp8_ = NULL; + const gchar* _tmp9_ = NULL; + _tmp7_ = multi_term_shell_config_get_kf (self); + _tmp8_ = _tmp7_; + _tmp9_ = self->priv->_section; + g_key_file_set_string (_tmp8_, _tmp9_, "cursor_shape", "block"); + break; + } + } + _tmp10_ = multi_term_shell_config_get_cfg (self); + _tmp11_ = _tmp10_; + multi_term_config_store_eventually (_tmp11_); +} + + +VteTerminalEraseBinding multi_term_shell_config_get_backspace_binding (MultiTermShellConfig* self) { + VteTerminalEraseBinding result; + GError * _inner_error_ = NULL; + g_return_val_if_fail (self != NULL, 0); + { + gchar* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + gchar* _tmp4_ = NULL; + gchar* binding = NULL; + gchar* _tmp5_ = NULL; + gchar* _tmp6_ = NULL; + gchar* _tmp7_ = NULL; + const gchar* _tmp8_ = NULL; + _tmp1_ = multi_term_shell_config_get_kf (self); + _tmp2_ = _tmp1_; + _tmp3_ = self->priv->_section; + _tmp4_ = g_key_file_get_string (_tmp2_, _tmp3_, "backspace_binding", &_inner_error_); + _tmp0_ = _tmp4_; + if (_inner_error_ != NULL) { + if (_inner_error_->domain == G_KEY_FILE_ERROR) { + goto __catch17_g_key_file_error; + } + g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return 0; + } + _tmp5_ = _tmp0_; + _tmp6_ = g_utf8_strdown (_tmp5_, (gssize) (-1)); + _tmp7_ = _tmp6_; + _g_free0 (_tmp5_); + binding = _tmp7_; + _tmp8_ = binding; + if (g_strcmp0 (_tmp8_, "ascii_backspace") == 0) { + result = VTE_ERASE_ASCII_BACKSPACE; + _g_free0 (binding); + return result; + } else { + const gchar* _tmp9_ = NULL; + _tmp9_ = binding; + if (g_strcmp0 (_tmp9_, "ascii_delete") == 0) { + result = VTE_ERASE_ASCII_DELETE; + _g_free0 (binding); + return result; + } else { + const gchar* _tmp10_ = NULL; + _tmp10_ = binding; + if (g_strcmp0 (_tmp10_, "delete_sequence") == 0) { + result = VTE_ERASE_DELETE_SEQUENCE; + _g_free0 (binding); + return result; + } else { + const gchar* _tmp11_ = NULL; + _tmp11_ = binding; + if (g_strcmp0 (_tmp11_, "tty") == 0) { + result = VTE_ERASE_TTY; + _g_free0 (binding); + return result; + } else { + result = VTE_ERASE_AUTO; + _g_free0 (binding); + return result; + } + } + } + } + _g_free0 (binding); + } + goto __finally17; + __catch17_g_key_file_error: + { + GError* err = NULL; + err = _inner_error_; + _inner_error_ = NULL; + result = VTE_ERASE_AUTO; + _g_error_free0 (err); + return result; + } + __finally17: + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return 0; +} + + +void multi_term_shell_config_set_backspace_binding (MultiTermShellConfig* self, VteTerminalEraseBinding value) { + VteTerminalEraseBinding _tmp0_ = 0; + MultiTermConfig* _tmp16_ = NULL; + MultiTermConfig* _tmp17_ = NULL; + g_return_if_fail (self != NULL); + _tmp0_ = value; + switch (_tmp0_) { + case VTE_ERASE_ASCII_BACKSPACE: + { + GKeyFile* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + _tmp1_ = multi_term_shell_config_get_kf (self); + _tmp2_ = _tmp1_; + _tmp3_ = self->priv->_section; + g_key_file_set_string (_tmp2_, _tmp3_, "backspace_binding", "ascii_backspace"); + break; + } + case VTE_ERASE_ASCII_DELETE: + { + GKeyFile* _tmp4_ = NULL; + GKeyFile* _tmp5_ = NULL; + const gchar* _tmp6_ = NULL; + _tmp4_ = multi_term_shell_config_get_kf (self); + _tmp5_ = _tmp4_; + _tmp6_ = self->priv->_section; + g_key_file_set_string (_tmp5_, _tmp6_, "backspace_binding", "ascii_delete"); + break; + } + case VTE_ERASE_DELETE_SEQUENCE: + { + GKeyFile* _tmp7_ = NULL; + GKeyFile* _tmp8_ = NULL; + const gchar* _tmp9_ = NULL; + _tmp7_ = multi_term_shell_config_get_kf (self); + _tmp8_ = _tmp7_; + _tmp9_ = self->priv->_section; + g_key_file_set_string (_tmp8_, _tmp9_, "backspace_binding", "delete_sequence"); + break; + } + case VTE_ERASE_TTY: + { + GKeyFile* _tmp10_ = NULL; + GKeyFile* _tmp11_ = NULL; + const gchar* _tmp12_ = NULL; + _tmp10_ = multi_term_shell_config_get_kf (self); + _tmp11_ = _tmp10_; + _tmp12_ = self->priv->_section; + g_key_file_set_string (_tmp11_, _tmp12_, "backspace_binding", "tty"); + break; + } + default: + { + GKeyFile* _tmp13_ = NULL; + GKeyFile* _tmp14_ = NULL; + const gchar* _tmp15_ = NULL; + _tmp13_ = multi_term_shell_config_get_kf (self); + _tmp14_ = _tmp13_; + _tmp15_ = self->priv->_section; + g_key_file_set_string (_tmp14_, _tmp15_, "backspace_binding", "auto"); + break; + } + } + _tmp16_ = multi_term_shell_config_get_cfg (self); + _tmp17_ = _tmp16_; + multi_term_config_store_eventually (_tmp17_); +} + + +gboolean multi_term_shell_config_get_pointer_autohide (MultiTermShellConfig* self) { + gboolean result; + GError * _inner_error_ = NULL; + g_return_val_if_fail (self != NULL, FALSE); + { + gboolean _tmp0_ = FALSE; + GKeyFile* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + gboolean _tmp4_ = FALSE; + _tmp1_ = multi_term_shell_config_get_kf (self); + _tmp2_ = _tmp1_; + _tmp3_ = self->priv->_section; + _tmp4_ = g_key_file_get_boolean (_tmp2_, _tmp3_, "pointer_autohide", &_inner_error_); + _tmp0_ = _tmp4_; + if (_inner_error_ != NULL) { + if (_inner_error_->domain == G_KEY_FILE_ERROR) { + goto __catch18_g_key_file_error; + } + g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return FALSE; + } + result = _tmp0_; + return result; + } + goto __finally18; + __catch18_g_key_file_error: + { + GError* err = NULL; + err = _inner_error_; + _inner_error_ = NULL; + result = FALSE; + _g_error_free0 (err); + return result; + } + __finally18: + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return FALSE; +} + + +void multi_term_shell_config_set_pointer_autohide (MultiTermShellConfig* self, gboolean value) { + GKeyFile* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + gboolean _tmp3_ = FALSE; + MultiTermConfig* _tmp4_ = NULL; + MultiTermConfig* _tmp5_ = NULL; + g_return_if_fail (self != NULL); + _tmp0_ = multi_term_shell_config_get_kf (self); + _tmp1_ = _tmp0_; + _tmp2_ = self->priv->_section; + _tmp3_ = value; + g_key_file_set_boolean (_tmp1_, _tmp2_, "pointer_autohide", _tmp3_); + _tmp4_ = multi_term_shell_config_get_cfg (self); + _tmp5_ = _tmp4_; + multi_term_config_store_eventually (_tmp5_); +} + + +gboolean multi_term_shell_config_get_scroll_on_keystroke (MultiTermShellConfig* self) { + gboolean result; + GError * _inner_error_ = NULL; + g_return_val_if_fail (self != NULL, FALSE); + { + gboolean _tmp0_ = FALSE; + GKeyFile* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + gboolean _tmp4_ = FALSE; + _tmp1_ = multi_term_shell_config_get_kf (self); + _tmp2_ = _tmp1_; + _tmp3_ = self->priv->_section; + _tmp4_ = g_key_file_get_boolean (_tmp2_, _tmp3_, "scroll_on_keystroke", &_inner_error_); + _tmp0_ = _tmp4_; + if (_inner_error_ != NULL) { + if (_inner_error_->domain == G_KEY_FILE_ERROR) { + goto __catch19_g_key_file_error; + } + g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return FALSE; + } + result = _tmp0_; + return result; + } + goto __finally19; + __catch19_g_key_file_error: + { + GError* err = NULL; + err = _inner_error_; + _inner_error_ = NULL; + result = TRUE; + _g_error_free0 (err); + return result; + } + __finally19: + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return FALSE; +} + + +void multi_term_shell_config_set_scroll_on_keystroke (MultiTermShellConfig* self, gboolean value) { + GKeyFile* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + gboolean _tmp3_ = FALSE; + MultiTermConfig* _tmp4_ = NULL; + MultiTermConfig* _tmp5_ = NULL; + g_return_if_fail (self != NULL); + _tmp0_ = multi_term_shell_config_get_kf (self); + _tmp1_ = _tmp0_; + _tmp2_ = self->priv->_section; + _tmp3_ = value; + g_key_file_set_boolean (_tmp1_, _tmp2_, "scroll_on_keystroke", _tmp3_); + _tmp4_ = multi_term_shell_config_get_cfg (self); + _tmp5_ = _tmp4_; + multi_term_config_store_eventually (_tmp5_); +} + + +gboolean multi_term_shell_config_get_scroll_on_output (MultiTermShellConfig* self) { + gboolean result; + GError * _inner_error_ = NULL; + g_return_val_if_fail (self != NULL, FALSE); + { + gboolean _tmp0_ = FALSE; + GKeyFile* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + gboolean _tmp4_ = FALSE; + _tmp1_ = multi_term_shell_config_get_kf (self); + _tmp2_ = _tmp1_; + _tmp3_ = self->priv->_section; + _tmp4_ = g_key_file_get_boolean (_tmp2_, _tmp3_, "scroll_on_output", &_inner_error_); + _tmp0_ = _tmp4_; + if (_inner_error_ != NULL) { + if (_inner_error_->domain == G_KEY_FILE_ERROR) { + goto __catch20_g_key_file_error; + } + g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return FALSE; + } + result = _tmp0_; + return result; + } + goto __finally20; + __catch20_g_key_file_error: + { + GError* err = NULL; + err = _inner_error_; + _inner_error_ = NULL; + result = FALSE; + _g_error_free0 (err); + return result; + } + __finally20: + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return FALSE; +} + + +void multi_term_shell_config_set_scroll_on_output (MultiTermShellConfig* self, gboolean value) { + GKeyFile* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + gboolean _tmp3_ = FALSE; + MultiTermConfig* _tmp4_ = NULL; + MultiTermConfig* _tmp5_ = NULL; + g_return_if_fail (self != NULL); + _tmp0_ = multi_term_shell_config_get_kf (self); + _tmp1_ = _tmp0_; + _tmp2_ = self->priv->_section; + _tmp3_ = value; + g_key_file_set_boolean (_tmp1_, _tmp2_, "scroll_on_output", _tmp3_); + _tmp4_ = multi_term_shell_config_get_cfg (self); + _tmp5_ = _tmp4_; + multi_term_config_store_eventually (_tmp5_); +} + + +gint multi_term_shell_config_get_scrollback_lines (MultiTermShellConfig* self) { + gint result; + GError * _inner_error_ = NULL; + g_return_val_if_fail (self != NULL, 0); + { + gint _tmp0_ = 0; + GKeyFile* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + gint _tmp4_ = 0; + _tmp1_ = multi_term_shell_config_get_kf (self); + _tmp2_ = _tmp1_; + _tmp3_ = self->priv->_section; + _tmp4_ = g_key_file_get_integer (_tmp2_, _tmp3_, "scrollback_lines", &_inner_error_); + _tmp0_ = _tmp4_; + if (_inner_error_ != NULL) { + if (_inner_error_->domain == G_KEY_FILE_ERROR) { + goto __catch21_g_key_file_error; + } + g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return 0; + } + result = _tmp0_; + return result; + } + goto __finally21; + __catch21_g_key_file_error: + { + GError* err = NULL; + err = _inner_error_; + _inner_error_ = NULL; + result = 512; + _g_error_free0 (err); + return result; + } + __finally21: + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return 0; +} + + +void multi_term_shell_config_set_scrollback_lines (MultiTermShellConfig* self, gint value) { + GKeyFile* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + gint _tmp3_ = 0; + MultiTermConfig* _tmp4_ = NULL; + MultiTermConfig* _tmp5_ = NULL; + g_return_if_fail (self != NULL); + _tmp0_ = multi_term_shell_config_get_kf (self); + _tmp1_ = _tmp0_; + _tmp2_ = self->priv->_section; + _tmp3_ = value; + g_key_file_set_integer (_tmp1_, _tmp2_, "scrollback_lines", _tmp3_); + _tmp4_ = multi_term_shell_config_get_cfg (self); + _tmp5_ = _tmp4_; + multi_term_config_store_eventually (_tmp5_); +} + + +gboolean multi_term_shell_config_get_visible_bell (MultiTermShellConfig* self) { + gboolean result; + GError * _inner_error_ = NULL; + g_return_val_if_fail (self != NULL, FALSE); + { + gboolean _tmp0_ = FALSE; + GKeyFile* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + gboolean _tmp4_ = FALSE; + _tmp1_ = multi_term_shell_config_get_kf (self); + _tmp2_ = _tmp1_; + _tmp3_ = self->priv->_section; + _tmp4_ = g_key_file_get_boolean (_tmp2_, _tmp3_, "visible_bell", &_inner_error_); + _tmp0_ = _tmp4_; + if (_inner_error_ != NULL) { + if (_inner_error_->domain == G_KEY_FILE_ERROR) { + goto __catch22_g_key_file_error; + } + g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return FALSE; + } + result = _tmp0_; + return result; + } + goto __finally22; + __catch22_g_key_file_error: + { + GError* err = NULL; + err = _inner_error_; + _inner_error_ = NULL; + result = FALSE; + _g_error_free0 (err); + return result; + } + __finally22: + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return FALSE; +} + + +void multi_term_shell_config_set_visible_bell (MultiTermShellConfig* self, gboolean value) { + GKeyFile* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + gboolean _tmp3_ = FALSE; + MultiTermConfig* _tmp4_ = NULL; + MultiTermConfig* _tmp5_ = NULL; + g_return_if_fail (self != NULL); + _tmp0_ = multi_term_shell_config_get_kf (self); + _tmp1_ = _tmp0_; + _tmp2_ = self->priv->_section; + _tmp3_ = value; + g_key_file_set_boolean (_tmp1_, _tmp2_, "visible_bell", _tmp3_); + _tmp4_ = multi_term_shell_config_get_cfg (self); + _tmp5_ = _tmp4_; + multi_term_config_store_eventually (_tmp5_); +} + + +gchar* multi_term_shell_config_get_word_chars (MultiTermShellConfig* self) { + gchar* result; + GError * _inner_error_ = NULL; + g_return_val_if_fail (self != NULL, NULL); + { + gchar* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + GKeyFile* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + gchar* _tmp4_ = NULL; + _tmp1_ = multi_term_shell_config_get_kf (self); + _tmp2_ = _tmp1_; + _tmp3_ = self->priv->_section; + _tmp4_ = g_key_file_get_string (_tmp2_, _tmp3_, "word_chars", &_inner_error_); + _tmp0_ = _tmp4_; + if (_inner_error_ != NULL) { + if (_inner_error_->domain == G_KEY_FILE_ERROR) { + goto __catch23_g_key_file_error; + } + g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return NULL; + } + result = _tmp0_; + return result; + } + goto __finally23; + __catch23_g_key_file_error: + { + GError* err = NULL; + gchar* _tmp5_ = NULL; + err = _inner_error_; + _inner_error_ = NULL; + _tmp5_ = g_strdup (""); + result = _tmp5_; + _g_error_free0 (err); + return result; + } + __finally23: + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return NULL; +} + + +void multi_term_shell_config_set_word_chars (MultiTermShellConfig* self, const gchar* value) { + GKeyFile* _tmp0_ = NULL; + GKeyFile* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + MultiTermConfig* _tmp4_ = NULL; + MultiTermConfig* _tmp5_ = NULL; + g_return_if_fail (self != NULL); + _tmp0_ = multi_term_shell_config_get_kf (self); + _tmp1_ = _tmp0_; + _tmp2_ = self->priv->_section; + _tmp3_ = value; + g_key_file_set_string (_tmp1_, _tmp2_, "word_chars", _tmp3_); + _tmp4_ = multi_term_shell_config_get_cfg (self); + _tmp5_ = _tmp4_; + multi_term_config_store_eventually (_tmp5_); +} + + static void multi_term_value_shell_config_init (GValue* value) { value->data[0].v_pointer = NULL; } @@ -627,7 +1535,7 @@ static void multi_term_shell_config_finalize (MultiTermShellConfig* obj) { MultiTermShellConfig * self; - self = MULTI_TERM_SHELL_CONFIG (obj); + self = G_TYPE_CHECK_INSTANCE_CAST (obj, MULTI_TERM_TYPE_SHELL_CONFIG, MultiTermShellConfig); _multi_term_config_unref0 (self->_cfg); _g_free0 (self->priv->_section); } diff -Nru geany-plugins-1.23+dfsg/multiterm/src/shell-config.vala geany-plugins-1.24+dfsg/multiterm/src/shell-config.vala --- geany-plugins-1.23+dfsg/multiterm/src/shell-config.vala 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/multiterm/src/shell-config.vala 2013-06-30 11:40:06.000000000 +0000 @@ -19,6 +19,8 @@ * MA 02110-1301, USA. */ +using Vte; + namespace MultiTerm { public class ShellConfig @@ -121,5 +123,229 @@ cfg.store_eventually(); } } + + public bool allow_bold + { + get + { + try { return kf.get_boolean(_section, "allow_bold"); } + catch (KeyFileError err) { return true; } + } + set + { + kf.set_boolean(_section, "allow_bold", value); + cfg.store_eventually(); + } + } + + public bool audible_bell + { + get + { + try { return kf.get_boolean(_section, "audible_bell"); } + catch (KeyFileError err) { return true; } + } + set + { + kf.set_boolean(_section, "audible_bell", value); + cfg.store_eventually(); + } + } + + public TerminalCursorBlinkMode cursor_blink_mode + { + get + { + try + { + string blink_mode = kf.get_string(_section, "cursor_blink_mode").down(); + if (blink_mode == "on" || blink_mode == "true") + return TerminalCursorBlinkMode.ON; + else if (blink_mode == "off" || blink_mode == "false") + return TerminalCursorBlinkMode.OFF; + else + return TerminalCursorBlinkMode.SYSTEM; + } + catch (KeyFileError err) { return TerminalCursorBlinkMode.SYSTEM; } + } + set + { + switch (value) + { + case TerminalCursorBlinkMode.ON: + kf.set_string(_section, "cursor_blink_mode", "on"); + break; + case TerminalCursorBlinkMode.OFF: + kf.set_string(_section, "cursor_blink_mode", "off"); + break; + default: + kf.set_string(_section, "cursor_blink_mode", "system"); + break; + } + cfg.store_eventually(); + } + } + + public TerminalCursorShape cursor_shape + { + get + { + try + { + string shape = kf.get_string(_section, "cursor_shape").down(); + if (shape == "ibeam") + return TerminalCursorShape.IBEAM; + else if (shape == "underline") + return TerminalCursorShape.UNDERLINE; + else + return TerminalCursorShape.BLOCK; + } + catch (KeyFileError err) { return TerminalCursorShape.BLOCK; } + } + set + { + switch (value) + { + case TerminalCursorShape.IBEAM: + kf.set_string(_section, "cursor_shape", "ibeam"); + break; + case TerminalCursorShape.UNDERLINE: + kf.set_string(_section, "cursor_shape", "underline"); + break; + default: + kf.set_string(_section, "cursor_shape", "block"); + break; + } + cfg.store_eventually(); + } + } + + public TerminalEraseBinding backspace_binding + { + get + { + try + { + string binding = kf.get_string(_section, "backspace_binding").down(); + if (binding == "ascii_backspace") + return TerminalEraseBinding.ASCII_BACKSPACE; + else if (binding == "ascii_delete") + return TerminalEraseBinding.ASCII_DELETE; + else if (binding == "delete_sequence") + return TerminalEraseBinding.DELETE_SEQUENCE; + else if (binding == "tty") + return TerminalEraseBinding.TTY; + else + return TerminalEraseBinding.AUTO; + } + catch (KeyFileError err) { return TerminalEraseBinding.AUTO; } + } + set + { + switch (value) + { + case TerminalEraseBinding.ASCII_BACKSPACE: + kf.set_string(_section, "backspace_binding", "ascii_backspace"); + break; + case TerminalEraseBinding.ASCII_DELETE: + kf.set_string(_section, "backspace_binding", "ascii_delete"); + break; + case TerminalEraseBinding.DELETE_SEQUENCE: + kf.set_string(_section, "backspace_binding", "delete_sequence"); + break; + case TerminalEraseBinding.TTY: + kf.set_string(_section, "backspace_binding", "tty"); + break; + default: + kf.set_string(_section, "backspace_binding", "auto"); + break; + } + cfg.store_eventually(); + } + } + + public bool pointer_autohide + { + get + { + try { return kf.get_boolean(_section, "pointer_autohide"); } + catch (KeyFileError err) { return false; } + } + set + { + kf.set_boolean(_section, "pointer_autohide", value); + cfg.store_eventually(); + } + } + + public bool scroll_on_keystroke + { + get + { + try { return kf.get_boolean(_section, "scroll_on_keystroke"); } + catch (KeyFileError err) { return true; } + } + set + { + kf.set_boolean(_section, "scroll_on_keystroke", value); + cfg.store_eventually(); + } + } + + public bool scroll_on_output + { + get + { + try { return kf.get_boolean(_section, "scroll_on_output"); } + catch (KeyFileError err) { return false; } + } + set + { + kf.set_boolean(_section, "scroll_on_output", value); + cfg.store_eventually(); + } + } + + public int scrollback_lines + { + get + { + try { return kf.get_integer(_section, "scrollback_lines"); } + catch (KeyFileError err) { return 512; } + } + set + { + kf.set_integer(_section, "scrollback_lines", value); + cfg.store_eventually(); + } + } + + public bool visible_bell + { + get + { + try { return kf.get_boolean(_section, "visible_bell"); } + catch (KeyFileError err) { return false; } + } + set + { + kf.set_boolean(_section, "visible_bell", value); + cfg.store_eventually(); + } + } + + public string word_chars + { + owned get + { + try { return kf.get_string(_section, "word_chars"); } + catch (KeyFileError err) { return ""; } + } + set + { + kf.set_string(_section, "word_chars", value); + cfg.store_eventually(); + } + } } } diff -Nru geany-plugins-1.23+dfsg/multiterm/src/tab-label.c geany-plugins-1.24+dfsg/multiterm/src/tab-label.c --- geany-plugins-1.23+dfsg/multiterm/src/tab-label.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/multiterm/src/tab-label.c 2014-04-13 17:17:56.000000000 +0000 @@ -1,4 +1,4 @@ -/* tab-label.c generated by valac 0.16.1, the Vala compiler +/* tab-label.c generated by valac 0.22.1, the Vala compiler * generated from tab-label.vala, do not modify */ /* @@ -60,20 +60,20 @@ static void multi_term_tab_label_on_button_clicked (MultiTermTabLabel* self) { + MultiTermTerminal* term = NULL; gconstpointer _tmp0_ = NULL; - MultiTermTerminal* _tmp1_; - MultiTermTerminal* term; + MultiTermTerminal* _tmp1_ = NULL; + MultiTermNotebook* nb = NULL; GtkWidget* _tmp2_ = NULL; - MultiTermNotebook* _tmp3_; - MultiTermNotebook* nb; + MultiTermNotebook* _tmp3_ = NULL; + gint page_num = 0; gint _tmp4_ = 0; - gint page_num; g_return_if_fail (self != NULL); _tmp0_ = g_object_get_data ((GObject*) self, "terminal"); _tmp1_ = _g_object_ref0 ((MultiTermTerminal*) _tmp0_); term = _tmp1_; _tmp2_ = gtk_widget_get_parent ((GtkWidget*) term); - _tmp3_ = _g_object_ref0 (MULTI_TERM_NOTEBOOK (_tmp2_)); + _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, MULTI_TERM_TYPE_NOTEBOOK, MultiTermNotebook)); nb = _tmp3_; _tmp4_ = gtk_notebook_page_num ((GtkNotebook*) nb, (GtkWidget*) term); page_num = _tmp4_; @@ -86,11 +86,11 @@ static void multi_term_tab_label_on_button_style_set (MultiTermTabLabel* self, GtkStyle* previous_style) { gint w = 0; gint h = 0; - GtkButton* _tmp0_; + GtkButton* _tmp0_ = NULL; GtkSettings* _tmp1_ = NULL; gint _tmp2_ = 0; gint _tmp3_ = 0; - GtkButton* _tmp4_; + GtkButton* _tmp4_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = self->priv->btn; _tmp1_ = gtk_widget_get_settings ((GtkWidget*) _tmp0_); @@ -115,68 +115,65 @@ MultiTermTabLabel* multi_term_tab_label_construct (GType object_type, const gchar* text) { MultiTermTabLabel * self = NULL; GtkImage* img = NULL; - const gchar* _tmp0_; - GtkLabel* _tmp1_; - GtkLabel* _tmp2_; - GtkLabel* _tmp3_; - GtkLabel* _tmp4_; - GtkLabel* _tmp5_; - GtkImage* _tmp6_; - GtkImage* _tmp7_; - GtkRcStyle* _tmp8_; - GtkRcStyle* style; - GtkButton* _tmp9_; - GtkButton* _tmp10_; - GtkButton* _tmp11_; - GtkButton* _tmp12_; - GtkButton* _tmp13_; - GtkButton* _tmp14_; - GtkButton* _tmp15_; - GtkButton* _tmp16_; - GtkButton* _tmp17_; - GtkButton* _tmp18_; + const gchar* _tmp0_ = NULL; + GtkLabel* _tmp1_ = NULL; + GtkLabel* _tmp2_ = NULL; + GtkLabel* _tmp3_ = NULL; + GtkLabel* _tmp4_ = NULL; + GtkImage* _tmp5_ = NULL; + GtkRcStyle* style = NULL; + GtkRcStyle* _tmp6_ = NULL; + GtkButton* _tmp7_ = NULL; + GtkButton* _tmp8_ = NULL; + GtkButton* _tmp9_ = NULL; + GtkButton* _tmp10_ = NULL; + GtkButton* _tmp11_ = NULL; + GtkButton* _tmp12_ = NULL; + GtkButton* _tmp13_ = NULL; + GtkButton* _tmp14_ = NULL; + GtkButton* _tmp15_ = NULL; g_return_val_if_fail (text != NULL, NULL); self = (MultiTermTabLabel*) g_object_new (object_type, "homogeneous", FALSE, "spacing", 2, NULL); gtk_container_set_border_width ((GtkContainer*) self, (guint) 0); _tmp0_ = text; _tmp1_ = (GtkLabel*) gtk_label_new (_tmp0_); - _tmp2_ = g_object_ref_sink (_tmp1_); + g_object_ref_sink (_tmp1_); _g_object_unref0 (self->label); - self->label = _tmp2_; + self->label = _tmp1_; + _tmp2_ = self->label; + gtk_misc_set_alignment ((GtkMisc*) _tmp2_, 0.0f, 0.5f); _tmp3_ = self->label; - gtk_misc_set_alignment ((GtkMisc*) _tmp3_, 0.0f, 0.5f); + gtk_label_set_ellipsize (_tmp3_, PANGO_ELLIPSIZE_END); _tmp4_ = self->label; - gtk_label_set_ellipsize (_tmp4_, PANGO_ELLIPSIZE_END); - _tmp5_ = self->label; - gtk_box_pack_start ((GtkBox*) self, (GtkWidget*) _tmp5_, TRUE, TRUE, (guint) 0); - _tmp6_ = (GtkImage*) gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); - _tmp7_ = g_object_ref_sink (_tmp6_); + gtk_box_pack_start ((GtkBox*) self, (GtkWidget*) _tmp4_, TRUE, TRUE, (guint) 0); + _tmp5_ = (GtkImage*) gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); + g_object_ref_sink (_tmp5_); _g_object_unref0 (img); - img = _tmp7_; - _tmp8_ = gtk_rc_style_new (); - style = _tmp8_; + img = _tmp5_; + _tmp6_ = gtk_rc_style_new (); + style = _tmp6_; style->xthickness = 0; style->ythickness = 0; - _tmp9_ = (GtkButton*) gtk_button_new (); - _tmp10_ = g_object_ref_sink (_tmp9_); + _tmp7_ = (GtkButton*) gtk_button_new (); + g_object_ref_sink (_tmp7_); _g_object_unref0 (self->priv->btn); - self->priv->btn = _tmp10_; + self->priv->btn = _tmp7_; + _tmp8_ = self->priv->btn; + gtk_widget_modify_style ((GtkWidget*) _tmp8_, style); + _tmp9_ = self->priv->btn; + gtk_container_add ((GtkContainer*) _tmp9_, (GtkWidget*) img); + _tmp10_ = self->priv->btn; + gtk_widget_set_tooltip_text ((GtkWidget*) _tmp10_, "Close terminal"); _tmp11_ = self->priv->btn; - gtk_widget_modify_style ((GtkWidget*) _tmp11_, style); + g_signal_connect_object (_tmp11_, "clicked", (GCallback) _multi_term_tab_label_on_button_clicked_gtk_button_clicked, self, 0); _tmp12_ = self->priv->btn; - gtk_container_add ((GtkContainer*) _tmp12_, (GtkWidget*) img); + gtk_button_set_relief (_tmp12_, GTK_RELIEF_NONE); _tmp13_ = self->priv->btn; - gtk_widget_set_tooltip_text ((GtkWidget*) _tmp13_, "Close terminal"); + gtk_button_set_focus_on_click (_tmp13_, FALSE); _tmp14_ = self->priv->btn; - g_signal_connect_object (_tmp14_, "clicked", (GCallback) _multi_term_tab_label_on_button_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object ((GtkWidget*) _tmp14_, "style-set", (GCallback) _multi_term_tab_label_on_button_style_set_gtk_widget_style_set, self, 0); _tmp15_ = self->priv->btn; - gtk_button_set_relief (_tmp15_, GTK_RELIEF_NONE); - _tmp16_ = self->priv->btn; - gtk_button_set_focus_on_click (_tmp16_, FALSE); - _tmp17_ = self->priv->btn; - g_signal_connect_object ((GtkWidget*) _tmp17_, "style-set", (GCallback) _multi_term_tab_label_on_button_style_set_gtk_widget_style_set, self, 0); - _tmp18_ = self->priv->btn; - gtk_box_pack_start ((GtkBox*) self, (GtkWidget*) _tmp18_, FALSE, FALSE, (guint) 0); + gtk_box_pack_start ((GtkBox*) self, (GtkWidget*) _tmp15_, FALSE, FALSE, (guint) 0); _g_object_unref0 (style); _g_object_unref0 (img); return self; @@ -190,7 +187,7 @@ const gchar* multi_term_tab_label_get_text (MultiTermTabLabel* self) { const gchar* result; - GtkLabel* _tmp0_; + GtkLabel* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = self->label; @@ -201,8 +198,8 @@ void multi_term_tab_label_set_text (MultiTermTabLabel* self, const gchar* value) { - GtkLabel* _tmp0_; - const gchar* _tmp1_; + GtkLabel* _tmp0_ = NULL; + const gchar* _tmp1_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = self->label; _tmp1_ = value; @@ -213,7 +210,7 @@ GtkButton* multi_term_tab_label_get_button (MultiTermTabLabel* self) { GtkButton* result; - GtkButton* _tmp0_; + GtkButton* _tmp0_ = NULL; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = self->priv->btn; result = _tmp0_; @@ -240,7 +237,7 @@ static void multi_term_tab_label_finalize (GObject* obj) { MultiTermTabLabel * self; - self = MULTI_TERM_TAB_LABEL (obj); + self = G_TYPE_CHECK_INSTANCE_CAST (obj, MULTI_TERM_TYPE_TAB_LABEL, MultiTermTabLabel); _g_object_unref0 (self->priv->btn); _g_object_unref0 (self->label); G_OBJECT_CLASS (multi_term_tab_label_parent_class)->finalize (obj); @@ -261,7 +258,7 @@ static void _vala_multi_term_tab_label_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { MultiTermTabLabel * self; - self = MULTI_TERM_TAB_LABEL (object); + self = G_TYPE_CHECK_INSTANCE_CAST (object, MULTI_TERM_TYPE_TAB_LABEL, MultiTermTabLabel); switch (property_id) { case MULTI_TERM_TAB_LABEL_TEXT: g_value_set_string (value, multi_term_tab_label_get_text (self)); @@ -278,7 +275,7 @@ static void _vala_multi_term_tab_label_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { MultiTermTabLabel * self; - self = MULTI_TERM_TAB_LABEL (object); + self = G_TYPE_CHECK_INSTANCE_CAST (object, MULTI_TERM_TYPE_TAB_LABEL, MultiTermTabLabel); switch (property_id) { case MULTI_TERM_TAB_LABEL_TEXT: multi_term_tab_label_set_text (self, g_value_get_string (value)); diff -Nru geany-plugins-1.23+dfsg/multiterm/src/terminal.c geany-plugins-1.24+dfsg/multiterm/src/terminal.c --- geany-plugins-1.23+dfsg/multiterm/src/terminal.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/multiterm/src/terminal.c 2014-04-13 17:17:56.000000000 +0000 @@ -1,4 +1,4 @@ -/* terminal.c generated by valac 0.16.1, the Vala compiler +/* terminal.c generated by valac 0.22.1, the Vala compiler * generated from terminal.vala, do not modify */ /* @@ -68,9 +68,9 @@ static void multi_term_terminal_on_window_title_changed (MultiTermTerminal* self) { - VteTerminal* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; + VteTerminal* _tmp0_ = NULL; + const gchar* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = self->terminal; _tmp1_ = vte_terminal_get_window_title (_tmp0_); @@ -81,12 +81,12 @@ void multi_term_terminal_run_command (MultiTermTerminal* self, const gchar* command) { GPid pid = 0; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar** argv = NULL; + const gchar* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; gchar** _tmp2_ = NULL; - gchar** argv; - gint argv_length1; - gint _argv_size_; + gint argv_length1 = 0; + gint _argv_size_ = 0; GError * _inner_error_ = NULL; g_return_if_fail (self != NULL); g_return_if_fail (command != NULL); @@ -99,21 +99,21 @@ argv_length1 = 2; _argv_size_ = argv_length1; { - VteTerminal* _tmp3_; + VteTerminal* _tmp3_ = NULL; GPid _tmp4_ = 0; _tmp3_ = self->terminal; vte_terminal_fork_command_full (_tmp3_, VTE_PTY_DEFAULT, NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &_tmp4_, &_inner_error_); pid = _tmp4_; if (_inner_error_ != NULL) { - goto __catch13_g_error; + goto __catch24_g_error; } } - goto __finally13; - __catch13_g_error: + goto __finally24; + __catch24_g_error: { GError* err = NULL; - GError* _tmp5_; - const gchar* _tmp6_; + GError* _tmp5_ = NULL; + const gchar* _tmp6_ = NULL; err = _inner_error_; _inner_error_ = NULL; _tmp5_ = err; @@ -121,7 +121,7 @@ g_warning ("terminal.vala:88: Unable to run command: %s", _tmp6_); _g_error_free0 (err); } - __finally13: + __finally24: if (_inner_error_ != NULL) { argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL); g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -140,24 +140,24 @@ static void multi_term_terminal_on_vte_realize (MultiTermTerminal* self) { - MultiTermShellConfig* _tmp0_; - MultiTermConfig* _tmp1_; - MultiTermConfig* _tmp2_; - VteTerminal* _tmp11_; - VteTerminal* _tmp12_; + MultiTermShellConfig* _tmp0_ = NULL; + MultiTermConfig* _tmp1_ = NULL; + MultiTermConfig* _tmp2_ = NULL; + VteTerminal* _tmp11_ = NULL; + VteTerminal* _tmp12_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = self->priv->sh; _tmp1_ = multi_term_shell_config_get_cfg (_tmp0_); _tmp2_ = _tmp1_; if (_tmp2_ != NULL) { - MultiTermShellConfig* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - MultiTermShellConfig* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - gchar* _tmp10_; + MultiTermShellConfig* _tmp3_ = NULL; + gchar* _tmp4_ = NULL; + gchar* _tmp5_ = NULL; + gchar* _tmp6_ = NULL; + MultiTermShellConfig* _tmp7_ = NULL; + gchar* _tmp8_ = NULL; + gchar* _tmp9_ = NULL; + gchar* _tmp10_ = NULL; _tmp3_ = self->priv->sh; _tmp4_ = multi_term_shell_config_get_background_color (_tmp3_); _tmp5_ = _tmp4_; @@ -182,10 +182,10 @@ static void multi_term_terminal_on_child_exited (MultiTermTerminal* self) { - MultiTermShellConfig* _tmp0_; - gchar* _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; + MultiTermShellConfig* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; + gchar* _tmp2_ = NULL; + gchar* _tmp3_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = self->priv->sh; _tmp1_ = multi_term_shell_config_get_command (_tmp0_); @@ -198,14 +198,14 @@ static gboolean multi_term_terminal_on_button_press (MultiTermTerminal* self, GdkEventButton* event) { gboolean result = FALSE; - GdkEventButton _tmp0_; - guint _tmp1_; + GdkEventButton _tmp0_ = {0}; + guint _tmp1_ = 0U; g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (event != NULL, FALSE); _tmp0_ = *event; _tmp1_ = _tmp0_.button; if (_tmp1_ == ((guint) 3)) { - GdkEventButton _tmp2_; + GdkEventButton _tmp2_ = {0}; gboolean _tmp3_ = FALSE; _tmp2_ = *event; g_signal_emit_by_name (self, "right-click-event", &_tmp2_, &_tmp3_); @@ -218,10 +218,10 @@ void multi_term_terminal_send_command (MultiTermTerminal* self, const gchar* command) { - VteTerminal* _tmp0_; - const gchar* _tmp1_; + VteTerminal* _tmp0_ = NULL; + const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; - gchar* _tmp3_; + gchar* _tmp3_ = NULL; g_return_if_fail (self != NULL); g_return_if_fail (command != NULL); _tmp0_ = self->terminal; @@ -240,9 +240,9 @@ static gchar* string_strip (const gchar* self) { gchar* result = NULL; + gchar* _result_ = NULL; gchar* _tmp0_ = NULL; - gchar* _result_; - const gchar* _tmp1_; + const gchar* _tmp1_ = NULL; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = g_strdup (self); _result_ = _tmp0_; @@ -272,42 +272,39 @@ MultiTermTerminal * self = NULL; GtkVScrollbar* vsb = NULL; GtkHBox* hbox = NULL; - MultiTermShellConfig* _tmp0_; - MultiTermShellConfig* _tmp1_; - MultiTermShellConfig* _tmp2_; - gchar* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; + MultiTermShellConfig* _tmp0_ = NULL; + MultiTermShellConfig* _tmp1_ = NULL; + MultiTermShellConfig* _tmp2_ = NULL; + gchar* _tmp3_ = NULL; + gchar* _tmp4_ = NULL; + gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; - gchar* _tmp7_; - gboolean _tmp8_; - VteTerminal* _tmp10_; - VteTerminal* _tmp11_; - VteTerminal* _tmp12_; - VteTerminal* _tmp13_; - VteTerminal* _tmp14_; - GtkAdjustment* _tmp15_ = NULL; - GtkVScrollbar* _tmp16_; - GtkVScrollbar* _tmp17_; - GtkHBox* _tmp18_; - GtkHBox* _tmp19_; - GtkHBox* _tmp20_; - VteTerminal* _tmp21_; - GtkHBox* _tmp22_; - GtkVScrollbar* _tmp23_; - GtkHBox* _tmp24_; - MultiTermShellConfig* _tmp25_; - gboolean _tmp26_; - gboolean _tmp27_; - VteTerminal* _tmp29_; - MultiTermShellConfig* _tmp30_; - MultiTermConfig* _tmp31_; - MultiTermConfig* _tmp32_; - VteTerminal* _tmp39_; - MultiTermShellConfig* _tmp40_; - gchar* _tmp41_; - gchar* _tmp42_; - gchar* _tmp43_; + gchar* _tmp7_ = NULL; + gboolean _tmp8_ = FALSE; + VteTerminal* _tmp10_ = NULL; + VteTerminal* _tmp11_ = NULL; + VteTerminal* _tmp12_ = NULL; + VteTerminal* _tmp13_ = NULL; + GtkAdjustment* _tmp14_ = NULL; + GtkVScrollbar* _tmp15_ = NULL; + GtkHBox* _tmp16_ = NULL; + GtkHBox* _tmp17_ = NULL; + VteTerminal* _tmp18_ = NULL; + GtkHBox* _tmp19_ = NULL; + GtkVScrollbar* _tmp20_ = NULL; + GtkHBox* _tmp21_ = NULL; + MultiTermShellConfig* _tmp22_ = NULL; + gboolean _tmp23_ = FALSE; + gboolean _tmp24_ = FALSE; + VteTerminal* _tmp26_ = NULL; + MultiTermShellConfig* _tmp27_ = NULL; + MultiTermConfig* _tmp28_ = NULL; + MultiTermConfig* _tmp29_ = NULL; + VteTerminal* _tmp92_ = NULL; + MultiTermShellConfig* _tmp93_ = NULL; + gchar* _tmp94_ = NULL; + gchar* _tmp95_ = NULL; + gchar* _tmp96_ = NULL; g_return_val_if_fail (sh != NULL, NULL); self = (MultiTermTerminal*) g_object_new (object_type, NULL); _tmp0_ = sh; @@ -324,75 +321,210 @@ _g_free0 (_tmp7_); _g_free0 (_tmp5_); if (_tmp8_) { - MultiTermShellConfig* _tmp9_; + MultiTermShellConfig* _tmp9_ = NULL; _tmp9_ = self->priv->sh; multi_term_shell_config_set_command (_tmp9_, "sh"); } _tmp10_ = (VteTerminal*) vte_terminal_new (); - _tmp11_ = g_object_ref_sink (_tmp10_); + g_object_ref_sink (_tmp10_); _g_object_unref0 (self->terminal); - self->terminal = _tmp11_; + self->terminal = _tmp10_; + _tmp11_ = self->terminal; + gtk_widget_set_size_request ((GtkWidget*) _tmp11_, 100, 100); _tmp12_ = self->terminal; - gtk_widget_set_size_request ((GtkWidget*) _tmp12_, 100, 100); + gtk_widget_show_all ((GtkWidget*) _tmp12_); _tmp13_ = self->terminal; - gtk_widget_show_all ((GtkWidget*) _tmp13_); - _tmp14_ = self->terminal; - _tmp15_ = vte_terminal_get_adjustment (_tmp14_); - _tmp16_ = (GtkVScrollbar*) gtk_vscrollbar_new (_tmp15_); - _tmp17_ = g_object_ref_sink (_tmp16_); + _tmp14_ = vte_terminal_get_adjustment (_tmp13_); + _tmp15_ = (GtkVScrollbar*) gtk_vscrollbar_new (_tmp14_); + g_object_ref_sink (_tmp15_); _g_object_unref0 (vsb); - vsb = _tmp17_; - _tmp18_ = (GtkHBox*) gtk_hbox_new (FALSE, 0); - _tmp19_ = g_object_ref_sink (_tmp18_); + vsb = _tmp15_; + _tmp16_ = (GtkHBox*) gtk_hbox_new (FALSE, 0); + g_object_ref_sink (_tmp16_); _g_object_unref0 (hbox); - hbox = _tmp19_; - _tmp20_ = hbox; - _tmp21_ = self->terminal; - gtk_box_pack_start ((GtkBox*) _tmp20_, (GtkWidget*) _tmp21_, TRUE, TRUE, (guint) 0); - _tmp22_ = hbox; - _tmp23_ = vsb; - gtk_box_pack_start ((GtkBox*) _tmp22_, (GtkWidget*) _tmp23_, FALSE, FALSE, (guint) 0); - _tmp24_ = hbox; - gtk_container_add ((GtkContainer*) self, (GtkWidget*) _tmp24_); - _tmp25_ = self->priv->sh; - _tmp26_ = multi_term_shell_config_get_track_title (_tmp25_); - _tmp27_ = _tmp26_; - if (_tmp27_) { - VteTerminal* _tmp28_; - _tmp28_ = self->terminal; - g_signal_connect_object (_tmp28_, "window-title-changed", (GCallback) _multi_term_terminal_on_window_title_changed_vte_terminal_window_title_changed, self, 0); - } - _tmp29_ = self->terminal; - g_signal_connect_object (_tmp29_, "child-exited", (GCallback) _multi_term_terminal_on_child_exited_vte_terminal_child_exited, self, 0); - _tmp30_ = self->priv->sh; - _tmp31_ = multi_term_shell_config_get_cfg (_tmp30_); - _tmp32_ = _tmp31_; - if (_tmp32_ != NULL) { - VteTerminal* _tmp33_; - MultiTermShellConfig* _tmp34_; - gchar* _tmp35_; - gchar* _tmp36_; - gchar* _tmp37_; - _tmp33_ = self->terminal; - _tmp34_ = self->priv->sh; - _tmp35_ = multi_term_shell_config_get_font (_tmp34_); - _tmp36_ = _tmp35_; - _tmp37_ = _tmp36_; - vte_terminal_set_font_from_string (_tmp33_, _tmp37_); - _g_free0 (_tmp37_); + hbox = _tmp16_; + _tmp17_ = hbox; + _tmp18_ = self->terminal; + gtk_box_pack_start ((GtkBox*) _tmp17_, (GtkWidget*) _tmp18_, TRUE, TRUE, (guint) 0); + _tmp19_ = hbox; + _tmp20_ = vsb; + gtk_box_pack_start ((GtkBox*) _tmp19_, (GtkWidget*) _tmp20_, FALSE, FALSE, (guint) 0); + _tmp21_ = hbox; + gtk_container_add ((GtkContainer*) self, (GtkWidget*) _tmp21_); + _tmp22_ = self->priv->sh; + _tmp23_ = multi_term_shell_config_get_track_title (_tmp22_); + _tmp24_ = _tmp23_; + if (_tmp24_) { + VteTerminal* _tmp25_ = NULL; + _tmp25_ = self->terminal; + g_signal_connect_object (_tmp25_, "window-title-changed", (GCallback) _multi_term_terminal_on_window_title_changed_vte_terminal_window_title_changed, self, 0); + } + _tmp26_ = self->terminal; + g_signal_connect_object (_tmp26_, "child-exited", (GCallback) _multi_term_terminal_on_child_exited_vte_terminal_child_exited, self, 0); + _tmp27_ = self->priv->sh; + _tmp28_ = multi_term_shell_config_get_cfg (_tmp27_); + _tmp29_ = _tmp28_; + if (_tmp29_ != NULL) { + VteTerminal* _tmp30_ = NULL; + MultiTermShellConfig* _tmp31_ = NULL; + gchar* _tmp32_ = NULL; + gchar* _tmp33_ = NULL; + gchar* _tmp34_ = NULL; + VteTerminal* _tmp35_ = NULL; + MultiTermShellConfig* _tmp36_ = NULL; + gboolean _tmp37_ = FALSE; + gboolean _tmp38_ = FALSE; + VteTerminal* _tmp39_ = NULL; + MultiTermShellConfig* _tmp40_ = NULL; + gboolean _tmp41_ = FALSE; + gboolean _tmp42_ = FALSE; + VteTerminal* _tmp43_ = NULL; + MultiTermShellConfig* _tmp44_ = NULL; + VteTerminalCursorBlinkMode _tmp45_ = 0; + VteTerminalCursorBlinkMode _tmp46_ = 0; + VteTerminal* _tmp47_ = NULL; + MultiTermShellConfig* _tmp48_ = NULL; + VteTerminalCursorShape _tmp49_ = 0; + VteTerminalCursorShape _tmp50_ = 0; + VteTerminal* _tmp51_ = NULL; + MultiTermShellConfig* _tmp52_ = NULL; + VteTerminalEraseBinding _tmp53_ = 0; + VteTerminalEraseBinding _tmp54_ = 0; + VteTerminal* _tmp55_ = NULL; + MultiTermShellConfig* _tmp56_ = NULL; + gboolean _tmp57_ = FALSE; + gboolean _tmp58_ = FALSE; + VteTerminal* _tmp59_ = NULL; + MultiTermShellConfig* _tmp60_ = NULL; + gboolean _tmp61_ = FALSE; + gboolean _tmp62_ = FALSE; + VteTerminal* _tmp63_ = NULL; + MultiTermShellConfig* _tmp64_ = NULL; + gboolean _tmp65_ = FALSE; + gboolean _tmp66_ = FALSE; + VteTerminal* _tmp67_ = NULL; + MultiTermShellConfig* _tmp68_ = NULL; + gint _tmp69_ = 0; + gint _tmp70_ = 0; + VteTerminal* _tmp71_ = NULL; + MultiTermShellConfig* _tmp72_ = NULL; + gboolean _tmp73_ = FALSE; + gboolean _tmp74_ = FALSE; + VteTerminal* _tmp75_ = NULL; + MultiTermShellConfig* _tmp76_ = NULL; + gchar* _tmp77_ = NULL; + gchar* _tmp78_ = NULL; + gchar* _tmp79_ = NULL; + _tmp30_ = self->terminal; + _tmp31_ = self->priv->sh; + _tmp32_ = multi_term_shell_config_get_font (_tmp31_); + _tmp33_ = _tmp32_; + _tmp34_ = _tmp33_; + vte_terminal_set_font_from_string (_tmp30_, _tmp34_); + _g_free0 (_tmp34_); + _tmp35_ = self->terminal; + _tmp36_ = self->priv->sh; + _tmp37_ = multi_term_shell_config_get_allow_bold (_tmp36_); + _tmp38_ = _tmp37_; + vte_terminal_set_allow_bold (_tmp35_, _tmp38_); + _tmp39_ = self->terminal; + _tmp40_ = self->priv->sh; + _tmp41_ = multi_term_shell_config_get_audible_bell (_tmp40_); + _tmp42_ = _tmp41_; + vte_terminal_set_audible_bell (_tmp39_, _tmp42_); + _tmp43_ = self->terminal; + _tmp44_ = self->priv->sh; + _tmp45_ = multi_term_shell_config_get_cursor_blink_mode (_tmp44_); + _tmp46_ = _tmp45_; + vte_terminal_set_cursor_blink_mode (_tmp43_, _tmp46_); + _tmp47_ = self->terminal; + _tmp48_ = self->priv->sh; + _tmp49_ = multi_term_shell_config_get_cursor_shape (_tmp48_); + _tmp50_ = _tmp49_; + vte_terminal_set_cursor_shape (_tmp47_, _tmp50_); + _tmp51_ = self->terminal; + _tmp52_ = self->priv->sh; + _tmp53_ = multi_term_shell_config_get_backspace_binding (_tmp52_); + _tmp54_ = _tmp53_; + vte_terminal_set_backspace_binding (_tmp51_, _tmp54_); + _tmp55_ = self->terminal; + _tmp56_ = self->priv->sh; + _tmp57_ = multi_term_shell_config_get_pointer_autohide (_tmp56_); + _tmp58_ = _tmp57_; + vte_terminal_set_mouse_autohide (_tmp55_, _tmp58_); + _tmp59_ = self->terminal; + _tmp60_ = self->priv->sh; + _tmp61_ = multi_term_shell_config_get_scroll_on_keystroke (_tmp60_); + _tmp62_ = _tmp61_; + vte_terminal_set_scroll_on_keystroke (_tmp59_, _tmp62_); + _tmp63_ = self->terminal; + _tmp64_ = self->priv->sh; + _tmp65_ = multi_term_shell_config_get_scroll_on_output (_tmp64_); + _tmp66_ = _tmp65_; + vte_terminal_set_scroll_on_output (_tmp63_, _tmp66_); + _tmp67_ = self->terminal; + _tmp68_ = self->priv->sh; + _tmp69_ = multi_term_shell_config_get_scrollback_lines (_tmp68_); + _tmp70_ = _tmp69_; + vte_terminal_set_scrollback_lines (_tmp67_, (glong) _tmp70_); + _tmp71_ = self->terminal; + _tmp72_ = self->priv->sh; + _tmp73_ = multi_term_shell_config_get_visible_bell (_tmp72_); + _tmp74_ = _tmp73_; + vte_terminal_set_visible_bell (_tmp71_, _tmp74_); + _tmp75_ = self->terminal; + _tmp76_ = self->priv->sh; + _tmp77_ = multi_term_shell_config_get_word_chars (_tmp76_); + _tmp78_ = _tmp77_; + _tmp79_ = _tmp78_; + vte_terminal_set_word_chars (_tmp75_, _tmp79_); + _g_free0 (_tmp79_); } else { - VteTerminal* _tmp38_; - _tmp38_ = self->terminal; - vte_terminal_set_font_from_string (_tmp38_, "Monospace 9"); - } - _tmp39_ = self->terminal; - g_signal_connect_object ((GtkWidget*) _tmp39_, "realize", (GCallback) _multi_term_terminal_on_vte_realize_gtk_widget_realize, self, 0); - _tmp40_ = self->priv->sh; - _tmp41_ = multi_term_shell_config_get_command (_tmp40_); - _tmp42_ = _tmp41_; - _tmp43_ = _tmp42_; - multi_term_terminal_run_command (self, _tmp43_); - _g_free0 (_tmp43_); + VteTerminal* _tmp80_ = NULL; + VteTerminal* _tmp81_ = NULL; + VteTerminal* _tmp82_ = NULL; + VteTerminal* _tmp83_ = NULL; + VteTerminal* _tmp84_ = NULL; + VteTerminal* _tmp85_ = NULL; + VteTerminal* _tmp86_ = NULL; + VteTerminal* _tmp87_ = NULL; + VteTerminal* _tmp88_ = NULL; + VteTerminal* _tmp89_ = NULL; + VteTerminal* _tmp90_ = NULL; + VteTerminal* _tmp91_ = NULL; + _tmp80_ = self->terminal; + vte_terminal_set_font_from_string (_tmp80_, "Monospace 9"); + _tmp81_ = self->terminal; + vte_terminal_set_allow_bold (_tmp81_, TRUE); + _tmp82_ = self->terminal; + vte_terminal_set_audible_bell (_tmp82_, TRUE); + _tmp83_ = self->terminal; + vte_terminal_set_cursor_blink_mode (_tmp83_, VTE_CURSOR_BLINK_SYSTEM); + _tmp84_ = self->terminal; + vte_terminal_set_cursor_shape (_tmp84_, VTE_CURSOR_SHAPE_BLOCK); + _tmp85_ = self->terminal; + vte_terminal_set_backspace_binding (_tmp85_, VTE_ERASE_AUTO); + _tmp86_ = self->terminal; + vte_terminal_set_mouse_autohide (_tmp86_, FALSE); + _tmp87_ = self->terminal; + vte_terminal_set_scroll_on_keystroke (_tmp87_, TRUE); + _tmp88_ = self->terminal; + vte_terminal_set_scroll_on_output (_tmp88_, FALSE); + _tmp89_ = self->terminal; + vte_terminal_set_scrollback_lines (_tmp89_, (glong) 512); + _tmp90_ = self->terminal; + vte_terminal_set_visible_bell (_tmp90_, FALSE); + _tmp91_ = self->terminal; + vte_terminal_set_word_chars (_tmp91_, ""); + } + _tmp92_ = self->terminal; + g_signal_connect_object ((GtkWidget*) _tmp92_, "realize", (GCallback) _multi_term_terminal_on_vte_realize_gtk_widget_realize, self, 0); + _tmp93_ = self->priv->sh; + _tmp94_ = multi_term_shell_config_get_command (_tmp93_); + _tmp95_ = _tmp94_; + _tmp96_ = _tmp95_; + multi_term_terminal_run_command (self, _tmp96_); + _g_free0 (_tmp96_); _g_object_unref0 (hbox); _g_object_unref0 (vsb); return self; @@ -411,11 +543,11 @@ const gchar* multi_term_terminal_get_tab_label_text (MultiTermTerminal* self) { const gchar* result; + MultiTermTabLabel* label = NULL; gconstpointer _tmp0_ = NULL; - MultiTermTabLabel* _tmp1_; - MultiTermTabLabel* label; - const gchar* _tmp2_; - const gchar* _tmp3_; + MultiTermTabLabel* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = g_object_get_data ((GObject*) self, "label"); _tmp1_ = _g_object_ref0 ((MultiTermTabLabel*) _tmp0_); @@ -429,10 +561,10 @@ void multi_term_terminal_set_tab_label_text (MultiTermTerminal* self, const gchar* value) { + MultiTermTabLabel* label = NULL; gconstpointer _tmp0_ = NULL; - MultiTermTabLabel* _tmp1_; - MultiTermTabLabel* label; - const gchar* _tmp2_; + MultiTermTabLabel* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = g_object_get_data ((GObject*) self, "label"); _tmp1_ = _g_object_ref0 ((MultiTermTabLabel*) _tmp0_); @@ -447,11 +579,11 @@ void multi_term_terminal_set_background_color (MultiTermTerminal* self, const gchar* value) { GdkColor color = {0}; GdkColormap* _tmp0_ = NULL; - GdkColor _tmp1_; - const gchar* _tmp2_; + GdkColor _tmp1_ = {0}; + const gchar* _tmp2_ = NULL; GdkColor _tmp3_ = {0}; - VteTerminal* _tmp4_; - GdkColor _tmp5_; + VteTerminal* _tmp4_ = NULL; + GdkColor _tmp5_ = {0}; g_return_if_fail (self != NULL); memset (&color, 0, sizeof (GdkColor)); _tmp0_ = gdk_colormap_get_system (); @@ -470,11 +602,11 @@ void multi_term_terminal_set_foreground_color (MultiTermTerminal* self, const gchar* value) { GdkColor color = {0}; GdkColormap* _tmp0_ = NULL; - GdkColor _tmp1_; - const gchar* _tmp2_; + GdkColor _tmp1_ = {0}; + const gchar* _tmp2_ = NULL; GdkColor _tmp3_ = {0}; - VteTerminal* _tmp4_; - GdkColor _tmp5_; + VteTerminal* _tmp4_ = NULL; + GdkColor _tmp5_ = {0}; g_return_if_fail (self != NULL); memset (&color, 0, sizeof (GdkColor)); _tmp0_ = gdk_colormap_get_system (); @@ -533,7 +665,7 @@ static void multi_term_terminal_finalize (GObject* obj) { MultiTermTerminal * self; - self = MULTI_TERM_TERMINAL (obj); + self = G_TYPE_CHECK_INSTANCE_CAST (obj, MULTI_TERM_TYPE_TERMINAL, MultiTermTerminal); _g_object_unref0 (self->terminal); _multi_term_shell_config_unref0 (self->priv->sh); G_OBJECT_CLASS (multi_term_terminal_parent_class)->finalize (obj); @@ -554,7 +686,7 @@ static void _vala_multi_term_terminal_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { MultiTermTerminal * self; - self = MULTI_TERM_TERMINAL (object); + self = G_TYPE_CHECK_INSTANCE_CAST (object, MULTI_TERM_TYPE_TERMINAL, MultiTermTerminal); switch (property_id) { case MULTI_TERM_TERMINAL_TAB_LABEL_TEXT: g_value_set_string (value, multi_term_terminal_get_tab_label_text (self)); @@ -568,7 +700,7 @@ static void _vala_multi_term_terminal_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { MultiTermTerminal * self; - self = MULTI_TERM_TERMINAL (object); + self = G_TYPE_CHECK_INSTANCE_CAST (object, MULTI_TERM_TYPE_TERMINAL, MultiTermTerminal); switch (property_id) { case MULTI_TERM_TERMINAL_TAB_LABEL_TEXT: multi_term_terminal_set_tab_label_text (self, g_value_get_string (value)); diff -Nru geany-plugins-1.23+dfsg/multiterm/src/terminal.vala geany-plugins-1.24+dfsg/multiterm/src/terminal.vala --- geany-plugins-1.23+dfsg/multiterm/src/terminal.vala 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/multiterm/src/terminal.vala 2013-06-30 11:40:06.000000000 +0000 @@ -130,7 +130,7 @@ HBox hbox; this.sh = sh; - if (this.sh.command.strip() == "") + if (this.sh.command.strip() == "") this.sh.command = "sh"; terminal = new Vte.Terminal(); @@ -151,9 +151,35 @@ terminal.child_exited.connect(on_child_exited); if (this.sh.cfg != null) + { terminal.set_font_from_string(this.sh.font); + terminal.set_allow_bold(this.sh.allow_bold); + terminal.set_audible_bell(this.sh.audible_bell); + terminal.set_cursor_blink_mode(this.sh.cursor_blink_mode); + terminal.set_cursor_shape(this.sh.cursor_shape); + terminal.set_backspace_binding(this.sh.backspace_binding); + terminal.set_mouse_autohide(this.sh.pointer_autohide); + terminal.set_scroll_on_keystroke(this.sh.scroll_on_keystroke); + terminal.set_scroll_on_output(this.sh.scroll_on_output); + terminal.set_scrollback_lines(this.sh.scrollback_lines); + terminal.set_visible_bell(this.sh.visible_bell); + terminal.set_word_chars(this.sh.word_chars); + } else + { terminal.set_font_from_string("Monospace 9"); + terminal.set_allow_bold(true); + terminal.set_audible_bell(true); + terminal.set_cursor_blink_mode(TerminalCursorBlinkMode.SYSTEM); + terminal.set_cursor_shape(TerminalCursorShape.BLOCK); + terminal.set_backspace_binding(TerminalEraseBinding.AUTO); + terminal.set_mouse_autohide(false); + terminal.set_scroll_on_keystroke(true); + terminal.set_scroll_on_output(false); + terminal.set_scrollback_lines(512); + terminal.set_visible_bell(false); + terminal.set_word_chars(""); + } terminal.realize.connect(on_vte_realize); /* colors can only be set on realize (lame) */ run_command(this.sh.command); diff -Nru geany-plugins-1.23+dfsg/NEWS geany-plugins-1.24+dfsg/NEWS --- geany-plugins-1.23+dfsg/NEWS 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/NEWS 2014-04-13 16:42:54.000000000 +0000 @@ -1,3 +1,112 @@ +Geany Plugins 1.24 (2014-04-13) + + Known issues + * If the Geanypy plugin is closed when any Python plugins are still + running it may cause a crash. + * Closing Geany having GeanyLaTeX and Devhelp-plugin active, might + cause a not clean shutdown of Geany + + General: + * Depend on Geany 1.24 + * New plugin Pohelper + * New plugin PairTagHighlighter + * New plugin Autoclose + * New plugin Geanypy (Python bindings) + * New plugin Defineformat + * Build system improvements + + Commander: + * Add Gtk3 support + + Debugger: + * Fixing a crash when re-loading plugin + + GeanyGenDoc: + * Add Gtk3 support + * Fix a memory leak + + GeanyExtraSel: + * Add "Toggle Rectangular/Stream" + + GeanyInsertNum: + * Add Gtk3 support + * Increase maxlines to 250000 + + GeanyLipsum: + * Add Gtk3 support + * Ensure whitespace between repetitions of Lorem Ipsum text + + GeanyLua: + * Add Gtk3 support + * Re-enable build with C89 + + GeanyMiniScript: + * Add Gtk3 support + + GeanyPG: + * Improve portability and check for system requirements + + GeanyVC: + * Add support for Subversion 1.7 + * Limit the display of diff output to 16 KB to not freeze the UI on + huge commit-diffs + * Show line and column of the cursor in the commit + message text window + + GProject: + * Add Gtk3 support + * Display content-type-specific icons for files in the sidebar + * Make toolbar buttons insensitive when no files displayed + * Smaller fixes and improvements + + Markdown: + * Add Gtk3 support + * Fix scroll jumping behavior + + Multiterm: + * Implement the other config VTE properties + + Prettyprinter: + * Add Gtk3 support + + Scope: + * Add Gtk3 support + * Add support for registers + * Various fixes and improvements + + Shiftcolumn: + * Removed default keybindings + + Spellcheck: + * Add Gtk3 support + * Fix check for default language if LANG contains UTF-8 + * Remove check while typing idle callback when unloading the plugin + (closing #96) + * Improve stripping of whitespace and punctuation characters + (fixes #98) + * Fix crash when closing a document quickly after modifying it + + Tableconvert: + * Add support for HTML tables in markdown files + + TreeBrowser: + * Add Gtk3 support + * Don't collapse expanded child of node when node gets selected + * Add and improve some keybindings + * Add a way to open newly created files + * Focus editor on file open + + Updatechecker: + * Fix comparing major versions + + WebHelper: + * Add Gtk3 support + + Internationalization: + * Update translations: de, es, fr, nl, ru, tr + * New translations: it + + Geany Plugins 1.23 (2013-03-10) * Depend on Geany 1.23 diff -Nru geany-plugins-1.23+dfsg/pairtaghighlighter/AUTHORS geany-plugins-1.24+dfsg/pairtaghighlighter/AUTHORS --- geany-plugins-1.23+dfsg/pairtaghighlighter/AUTHORS 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pairtaghighlighter/AUTHORS 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1 @@ +Volodymyr Kononenko diff -Nru geany-plugins-1.23+dfsg/pairtaghighlighter/ChangeLog geany-plugins-1.24+dfsg/pairtaghighlighter/ChangeLog --- geany-plugins-1.23+dfsg/pairtaghighlighter/ChangeLog 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pairtaghighlighter/ChangeLog 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,12 @@ +Changes in v1.1 Nov 19, 2013 + + * Add HTML empty tags support according to HTML5 standard. + * Add red and yellow colors to define if pair is found or tag is + empty. + * Enable XML support. + * Improved brackets search by ignoring php tags () and + object operators (->). Thanks Peter Donin for bugreport! + +Changes in v1.0 Apr 5, 2013 + + * The first public version. diff -Nru geany-plugins-1.23+dfsg/pairtaghighlighter/COPYING geany-plugins-1.24+dfsg/pairtaghighlighter/COPYING --- geany-plugins-1.23+dfsg/pairtaghighlighter/COPYING 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pairtaghighlighter/COPYING 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,25 @@ +Copyright (c) 2013, Volodymyr Kononenko +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + - Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -Nru geany-plugins-1.23+dfsg/pairtaghighlighter/Makefile.am geany-plugins-1.24+dfsg/pairtaghighlighter/Makefile.am --- geany-plugins-1.23+dfsg/pairtaghighlighter/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pairtaghighlighter/Makefile.am 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,4 @@ +include $(top_srcdir)/build/vars.auxfiles.mk + +SUBDIRS = src +plugin = pairtaghighlighter diff -Nru geany-plugins-1.23+dfsg/pairtaghighlighter/Makefile.in geany-plugins-1.24+dfsg/pairtaghighlighter/Makefile.in --- geany-plugins-1.23+dfsg/pairtaghighlighter/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pairtaghighlighter/Makefile.in 2014-04-13 17:12:45.000000000 +0000 @@ -0,0 +1,825 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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 \ + *\\[\ \ ]*) \ + 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; \ + 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@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog NEWS README +subdir = pairtaghighlighter +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ + $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ + $(top_srcdir)/build/cppcheck.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ + $(top_srcdir)/build/geanydoc.m4 \ + $(top_srcdir)/build/geanyextrasel.m4 \ + $(top_srcdir)/build/geanygendoc.m4 \ + $(top_srcdir)/build/geanyinsertnum.m4 \ + $(top_srcdir)/build/geanylatex.m4 \ + $(top_srcdir)/build/geanylipsum.m4 \ + $(top_srcdir)/build/geanylua.m4 \ + $(top_srcdir)/build/geanymacro.m4 \ + $(top_srcdir)/build/geanyminiscript.m4 \ + $(top_srcdir)/build/geanynumberedbookmarks.m4 \ + $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ + $(top_srcdir)/build/geanysendmail.m4 \ + $(top_srcdir)/build/geanyvc.m4 \ + $(top_srcdir)/build/geniuspaste.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ + $(top_srcdir)/build/pretty-printer.m4 \ + $(top_srcdir)/build/scope.m4 \ + $(top_srcdir)/build/shiftcolumn.m4 \ + $(top_srcdir)/build/spellcheck.m4 \ + $(top_srcdir)/build/status.m4 \ + $(top_srcdir)/build/tableconvert.m4 \ + $(top_srcdir)/build/treebrowser.m4 \ + $(top_srcdir)/build/unittests.m4 \ + $(top_srcdir)/build/updatechecker.m4 \ + $(top_srcdir)/build/webhelper.m4 \ + $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ + $(top_srcdir)/build/cache/glib-gettext.m4 \ + $(top_srcdir)/build/cache/intltool.m4 \ + $(top_srcdir)/build/cache/libtool.m4 \ + $(top_srcdir)/build/cache/ltoptions.m4 \ + $(top_srcdir)/build/cache/ltsugar.m4 \ + $(top_srcdir)/build/cache/ltversion.m4 \ + $(top_srcdir)/build/cache/lt~obsolete.m4 \ + $(top_srcdir)/build/cache/nls.m4 \ + $(top_srcdir)/build/cache/pkg.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +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_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 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__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__installdirs = "$(DESTDIR)$(plugindocdir)" +DATA = $(dist_plugindoc_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +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) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ +COMMANDER_CFLAGS = @COMMANDER_CFLAGS@ +COMMANDER_LIBS = @COMMANDER_LIBS@ +CPP = @CPP@ +CPPCHECK = @CPPCHECK@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ +DEVHELP_LIBS = @DEVHELP_LIBS@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENCHANT_CFLAGS = @ENCHANT_CFLAGS@ +ENCHANT_LIBS = @ENCHANT_LIBS@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GEANYGENDOC_CFLAGS = @GEANYGENDOC_CFLAGS@ +GEANYGENDOC_LIBS = @GEANYGENDOC_LIBS@ +GEANY_CFLAGS = @GEANY_CFLAGS@ +GEANY_LIBS = @GEANY_LIBS@ +GEANY_VERSION = @GEANY_VERSION@ +GENIUSPASTE_CFLAGS = @GENIUSPASTE_CFLAGS@ +GENIUSPASTE_LIBS = @GENIUSPASTE_LIBS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GPGME_CFLAGS = @GPGME_CFLAGS@ +GPGME_CONFIG = @GPGME_CONFIG@ +GPGME_LIBS = @GPGME_LIBS@ +GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ +GREP = @GREP@ +GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ +GTKSPELL_LIBS = @GTKSPELL_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBMARKDOWN_CFLAGS = @LIBMARKDOWN_CFLAGS@ +LIBMARKDOWN_LIBS = @LIBMARKDOWN_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCALEDIR = @LOCALEDIR@ +LTLIBOBJS = @LTLIBOBJS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_LIBS = @LUA_LIBS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MARKDOWN_CFLAGS = @MARKDOWN_CFLAGS@ +MARKDOWN_LIBS = @MARKDOWN_LIBS@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +MULTITERM_CFLAGS = @MULTITERM_CFLAGS@ +MULTITERM_LIBS = @MULTITERM_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +RST2HTML = @RST2HTML@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +UPDATECHECKER_CFLAGS = @UPDATECHECKER_CFLAGS@ +UPDATECHECKER_LIBS = @UPDATECHECKER_LIBS@ +USE_NLS = @USE_NLS@ +VALAC = @VALAC@ +VERSION = @VERSION@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ +WEBHELPER_CFLAGS = @WEBHELPER_CFLAGS@ +WEBHELPER_LIBS = @WEBHELPER_LIBS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +geanypluginsdir = @geanypluginsdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugindocdir = $(docdir)/$(plugin) +htmldocdir = $(plugindocdir) +plugindatadir = $(pkgdatadir)/$(plugin) +pluginlibdir = $(pkglibdir)/$(plugin) +examplesdir = $(plugindatadir) +dist_plugindoc_DATA = \ + README \ + ChangeLog \ + NEWS \ + COPYING \ + AUTHORS \ + $(AUXFILES) + +EXTRA_DIST = \ + wscript_build \ + wscript_configure + +SUBDIRS = src +plugin = pairtaghighlighter +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/vars.auxfiles.mk $(top_srcdir)/build/vars.docs.mk $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pairtaghighlighter/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign pairtaghighlighter/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + 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/vars.auxfiles.mk $(top_srcdir)/build/vars.docs.mk: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-dist_plugindocDATA: $(dist_plugindoc_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_plugindoc_DATA)'; test -n "$(plugindocdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindocdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindocdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindocdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindocdir)" || exit $$?; \ + done + +uninstall-dist_plugindocDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_plugindoc_DATA)'; test -n "$(plugindocdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(plugindocdir)'; $(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. +$(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//`; \ + 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; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +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 + +GTAGS: + 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 + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile $(DATA) +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(plugindocdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: install-dist_plugindocDATA + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-dist_plugindocDATA + +.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-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-dist_plugindocDATA 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 \ + uninstall-dist_plugindocDATA + + +# 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. +.NOEXPORT: diff -Nru geany-plugins-1.23+dfsg/pairtaghighlighter/README geany-plugins-1.24+dfsg/pairtaghighlighter/README --- geany-plugins-1.23+dfsg/pairtaghighlighter/README 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pairtaghighlighter/README 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,28 @@ +Pair Tag Highlighter +==================== + +About +----- + +Finds and highlights matching opening/closing HTML tag by clicking or +moving cursor inside a tag. + +Usage +----- + +Just enable plugin through Geany's plugin manager. + +Licence +------- + +This plugin is distributed under the terms of the BSD 2-Clause License. +You should have received a copy of the the BSD 2-Clause License in the +file COPYING included with the source code of this plugin. If not, find +it at . + +Contact developer +----------------- + +You may contact developer (Volodymyr Kononenko) via e-mail: +. The complete up to date list of contacts +can be found at . diff -Nru geany-plugins-1.23+dfsg/pairtaghighlighter/src/Makefile.am geany-plugins-1.24+dfsg/pairtaghighlighter/src/Makefile.am --- geany-plugins-1.23+dfsg/pairtaghighlighter/src/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pairtaghighlighter/src/Makefile.am 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,9 @@ +include $(top_srcdir)/build/vars.build.mk + +geanyplugins_LTLIBRARIES = pairtaghighlighter.la + +pairtaghighlighter_la_SOURCES = pair_tag_highlighter.c + +pairtaghighlighter_la_LIBADD = $(COMMONLIBS) + +include $(top_srcdir)/build/cppcheck.mk diff -Nru geany-plugins-1.23+dfsg/pairtaghighlighter/src/Makefile.in geany-plugins-1.24+dfsg/pairtaghighlighter/src/Makefile.in --- geany-plugins-1.23+dfsg/pairtaghighlighter/src/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pairtaghighlighter/src/Makefile.in 2014-04-13 17:12:45.000000000 +0000 @@ -0,0 +1,802 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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 \ + *\\[\ \ ]*) \ + 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; \ + 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@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp +subdir = pairtaghighlighter/src +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ + $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ + $(top_srcdir)/build/cppcheck.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ + $(top_srcdir)/build/geanydoc.m4 \ + $(top_srcdir)/build/geanyextrasel.m4 \ + $(top_srcdir)/build/geanygendoc.m4 \ + $(top_srcdir)/build/geanyinsertnum.m4 \ + $(top_srcdir)/build/geanylatex.m4 \ + $(top_srcdir)/build/geanylipsum.m4 \ + $(top_srcdir)/build/geanylua.m4 \ + $(top_srcdir)/build/geanymacro.m4 \ + $(top_srcdir)/build/geanyminiscript.m4 \ + $(top_srcdir)/build/geanynumberedbookmarks.m4 \ + $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ + $(top_srcdir)/build/geanysendmail.m4 \ + $(top_srcdir)/build/geanyvc.m4 \ + $(top_srcdir)/build/geniuspaste.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ + $(top_srcdir)/build/pretty-printer.m4 \ + $(top_srcdir)/build/scope.m4 \ + $(top_srcdir)/build/shiftcolumn.m4 \ + $(top_srcdir)/build/spellcheck.m4 \ + $(top_srcdir)/build/status.m4 \ + $(top_srcdir)/build/tableconvert.m4 \ + $(top_srcdir)/build/treebrowser.m4 \ + $(top_srcdir)/build/unittests.m4 \ + $(top_srcdir)/build/updatechecker.m4 \ + $(top_srcdir)/build/webhelper.m4 \ + $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ + $(top_srcdir)/build/cache/glib-gettext.m4 \ + $(top_srcdir)/build/cache/intltool.m4 \ + $(top_srcdir)/build/cache/libtool.m4 \ + $(top_srcdir)/build/cache/ltoptions.m4 \ + $(top_srcdir)/build/cache/ltsugar.m4 \ + $(top_srcdir)/build/cache/ltversion.m4 \ + $(top_srcdir)/build/cache/lt~obsolete.m4 \ + $(top_srcdir)/build/cache/nls.m4 \ + $(top_srcdir)/build/cache/pkg.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +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__installdirs = "$(DESTDIR)$(geanypluginsdir)" +LTLIBRARIES = $(geanyplugins_LTLIBRARIES) +am__DEPENDENCIES_1 = +am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +pairtaghighlighter_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_pairtaghighlighter_la_OBJECTS = pair_tag_highlighter.lo +pairtaghighlighter_la_OBJECTS = $(am_pairtaghighlighter_la_OBJECTS) +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 +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +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_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_CCLD_1 = +SOURCES = $(pairtaghighlighter_la_SOURCES) +DIST_SOURCES = $(pairtaghighlighter_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + 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 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ +COMMANDER_CFLAGS = @COMMANDER_CFLAGS@ +COMMANDER_LIBS = @COMMANDER_LIBS@ +CPP = @CPP@ +CPPCHECK = @CPPCHECK@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ +DEVHELP_LIBS = @DEVHELP_LIBS@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENCHANT_CFLAGS = @ENCHANT_CFLAGS@ +ENCHANT_LIBS = @ENCHANT_LIBS@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GEANYGENDOC_CFLAGS = @GEANYGENDOC_CFLAGS@ +GEANYGENDOC_LIBS = @GEANYGENDOC_LIBS@ +GEANY_CFLAGS = @GEANY_CFLAGS@ +GEANY_LIBS = @GEANY_LIBS@ +GEANY_VERSION = @GEANY_VERSION@ +GENIUSPASTE_CFLAGS = @GENIUSPASTE_CFLAGS@ +GENIUSPASTE_LIBS = @GENIUSPASTE_LIBS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GPGME_CFLAGS = @GPGME_CFLAGS@ +GPGME_CONFIG = @GPGME_CONFIG@ +GPGME_LIBS = @GPGME_LIBS@ +GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ +GREP = @GREP@ +GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ +GTKSPELL_LIBS = @GTKSPELL_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBMARKDOWN_CFLAGS = @LIBMARKDOWN_CFLAGS@ +LIBMARKDOWN_LIBS = @LIBMARKDOWN_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCALEDIR = @LOCALEDIR@ +LTLIBOBJS = @LTLIBOBJS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_LIBS = @LUA_LIBS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MARKDOWN_CFLAGS = @MARKDOWN_CFLAGS@ +MARKDOWN_LIBS = @MARKDOWN_LIBS@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +MULTITERM_CFLAGS = @MULTITERM_CFLAGS@ +MULTITERM_LIBS = @MULTITERM_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +RST2HTML = @RST2HTML@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +UPDATECHECKER_CFLAGS = @UPDATECHECKER_CFLAGS@ +UPDATECHECKER_LIBS = @UPDATECHECKER_LIBS@ +USE_NLS = @USE_NLS@ +VALAC = @VALAC@ +VERSION = @VERSION@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ +WEBHELPER_CFLAGS = @WEBHELPER_CFLAGS@ +WEBHELPER_LIBS = @WEBHELPER_LIBS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +geanypluginsdir = @geanypluginsdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AM_CFLAGS = \ + -DLOCALEDIR=\""$(LOCALEDIR)"\" \ + -DPREFIX=\""$(prefix)"\" \ + -DDOCDIR=\""$(docdir)"\" \ + -DGEANYPLUGINS_DATADIR=\""$(datadir)"\" \ + -DPKGDATADIR=\""$(pkgdatadir)"\" \ + -DLIBDIR=\""$(libdir)"\" \ + -DPKGLIBDIR=\""$(pkglibdir)"\" \ + $(GEANY_CFLAGS) \ + $(GP_CFLAGS) + +AM_LDFLAGS = -module -avoid-version +COMMONLIBS = \ + $(GEANY_LIBS) \ + $(INTLLIBS) + +geanyplugins_LTLIBRARIES = pairtaghighlighter.la +pairtaghighlighter_la_SOURCES = pair_tag_highlighter.c +pairtaghighlighter_la_LIBADD = $(COMMONLIBS) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/vars.build.mk $(top_srcdir)/build/cppcheck.mk $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pairtaghighlighter/src/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign pairtaghighlighter/src/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + 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/vars.build.mk $(top_srcdir)/build/cppcheck.mk: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(geanypluginsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(geanypluginsdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(geanypluginsdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(geanypluginsdir)"; \ + } + +uninstall-geanypluginsLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(geanypluginsdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(geanypluginsdir)/$$f"; \ + done + +clean-geanypluginsLTLIBRARIES: + -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) + @list='$(geanyplugins_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}; \ + } + +pairtaghighlighter.la: $(pairtaghighlighter_la_OBJECTS) $(pairtaghighlighter_la_DEPENDENCIES) $(EXTRA_pairtaghighlighter_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) -rpath $(geanypluginsdir) $(pairtaghighlighter_la_OBJECTS) $(pairtaghighlighter_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pair_tag_highlighter.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@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 -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 -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +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 + +GTAGS: + 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 + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@HAVE_CPPCHECK_FALSE@check-local: +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(geanypluginsdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-geanypluginsLTLIBRARIES clean-generic clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-geanypluginsLTLIBRARIES + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-geanypluginsLTLIBRARIES + +.MAKE: check-am install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ + clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES + + +@HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) + +@HAVE_CPPCHECK_TRUE@check-local: check-cppcheck + +# 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. +.NOEXPORT: diff -Nru geany-plugins-1.23+dfsg/pairtaghighlighter/src/pair_tag_highlighter.c geany-plugins-1.24+dfsg/pairtaghighlighter/src/pair_tag_highlighter.c --- geany-plugins-1.23+dfsg/pairtaghighlighter/src/pair_tag_highlighter.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pairtaghighlighter/src/pair_tag_highlighter.c 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,418 @@ +/* + * Pair Tag Highlighter + * + * highlights matching opening/closing HTML tags + * + * Author: Volodymyr Kononenko aka kvm + * Email: vm@kononenko.ws + * + */ + +#include "config.h" +#include +#include +#include "Scintilla.h" /* for the SCNotification struct */ +#include "SciLexer.h" + +#define INDICATOR_TAGMATCH 9 +#define MAX_TAG_NAME 64 + +#define MATCHING_PAIR_COLOR 0x00ff00 /* green */ +#define NONMATCHING_PAIR_COLOR 0xff0000 /* red */ +#define EMPTY_TAG_COLOR 0xffff00 /* yellow */ + +/* These items are set by Geany before plugin_init() is called. */ +GeanyPlugin *geany_plugin; +GeanyData *geany_data; +GeanyFunctions *geany_functions; + +/* Is needed for clearing highlighting after moving cursor out + * from the tag */ +static gint highlightedBrackets[] = {0, 0, 0, 0}; + +PLUGIN_VERSION_CHECK(211) + +PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, _("Pair Tag Highlighter"), + _("Finds and highlights matching opening/closing HTML tag"), + "1.1", "Volodymyr Kononenko ") + + +/* Searches tag brackets. + * direction variable shows sets search direction: + * TRUE - to the right + * FALSE - to the left + * from the current cursor position to the start of the line. + */ +static gint findBracket(ScintillaObject *sci, gint position, gint endOfSearchPos, + gchar searchedBracket, gchar breakBracket, gboolean direction) +{ + gint foundBracket = -1; + gint pos; + + if(TRUE == direction) + { + /* search to the right */ + for(pos=position; pos<=endOfSearchPos; pos++) + { + gchar charAtCurPosition = sci_get_char_at(sci, pos); + gchar charAtPrevPosition = sci_get_char_at(sci, pos-1); + gchar charAtNextPosition = sci_get_char_at(sci, pos+1); + + if(charAtCurPosition == searchedBracket) { + if ('>' == searchedBracket) { + if (('-' == charAtPrevPosition) || ('?' == charAtPrevPosition)) + continue; + } else if ('<' == searchedBracket) { + if ('?' == charAtNextPosition) + continue; + } + foundBracket = pos; + break; + } else if(charAtCurPosition == breakBracket) { + if ('<' == breakBracket) { + if ('?' == charAtNextPosition) + continue; + } + break; + } + } + } + else + { + /* search to the left */ + for(pos=position-1; pos>=endOfSearchPos; pos--) + { + gchar charAtCurPosition = sci_get_char_at(sci, pos); + gchar charAtPrevPosition = sci_get_char_at(sci, pos+1); + gchar charAtNextPosition = sci_get_char_at(sci, pos-1); + + if(charAtCurPosition == searchedBracket) + { + if ('<' == searchedBracket) { + if ('?' == charAtPrevPosition) + continue; + } else if ('>' == searchedBracket) { + if (('-' == charAtNextPosition) || ('?' == charAtNextPosition)) + continue; + } + foundBracket = pos; + break; + } else if(charAtCurPosition == breakBracket) { + if ('>' == breakBracket) { + if (('-' == charAtNextPosition) || ('?' == charAtNextPosition)) + continue; + } + break; + } + } + } + + return foundBracket; +} + + +static gint rgb2bgr(gint color) +{ + guint r, g, b; + + r = color >> 16; + g = (0x00ff00 & color) >> 8; + b = (0x0000ff & color); + + color = (r | (g << 8) | (b << 16)); + + return color; +} + + +static void highlight_tag(ScintillaObject *sci, gint openingBracket, + gint closingBracket, gint color) +{ + scintilla_send_message(sci, SCI_SETINDICATORCURRENT, INDICATOR_TAGMATCH, 0); + scintilla_send_message(sci, SCI_INDICSETSTYLE, + INDICATOR_TAGMATCH, INDIC_ROUNDBOX); + scintilla_send_message(sci, SCI_INDICSETFORE, INDICATOR_TAGMATCH, rgb2bgr(color)); + scintilla_send_message(sci, SCI_INDICSETALPHA, INDICATOR_TAGMATCH, 60); + scintilla_send_message(sci, SCI_INDICATORFILLRANGE, + openingBracket, closingBracket-openingBracket+1); +} + + +static void highlight_matching_pair(ScintillaObject *sci) +{ + highlight_tag(sci, highlightedBrackets[0], highlightedBrackets[1], + MATCHING_PAIR_COLOR); + highlight_tag(sci, highlightedBrackets[2], highlightedBrackets[3], + MATCHING_PAIR_COLOR); +} + + +static void clear_previous_highlighting(ScintillaObject *sci, gint rangeStart, gint rangeEnd) +{ + scintilla_send_message(sci, SCI_SETINDICATORCURRENT, INDICATOR_TAGMATCH, 0); + scintilla_send_message(sci, SCI_INDICATORCLEARRANGE, rangeStart, rangeEnd+1); +} + + +static gboolean is_tag_self_closing(ScintillaObject *sci, gint closingBracket) +{ + gboolean isTagSelfClosing = FALSE; + gchar charBeforeBracket = sci_get_char_at(sci, closingBracket-1); + + if('/' == charBeforeBracket) + isTagSelfClosing = TRUE; + return isTagSelfClosing; +} + + +static gboolean is_tag_empty(gchar *tagName) +{ + const char *emptyTags[] = {"area", "base", "br", "col", "embed", + "hr", "img", "input", "keygen", "link", "meta", + "param", "source", "track", "wbr", "!DOCTYPE"}; + + int i; + for(i=0; i<(sizeof(emptyTags)/sizeof(emptyTags[0])); i++) + { + if(strcmp(tagName, emptyTags[i]) == 0) + return TRUE; + } + + return FALSE; +} + + +static gboolean is_tag_opening(ScintillaObject *sci, gint openingBracket) +{ + gboolean isTagOpening = TRUE; + gchar charAfterBracket = sci_get_char_at(sci, openingBracket+1); + + if('/' == charAfterBracket) + isTagOpening = FALSE; + return isTagOpening; +} + + +static void get_tag_name(ScintillaObject *sci, gint openingBracket, gint closingBracket, + gchar tagName[], gboolean isTagOpening) +{ + gint nameStart = openingBracket + (TRUE == isTagOpening ? 1 : 2); + gint nameEnd = nameStart; + gchar charAtCurPosition = sci_get_char_at(sci, nameStart); + + while(' ' != charAtCurPosition && '>' != charAtCurPosition && + '\t' != charAtCurPosition && '\r' != charAtCurPosition && '\n' != charAtCurPosition) + { + charAtCurPosition = sci_get_char_at(sci, nameEnd); + nameEnd++; + if(nameEnd-nameStart > MAX_TAG_NAME) + break; + } + sci_get_text_range(sci, nameStart, nameEnd-1, tagName); +} + + +static void findMatchingOpeningTag(ScintillaObject *sci, gchar *tagName, gint openingBracket) +{ + gint pos; + gint openingTagsCount = 0; + gint closingTagsCount = 1; + + for(pos=openingBracket; pos>0; pos--) + { + /* are we inside tag? */ + gint lineNumber = sci_get_line_from_position(sci, pos); + gint lineStart = sci_get_position_from_line(sci, lineNumber); + gint matchingOpeningBracket = findBracket(sci, pos, lineStart, '<', '\0', FALSE); + gint matchingClosingBracket = findBracket(sci, pos, lineStart, '>', '\0', FALSE); + + if(-1 != matchingOpeningBracket && -1 != matchingClosingBracket + && (matchingClosingBracket > matchingOpeningBracket)) + { + /* we are inside of some tag. Let us check what tag*/ + gchar matchingTagName[MAX_TAG_NAME]; + gboolean isMatchingTagOpening = is_tag_opening(sci, matchingOpeningBracket); + get_tag_name(sci, matchingOpeningBracket, matchingClosingBracket, + matchingTagName, isMatchingTagOpening); + if(strcmp(tagName, matchingTagName) == 0) + { + if(TRUE == isMatchingTagOpening) + openingTagsCount++; + else + closingTagsCount++; + } + pos = matchingOpeningBracket+1; + } + /* Speed up search: if findBracket returns -1, that means start of line + * is reached. There is no need to go through the same positions again. + * Jump to the start of line */ + else if(-1 == matchingOpeningBracket || -1 == matchingClosingBracket) + { + pos = lineStart; + continue; + } + if(openingTagsCount == closingTagsCount) + { + /* matching tag is found */ + highlightedBrackets[2] = matchingOpeningBracket; + highlightedBrackets[3] = matchingClosingBracket; + highlight_matching_pair(sci); + return; + } + } + highlight_tag(sci, highlightedBrackets[0], highlightedBrackets[1], + NONMATCHING_PAIR_COLOR); +} + + +static void findMatchingClosingTag(ScintillaObject *sci, gchar *tagName, gint closingBracket) +{ + gint pos; + gint linesInDocument = sci_get_line_count(sci); + gint endOfDocument = sci_get_position_from_line(sci, linesInDocument); + gint openingTagsCount = 1; + gint closingTagsCount = 0; + + for(pos=closingBracket; pos', '\0', TRUE); + + if(-1 != matchingOpeningBracket && -1 != matchingClosingBracket + && (matchingClosingBracket > matchingOpeningBracket)) + { + /* we are inside of some tag. Let us check what tag*/ + gchar matchingTagName[64]; + gboolean isMatchingTagOpening = is_tag_opening(sci, matchingOpeningBracket); + get_tag_name(sci, matchingOpeningBracket, matchingClosingBracket, + matchingTagName, isMatchingTagOpening); + if(strcmp(tagName, matchingTagName) == 0) + { + if(TRUE == isMatchingTagOpening) + openingTagsCount++; + else + closingTagsCount++; + } + pos = matchingClosingBracket; + } + + if(openingTagsCount == closingTagsCount) + { + /* matching tag is found */ + highlightedBrackets[2] = matchingOpeningBracket; + highlightedBrackets[3] = matchingClosingBracket; + highlight_matching_pair(sci); + return; + } + } + highlight_tag(sci, highlightedBrackets[0], highlightedBrackets[1], + NONMATCHING_PAIR_COLOR); +} + + +static void findMatchingTag(ScintillaObject *sci, gint openingBracket, gint closingBracket) +{ + gchar tagName[MAX_TAG_NAME]; + gboolean isTagOpening = is_tag_opening(sci, openingBracket); + + get_tag_name(sci, openingBracket, closingBracket, tagName, isTagOpening); + + if(is_tag_self_closing(sci, closingBracket) || is_tag_empty(tagName)) { + highlight_tag(sci, openingBracket, closingBracket, EMPTY_TAG_COLOR); + } else { + if(isTagOpening) + findMatchingClosingTag(sci, tagName, closingBracket); + else + findMatchingOpeningTag(sci, tagName, openingBracket); + } +} + + +static void run_tag_highlighter(ScintillaObject *sci) +{ + gint position = sci_get_current_position(sci); + gint lineNumber = sci_get_current_line(sci); + gint lineStart = sci_get_position_from_line(sci, lineNumber); + gint lineEnd = sci_get_line_end_position(sci, lineNumber); + gint openingBracket = findBracket(sci, position, lineStart, '<', '>', FALSE); + gint closingBracket = findBracket(sci, position, lineEnd, '>', '<', TRUE); + int i; + + if(-1 == openingBracket || -1 == closingBracket) + { + clear_previous_highlighting(sci, highlightedBrackets[0], highlightedBrackets[1]); + clear_previous_highlighting(sci, highlightedBrackets[2], highlightedBrackets[3]); + for(i=0; i<3; i++) + highlightedBrackets[i] = 0; + return; + } + + /* If the cursor jumps from one tag into another, clear + * previous highlighted tags*/ + if(openingBracket != highlightedBrackets[0] || + closingBracket != highlightedBrackets[1]) + { + clear_previous_highlighting(sci, highlightedBrackets[0], highlightedBrackets[1]); + clear_previous_highlighting(sci, highlightedBrackets[2], highlightedBrackets[3]); + } + + /* Don't run search on empty brackets <> */ + if (closingBracket - openingBracket > 1) { + highlightedBrackets[0] = openingBracket; + highlightedBrackets[1] = closingBracket; + + findMatchingTag(sci, openingBracket, closingBracket); + } +} + + +/* Notification handler for editor-notify */ +static gboolean on_editor_notify(GObject *obj, GeanyEditor *editor, + SCNotification *nt, gpointer user_data) +{ + gint lexer; + + lexer = sci_get_lexer(editor->sci); + if((lexer != SCLEX_HTML) && (lexer != SCLEX_XML)) + { + return FALSE; + } + + /* nmhdr is a structure containing information about the event */ + switch (nt->nmhdr.code) + { + case SCN_UPDATEUI: + run_tag_highlighter(editor->sci); + break; + } + + /* returning FALSE to allow Geany processing the event */ + return FALSE; +} + + +PluginCallback plugin_callbacks[] = +{ + { "editor-notify", (GCallback) &on_editor_notify, FALSE, NULL }, + { NULL, NULL, FALSE, NULL } +}; + + +void plugin_init(GeanyData *data) +{ +} + + +void plugin_cleanup(void) +{ + GeanyDocument *doc = document_get_current(); + + if (doc) + { + clear_previous_highlighting(doc->editor->sci, highlightedBrackets[0], highlightedBrackets[1]); + clear_previous_highlighting(doc->editor->sci, highlightedBrackets[2], highlightedBrackets[3]); + } +} diff -Nru geany-plugins-1.23+dfsg/pairtaghighlighter/wscript_build geany-plugins-1.24+dfsg/pairtaghighlighter/wscript_build --- geany-plugins-1.23+dfsg/pairtaghighlighter/wscript_build 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pairtaghighlighter/wscript_build 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - Pairtaghighlighter +# +# Copyright 2013 Roland Pallai +# +# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + +from build.wafutils import build_plugin + + +name = 'Pairtaghighlighter' +includes = ['pairtaghighlighter/src'] + +build_plugin(bld, name, includes=includes) diff -Nru geany-plugins-1.23+dfsg/pairtaghighlighter/wscript_configure geany-plugins-1.24+dfsg/pairtaghighlighter/wscript_configure --- geany-plugins-1.23+dfsg/pairtaghighlighter/wscript_configure 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pairtaghighlighter/wscript_configure 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - Pairtaghighlighter +# +# Copyright 2013 Roland Pallai +# +# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + +from build.wafutils import check_cfg_cached, check_c_header_cached + + +check_c_header_cached(conf, header_name='string.h', mandatory=True) diff -Nru geany-plugins-1.23+dfsg/po/be.po geany-plugins-1.24+dfsg/po/be.po --- geany-plugins-1.23+dfsg/po/be.po 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/po/be.po 2014-04-12 14:28:39.000000000 +0000 @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Geany-plugins 1.23\n" +"Project-Id-Version: Geany-plugins 1.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-23 14:32+0100\n" +"POT-Creation-Date: 2014-03-30 19:33+0200\n" "PO-Revision-Date: 2009-06-11 10:15+0200\n" "Last-Translator: Yura Siamshka >\n" "Language-Team: Belarusian \n" @@ -37,12 +37,12 @@ msgid "Contents" msgstr "" -#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:615 +#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:625 msgid "Bookmarks" msgstr "" #. complete update -#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2295 +#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2351 msgid "_Update" msgstr "" @@ -80,15 +80,15 @@ msgid "Context:" msgstr "" -#: ../addons/src/ao_xmltagging.c:56 +#: ../addons/src/ao_xmltagging.c:54 msgid "XML tagging" msgstr "" -#: ../addons/src/ao_xmltagging.c:67 +#: ../addons/src/ao_xmltagging.c:65 msgid "Tag name to be inserted:" msgstr "" -#: ../addons/src/ao_xmltagging.c:71 +#: ../addons/src/ao_xmltagging.c:69 #, c-format msgid "" "%s will be replaced with your current selection. Please keep care on your " @@ -156,11 +156,12 @@ msgid "Run XML tagging" msgstr "" -#: ../addons/src/addons.c:417 ../geanylatex/src/geanylatex.c:241 -#: ../geanyprj/src/geanyprj.c:174 ../geanysendmail/src/geanysendmail.c:121 -#: ../geanysendmail/src/geanysendmail.c:287 ../geanyvc/src/geanyvc.c:1798 +#: ../addons/src/addons.c:417 ../autoclose/src/autoclose.c:871 +#: ../geanylatex/src/geanylatex.c:241 ../geanyprj/src/geanyprj.c:174 +#: ../geanysendmail/src/geanysendmail.c:123 +#: ../geanysendmail/src/geanysendmail.c:291 ../geanyvc/src/geanyvc.c:1854 #: ../geniuspaste/src/geniuspaste.c:140 ../spellcheck/src/scplugin.c:146 -#: ../treebrowser/src/treebrowser.c:1880 +#: ../treebrowser/src/treebrowser.c:1933 #: ../updatechecker/src/updatechecker.c:253 msgid "Plugin configuration directory could not be created." msgstr "" @@ -247,6 +248,14 @@ msgid "Enclose selection automatically (without having to press a keybinding)" msgstr "" +#: ../autoclose/src/autoclose.c:50 +msgid "Auto-close" +msgstr "" + +#: ../autoclose/src/autoclose.c:51 +msgid "Auto-close braces and brackets with lot of features" +msgstr "" + #: ../codenav/src/codenavigation.c:52 msgid "Code navigation" msgstr "" @@ -311,8 +320,8 @@ msgid "Various debuggers integration." msgstr "" -#: ../debugger/src/plugin.c:131 ../debugger/src/keys.c:76 -#: ../scope/data/scope.glade.h:125 ../scope/src/scope.c:225 +#: ../debugger/src/plugin.c:133 ../debugger/src/keys.c:76 +#: ../scope/data/scope.glade.h:124 ../scope/src/scope.c:226 msgid "Debug" msgstr "" @@ -448,7 +457,7 @@ msgid "Target" msgstr "" -#: ../debugger/src/tabs.c:135 ../scope/data/scope.glade.h:69 +#: ../debugger/src/tabs.c:135 ../scope/src/scope.c:524 msgid "Breakpoints" msgstr "" @@ -485,22 +494,22 @@ msgstr "" #: ../debugger/src/keys.c:52 ../debugger/src/btnpanel.c:113 -#: ../scope/src/scope.c:67 +#: ../scope/src/scope.c:66 msgid "Step into" msgstr "" #: ../debugger/src/keys.c:53 ../debugger/src/btnpanel.c:110 -#: ../scope/src/scope.c:68 +#: ../scope/src/scope.c:67 msgid "Step over" msgstr "" #: ../debugger/src/keys.c:54 ../debugger/src/btnpanel.c:122 -#: ../scope/src/scope.c:69 +#: ../scope/src/scope.c:68 msgid "Step out" msgstr "" #: ../debugger/src/keys.c:55 ../debugger/src/btnpanel.c:125 -#: ../scope/src/scope.c:65 +#: ../scope/src/scope.c:64 msgid "Run to cursor" msgstr "" @@ -509,7 +518,7 @@ msgstr "" #: ../debugger/src/keys.c:57 -msgid "Jump to the currect instruction" +msgid "Jump to the current instruction" msgstr "" #: ../debugger/src/watch_model.c:220 @@ -540,6 +549,14 @@ msgid "Save debug session data to a project" msgstr "" +#: ../defineformat/src/defineformat.c:56 +msgid "Define formatter" +msgstr "" + +#: ../defineformat/src/defineformat.c:57 +msgid "Automatically align backslash in multi-line defines" +msgstr "" + #. never search for more than this many chars #: ../devhelp/src/dhp.h:38 #, fuzzy @@ -651,7 +668,7 @@ msgstr "" #. i18n: a documentation book -#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1760 +#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1759 msgid "Book" msgstr "" @@ -780,13 +797,13 @@ msgid "A developers' help browser for GNOME" msgstr "" -#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2010 +#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2066 #, fuzzy msgid "_File" msgstr "Дадаць файл" -#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1815 -#: ../geanymacro/src/geanymacro.c:2112 +#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1822 +#: ../geanymacro/src/geanymacro.c:2118 msgid "_Edit" msgstr "" @@ -970,58 +987,67 @@ msgid "Column mode, select to line / brace / anchor." msgstr "" -#: ../geanyextrasel/src/extrasel.c:482 +#: ../geanyextrasel/src/extrasel.c:502 msgid "E_xtra Selection" msgstr "" -#: ../geanyextrasel/src/extrasel.c:489 +#: ../geanyextrasel/src/extrasel.c:509 msgid "_Column Mode" msgstr "" -#: ../geanyextrasel/src/extrasel.c:494 +#: ../geanyextrasel/src/extrasel.c:514 msgid "Column mode" msgstr "" -#: ../geanyextrasel/src/extrasel.c:496 +#: ../geanyextrasel/src/extrasel.c:516 msgid "Select to _Line" msgstr "" -#: ../geanyextrasel/src/extrasel.c:500 +#: ../geanyextrasel/src/extrasel.c:520 #, fuzzy msgid "Select to line" msgstr "Выдаліць праэкт" -#: ../geanyextrasel/src/extrasel.c:502 +#: ../geanyextrasel/src/extrasel.c:522 msgid "Select to Matching _Brace" msgstr "" -#: ../geanyextrasel/src/extrasel.c:506 +#: ../geanyextrasel/src/extrasel.c:526 msgid "Select to matching brace" msgstr "" -#: ../geanyextrasel/src/extrasel.c:510 +#: ../geanyextrasel/src/extrasel.c:528 +msgid "_Toggle Stream/Rectangular" +msgstr "" + +#: ../geanyextrasel/src/extrasel.c:532 +#, fuzzy +msgid "Convert selection" +msgstr "Выдаліць праэкт" + +#: ../geanyextrasel/src/extrasel.c:537 msgid "_Set Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:514 +#: ../geanyextrasel/src/extrasel.c:541 msgid "Set anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:516 +#: ../geanyextrasel/src/extrasel.c:543 #, fuzzy msgid "Select to _Anchor" msgstr "Выдаліць праэкт" -#: ../geanyextrasel/src/extrasel.c:520 +#: ../geanyextrasel/src/extrasel.c:547 #, fuzzy msgid "Select to anchor" msgstr "Выдаліць праэкт" -#: ../geanyextrasel/src/extrasel.c:522 +#: ../geanyextrasel/src/extrasel.c:549 msgid "_Rectangle Select to Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:527 +#: ../geanyextrasel/src/extrasel.c:554 msgid "Rectangle select to anchor" msgstr "" @@ -1416,78 +1442,78 @@ msgid "Default documentation type for languages that does not have one set" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:37 ../geanyinsertnum/src/insertnum.c:329 -#: ../geanyinsertnum/src/insertnum.c:461 +#: ../geanyinsertnum/src/insertnum.c:44 ../geanyinsertnum/src/insertnum.c:337 +#: ../geanyinsertnum/src/insertnum.c:484 #, fuzzy msgid "Insert Numbers" msgstr "Наладкі" -#: ../geanyinsertnum/src/insertnum.c:37 +#: ../geanyinsertnum/src/insertnum.c:44 msgid "Insert/Fill columns with numbers." msgstr "" -#: ../geanyinsertnum/src/insertnum.c:140 +#: ../geanyinsertnum/src/insertnum.c:146 msgid "Counting..." msgstr "" -#: ../geanyinsertnum/src/insertnum.c:188 +#: ../geanyinsertnum/src/insertnum.c:194 msgid "Preparing..." msgstr "" -#: ../geanyinsertnum/src/insertnum.c:194 +#: ../geanyinsertnum/src/insertnum.c:200 msgid "Inserting..." msgstr "" -#: ../geanyinsertnum/src/insertnum.c:318 +#: ../geanyinsertnum/src/insertnum.c:333 msgid "For base 11 and above" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:341 +#: ../geanyinsertnum/src/insertnum.c:353 msgid "_Start:" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:346 +#: ../geanyinsertnum/src/insertnum.c:358 msgid "S_tep:" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:352 +#: ../geanyinsertnum/src/insertnum.c:364 #, fuzzy msgid "_Base:" msgstr "Базавы шлях:" -#: ../geanyinsertnum/src/insertnum.c:363 +#: ../geanyinsertnum/src/insertnum.c:380 msgid "Letters:" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:366 +#: ../geanyinsertnum/src/insertnum.c:383 msgid "_Upper" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:371 +#: ../geanyinsertnum/src/insertnum.c:388 msgid "_Lower" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:376 +#: ../geanyinsertnum/src/insertnum.c:393 msgid "Base _prefix" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:378 +#: ../geanyinsertnum/src/insertnum.c:395 msgid "0 for octal, 0x for hex, + for positive decimal" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:380 +#: ../geanyinsertnum/src/insertnum.c:397 msgid "Padding:" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:382 +#: ../geanyinsertnum/src/insertnum.c:399 msgid "Sp_ace" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:385 +#: ../geanyinsertnum/src/insertnum.c:402 msgid "_Zero" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:454 +#: ../geanyinsertnum/src/insertnum.c:477 #, fuzzy msgid "Insert _Numbers" msgstr "Наладкі" @@ -1926,20 +1952,20 @@ msgid "BibTeX reference name:" msgstr "Наладкі" -#: ../geanylatex/src/geanylatex.c:1680 +#: ../geanylatex/src/geanylatex.c:1679 msgid "Dear Sir or Madame" msgstr "" -#: ../geanylatex/src/geanylatex.c:1681 +#: ../geanylatex/src/geanylatex.c:1680 msgid "With kind regards" msgstr "" -#: ../geanylatex/src/geanylatex.c:1689 +#: ../geanylatex/src/geanylatex.c:1688 msgid "No template assigned. Aborting" msgstr "" #. Building the wizard-dialog and showing it -#: ../geanylatex/src/geanylatex.c:1716 +#: ../geanylatex/src/geanylatex.c:1715 msgid "LaTeX-Wizard" msgstr "" @@ -1947,79 +1973,79 @@ #. * Adds custom templates if there are any. If there are none just #. * adds default one #. TEMPLATE FILE -#: ../geanylatex/src/geanylatex.c:1731 ../markdown/src/conf.c:666 +#: ../geanylatex/src/geanylatex.c:1730 ../markdown/src/conf.c:659 msgid "Template:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1735 +#: ../geanylatex/src/geanylatex.c:1734 msgid "Set the template which should be used for creating the new document" msgstr "" -#: ../geanylatex/src/geanylatex.c:1744 +#: ../geanylatex/src/geanylatex.c:1743 msgid "Default" msgstr "" #. Documentclass -#: ../geanylatex/src/geanylatex.c:1755 +#: ../geanylatex/src/geanylatex.c:1754 msgid "Documentclass:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1758 +#: ../geanylatex/src/geanylatex.c:1757 msgid "Choose the kind of document you want to write" msgstr "" -#: ../geanylatex/src/geanylatex.c:1762 +#: ../geanylatex/src/geanylatex.c:1761 msgid "Article" msgstr "" -#: ../geanylatex/src/geanylatex.c:1764 +#: ../geanylatex/src/geanylatex.c:1763 msgid "Report" msgstr "" -#: ../geanylatex/src/geanylatex.c:1766 +#: ../geanylatex/src/geanylatex.c:1765 msgid "Letter" msgstr "" -#: ../geanylatex/src/geanylatex.c:1768 +#: ../geanylatex/src/geanylatex.c:1767 msgid "Presentation" msgstr "" #. Encoding -#: ../geanylatex/src/geanylatex.c:1778 +#: ../geanylatex/src/geanylatex.c:1777 msgid "Encoding:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1782 +#: ../geanylatex/src/geanylatex.c:1781 msgid "Set the encoding for your new document" msgstr "" #. fontsize -#: ../geanylatex/src/geanylatex.c:1798 +#: ../geanylatex/src/geanylatex.c:1797 msgid "Font size" msgstr "" -#: ../geanylatex/src/geanylatex.c:1804 +#: ../geanylatex/src/geanylatex.c:1803 msgid "Set the default font size of your new document" msgstr "" #. Author -#: ../geanylatex/src/geanylatex.c:1816 +#: ../geanylatex/src/geanylatex.c:1815 msgid "Author:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1819 +#: ../geanylatex/src/geanylatex.c:1818 msgid "" "Sets the value of the \\author command. In most cases this should be your " "name" msgstr "" #. Date -#: ../geanylatex/src/geanylatex.c:1833 +#: ../geanylatex/src/geanylatex.c:1832 #, fuzzy msgid "Date:" msgstr "Імя:" -#: ../geanylatex/src/geanylatex.c:1836 +#: ../geanylatex/src/geanylatex.c:1835 msgid "" "Sets the value of the \\date command inside header of your new created LaTeX-" "document. Keeping it at \\today is a good decision if you don't need any " @@ -2027,267 +2053,267 @@ msgstr "" #. Title of the new document -#: ../geanylatex/src/geanylatex.c:1848 +#: ../geanylatex/src/geanylatex.c:1847 msgid "Title:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1851 +#: ../geanylatex/src/geanylatex.c:1850 msgid "Sets the title of your new document." msgstr "" #. Papersize -#: ../geanylatex/src/geanylatex.c:1860 +#: ../geanylatex/src/geanylatex.c:1859 msgid "Paper size:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1863 +#: ../geanylatex/src/geanylatex.c:1862 msgid "Choose the paper format for the newly created document" msgstr "" #. Paper direction -#: ../geanylatex/src/geanylatex.c:1876 +#: ../geanylatex/src/geanylatex.c:1875 msgid "Paper Orientation:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1879 +#: ../geanylatex/src/geanylatex.c:1878 msgid "Choose the paper orientation for the newly created document" msgstr "" -#: ../geanylatex/src/geanylatex.c:1900 +#: ../geanylatex/src/geanylatex.c:1899 msgid "Use KOMA-script classes if possible" msgstr "" -#: ../geanylatex/src/geanylatex.c:1902 +#: ../geanylatex/src/geanylatex.c:1901 msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" "Keep in mind: To compile your document these classes have to be installed " "before." msgstr "" -#: ../geanylatex/src/geanylatex.c:1909 +#: ../geanylatex/src/geanylatex.c:1908 msgid "Use draft mode" msgstr "" -#: ../geanylatex/src/geanylatex.c:1911 +#: ../geanylatex/src/geanylatex.c:1910 msgid "" "Set the draft flag inside new created documents to get documents with a " "number of debugging helpers" msgstr "" -#: ../geanylatex/src/geanylatex.c:1928 +#: ../geanylatex/src/geanylatex.c:1927 msgid "Run LaTeX-Wizard" msgstr "" -#: ../geanylatex/src/geanylatex.c:1930 +#: ../geanylatex/src/geanylatex.c:1929 msgid "Insert \\label" msgstr "" -#: ../geanylatex/src/geanylatex.c:1932 +#: ../geanylatex/src/geanylatex.c:1931 msgid "Insert \\ref" msgstr "" -#: ../geanylatex/src/geanylatex.c:1934 +#: ../geanylatex/src/geanylatex.c:1933 msgid "Insert linebreak \\\\ " msgstr "" -#: ../geanylatex/src/geanylatex.c:1937 +#: ../geanylatex/src/geanylatex.c:1936 msgid "Insert command" msgstr "" -#: ../geanylatex/src/geanylatex.c:1939 +#: ../geanylatex/src/geanylatex.c:1938 msgid "Turn input replacement on/off" msgstr "" -#: ../geanylatex/src/geanylatex.c:1943 +#: ../geanylatex/src/geanylatex.c:1942 msgid "Replace special characters" msgstr "" -#: ../geanylatex/src/geanylatex.c:1946 +#: ../geanylatex/src/geanylatex.c:1945 msgid "Run insert environment dialog" msgstr "" -#: ../geanylatex/src/geanylatex.c:1948 +#: ../geanylatex/src/geanylatex.c:1947 msgid "Insert \\item" msgstr "" -#: ../geanylatex/src/geanylatex.c:1950 +#: ../geanylatex/src/geanylatex.c:1949 msgid "Format selection in bold font face" msgstr "" -#: ../geanylatex/src/geanylatex.c:1952 +#: ../geanylatex/src/geanylatex.c:1951 msgid "Format selection in italic font face" msgstr "" -#: ../geanylatex/src/geanylatex.c:1954 +#: ../geanylatex/src/geanylatex.c:1953 msgid "Format selection in typewriter font face" msgstr "" -#: ../geanylatex/src/geanylatex.c:1956 +#: ../geanylatex/src/geanylatex.c:1955 msgid "Format selection centered" msgstr "" -#: ../geanylatex/src/geanylatex.c:1958 +#: ../geanylatex/src/geanylatex.c:1957 msgid "Format selection left-aligned" msgstr "" -#: ../geanylatex/src/geanylatex.c:1960 +#: ../geanylatex/src/geanylatex.c:1959 msgid "Format selection right-aligned" msgstr "" -#: ../geanylatex/src/geanylatex.c:1963 +#: ../geanylatex/src/geanylatex.c:1962 msgid "Insert description list" msgstr "" -#: ../geanylatex/src/geanylatex.c:1966 +#: ../geanylatex/src/geanylatex.c:1965 msgid "Insert itemize list" msgstr "" -#: ../geanylatex/src/geanylatex.c:1969 +#: ../geanylatex/src/geanylatex.c:1968 msgid "Insert enumerate list" msgstr "" -#: ../geanylatex/src/geanylatex.c:1972 +#: ../geanylatex/src/geanylatex.c:1971 msgid "Set selection one level up" msgstr "" -#: ../geanylatex/src/geanylatex.c:1975 +#: ../geanylatex/src/geanylatex.c:1974 msgid "Set selection one level down" msgstr "" -#: ../geanylatex/src/geanylatex.c:1978 +#: ../geanylatex/src/geanylatex.c:1977 msgid "Insert \\usepackage{}" msgstr "" -#: ../geanylatex/src/geanylatex.c:1981 +#: ../geanylatex/src/geanylatex.c:1980 #, fuzzy msgid "Insert BibTeX reference dialog" msgstr "Наладкі" -#: ../geanylatex/src/geanylatex.c:1988 +#: ../geanylatex/src/geanylatex.c:1987 msgid "" "GeanyLaTeX is a plugin to improve support for LaTeX in Geany.\n" "\n" "Please report all bugs or feature requests to one of the authors." msgstr "" -#: ../geanylatex/src/geanylatex.c:2026 +#: ../geanylatex/src/geanylatex.c:2025 msgid "" "glatex_set_autocompletion_contextsize has been initialized with an invalid " "value. Default value taken. Please check your configuration file" msgstr "" -#: ../geanylatex/src/geanylatex.c:2048 ../geanylatex/src/geanylatex.c:2055 +#: ../geanylatex/src/geanylatex.c:2047 ../geanylatex/src/geanylatex.c:2054 msgid "page \\pageref{{{reference}}}" msgstr "" -#: ../geanylatex/src/geanylatex.c:2052 ../geanylatex/src/geanylatex.c:2059 +#: ../geanylatex/src/geanylatex.c:2051 ../geanylatex/src/geanylatex.c:2058 msgid "\\ref{{{reference}}}, page \\pageref{{{reference}}}" msgstr "" #. Build up menu for menubar -#: ../geanylatex/src/geanylatex.c:2107 +#: ../geanylatex/src/geanylatex.c:2106 msgid "_LaTeX" msgstr "" #. Filling up menubar menus #. LaTeX menu -#: ../geanylatex/src/geanylatex.c:2116 ../geanylatex/src/geanylatex.c:2328 +#: ../geanylatex/src/geanylatex.c:2115 ../geanylatex/src/geanylatex.c:2327 msgid "LaTeX-_Wizard" msgstr "" -#: ../geanylatex/src/geanylatex.c:2119 ../geanylatex/src/geanylatex.c:2331 +#: ../geanylatex/src/geanylatex.c:2118 ../geanylatex/src/geanylatex.c:2330 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "" -#: ../geanylatex/src/geanylatex.c:2124 +#: ../geanylatex/src/geanylatex.c:2123 msgid "I_nsert Special Character" msgstr "" -#: ../geanylatex/src/geanylatex.c:2126 +#: ../geanylatex/src/geanylatex.c:2125 msgid "Helps to use some not very common letters and signs" msgstr "" -#: ../geanylatex/src/geanylatex.c:2136 +#: ../geanylatex/src/geanylatex.c:2135 #, fuzzy msgid "Insert _Reference" msgstr "Наладкі" -#: ../geanylatex/src/geanylatex.c:2138 +#: ../geanylatex/src/geanylatex.c:2137 msgid "Inserting references to the document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2143 +#: ../geanylatex/src/geanylatex.c:2142 msgid "Insert _Label" msgstr "" -#: ../geanylatex/src/geanylatex.c:2145 +#: ../geanylatex/src/geanylatex.c:2144 msgid "Helps at inserting labels to a document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2151 +#: ../geanylatex/src/geanylatex.c:2150 msgid "Insert _Environment" msgstr "" -#: ../geanylatex/src/geanylatex.c:2153 +#: ../geanylatex/src/geanylatex.c:2152 msgid "Helps at inserting an environment a document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2159 +#: ../geanylatex/src/geanylatex.c:2158 #, fuzzy msgid "Insert P_ackage" msgstr "Наладкі" -#: ../geanylatex/src/geanylatex.c:2161 +#: ../geanylatex/src/geanylatex.c:2160 msgid "A small dialog to insert \\usepackage{} into header of current file" msgstr "" -#: ../geanylatex/src/geanylatex.c:2166 ../scope/data/scope.glade.h:58 +#: ../geanylatex/src/geanylatex.c:2165 ../scope/data/scope.glade.h:58 msgid "_Format" msgstr "" #. Add font size menu -#: ../geanylatex/src/geanylatex.c:2183 +#: ../geanylatex/src/geanylatex.c:2182 msgid "F_ont size" msgstr "" -#: ../geanylatex/src/geanylatex.c:2201 +#: ../geanylatex/src/geanylatex.c:2200 msgid "_Special Character Replacement" msgstr "" -#: ../geanylatex/src/geanylatex.c:2209 +#: ../geanylatex/src/geanylatex.c:2208 msgid "Bulk _Replace Special Characters" msgstr "" -#: ../geanylatex/src/geanylatex.c:2211 +#: ../geanylatex/src/geanylatex.c:2210 msgid "_Replace selected special characters with TeX substitutes" msgstr "" -#: ../geanylatex/src/geanylatex.c:2219 +#: ../geanylatex/src/geanylatex.c:2218 msgid "Toggle _Special Character Replacement" msgstr "" -#: ../geanylatex/src/geanylatex.c:2230 +#: ../geanylatex/src/geanylatex.c:2229 msgid "Insert _Command" msgstr "" -#: ../geanylatex/src/geanylatex.c:2232 +#: ../geanylatex/src/geanylatex.c:2231 msgid "Inserting costumized command to document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2257 +#: ../geanylatex/src/geanylatex.c:2256 msgid "_BibTeX" msgstr "" -#: ../geanylatex/src/geanylatex.c:2265 +#: ../geanylatex/src/geanylatex.c:2264 #, fuzzy msgid "Insert B_ibTeX reference" msgstr "Наладкі" -#: ../geanylatex/src/geanylatex.c:2267 +#: ../geanylatex/src/geanylatex.c:2266 msgid "Helps to insert a reference out of BibTeX files" msgstr "" -#: ../geanylatex/src/geanylatex.c:2272 +#: ../geanylatex/src/geanylatex.c:2271 msgid "_BibTeX entries" msgstr "" @@ -2443,16 +2469,16 @@ msgid "Creating dummy text with Geany" msgstr "" -#: ../geanylipsum/src/geanylipsum.c:86 +#: ../geanylipsum/src/geanylipsum.c:89 msgid "Lipsum-Generator" msgstr "" -#: ../geanylipsum/src/geanylipsum.c:87 +#: ../geanylipsum/src/geanylipsum.c:90 msgid "Enter the length of Lipsum text here" msgstr "" #. Building menu entry -#: ../geanylipsum/src/geanylipsum.c:163 +#: ../geanylipsum/src/geanylipsum.c:164 msgid "_Lipsum" msgstr "" @@ -2576,19 +2602,19 @@ msgid "Browse..." msgstr "" -#: ../geanylua/gsdlg.c:175 +#: ../geanylua/gsdlg.c:176 msgid "Select Color" msgstr "" -#: ../geanylua/gsdlg.c:205 +#: ../geanylua/gsdlg.c:207 msgid "Choose..." msgstr "" -#: ../geanylua/gsdlg.c:226 +#: ../geanylua/gsdlg.c:228 msgid "Select Font" msgstr "" -#: ../geanylua/gsdlg.c:253 +#: ../geanylua/gsdlg.c:255 msgid "Select..." msgstr "" @@ -2613,7 +2639,7 @@ "not enough arguments for command \"%s\".\n" msgstr "" -#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:398 +#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:396 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2649,14 +2675,14 @@ msgid "Save file" msgstr "Выдаліць файл" -#: ../geanylua/glspi_dlg.c:436 +#: ../geanylua/glspi_dlg.c:438 #, c-format msgid "" "Error in module \"%s\" at function pickfile():\n" "failed to parse filter string at argument #3.\n" msgstr "" -#: ../geanylua/glspi_dlg.c:486 +#: ../geanylua/glspi_dlg.c:489 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2695,21 +2721,21 @@ "Please check your installation." msgstr "" -#: ../geanylua/glspi_app.c:19 +#: ../geanylua/glspi_app.c:21 #, c-format msgid "" "%s %s: %s\n" "Copyright (c) 2007-2010 " msgstr "" -#: ../geanylua/glspi_app.c:149 +#: ../geanylua/glspi_app.c:151 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" "widget \"%s\" not found for argument #1.\n" msgstr "" -#: ../geanylua/glspi_app.c:158 +#: ../geanylua/glspi_app.c:160 #, c-format msgid "" "Error in module \"%s\" at function %s() argument #2:\n" @@ -3070,6 +3096,19 @@ "duplicate line" msgstr "" +#: ../geanymacro/src/geanymacro.c:150 +msgid "Search for next \"\"" +msgstr "" + +#: ../geanymacro/src/geanymacro.c:151 +msgid "Search for previous \"\"" +msgstr "" + +#: ../geanymacro/src/geanymacro.c:152 +#, fuzzy +msgid "Set start of search to beginning of selection" +msgstr "Выдаліць праэкт" + #: ../geanymacro/src/geanymacro.c:181 msgid "Macros" msgstr "" @@ -3270,12 +3309,12 @@ #. create buttons #: ../geanymacro/src/geanymacro.c:1393 ../geanymacro/src/geanymacro.c:1536 -#: ../geanymacro/src/geanymacro.c:1819 ../geanymacro/src/geanymacro.c:2116 +#: ../geanymacro/src/geanymacro.c:1826 ../geanymacro/src/geanymacro.c:2122 msgid "_Ok" msgstr "" #: ../geanymacro/src/geanymacro.c:1394 ../geanymacro/src/geanymacro.c:1537 -#: ../geanymacro/src/geanymacro.c:1820 +#: ../geanymacro/src/geanymacro.c:1827 msgid "_Cancel" msgstr "" @@ -3292,7 +3331,7 @@ msgid "Search for contents of clipboard" msgstr "" -#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:92 +#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:101 msgid "Search for:" msgstr "" @@ -3326,59 +3365,59 @@ msgid "Text:" msgstr "" -#: ../geanymacro/src/geanymacro.c:1571 ../geanymacro/src/geanymacro.c:1755 +#: ../geanymacro/src/geanymacro.c:1570 ../geanymacro/src/geanymacro.c:1758 #, c-format msgid "Insert/replace with \"%s\"" msgstr "" #. create dialog box -#: ../geanymacro/src/geanymacro.c:1731 +#: ../geanymacro/src/geanymacro.c:1735 #, c-format msgid "Edit: %s" msgstr "" #. add column -#: ../geanymacro/src/geanymacro.c:1794 +#: ../geanymacro/src/geanymacro.c:1801 msgid "Event" msgstr "" #. add buttons -#: ../geanymacro/src/geanymacro.c:1809 +#: ../geanymacro/src/geanymacro.c:1816 msgid "Move _Up" msgstr "" -#: ../geanymacro/src/geanymacro.c:1811 +#: ../geanymacro/src/geanymacro.c:1818 msgid "Move Do_wn" msgstr "" -#: ../geanymacro/src/geanymacro.c:1813 +#: ../geanymacro/src/geanymacro.c:1820 msgid "New _Above" msgstr "" -#: ../geanymacro/src/geanymacro.c:1814 +#: ../geanymacro/src/geanymacro.c:1821 msgid "New _Below" msgstr "" -#: ../geanymacro/src/geanymacro.c:1817 ../geanymacro/src/geanymacro.c:2114 +#: ../geanymacro/src/geanymacro.c:1824 ../geanymacro/src/geanymacro.c:2120 #, fuzzy msgid "_Delete" msgstr "Выдаліць праэкт" #. create dialog box -#: ../geanymacro/src/geanymacro.c:2059 +#: ../geanymacro/src/geanymacro.c:2065 msgid "Edit Macros" msgstr "" -#: ../geanymacro/src/geanymacro.c:2089 +#: ../geanymacro/src/geanymacro.c:2095 msgid "Macro Name" msgstr "" -#: ../geanymacro/src/geanymacro.c:2095 +#: ../geanymacro/src/geanymacro.c:2101 msgid "Key Trigger" msgstr "" #. add buttons -#: ../geanymacro/src/geanymacro.c:2110 +#: ../geanymacro/src/geanymacro.c:2116 msgid "_Re-Record" msgstr "" @@ -3397,6 +3436,33 @@ msgid "_Edit Macros" msgstr "" +#. *< \brief It's the information message about geany mini script +#: ../geanyminiscript/src/gms_gui.c:129 +msgid "" +"GMS : Geany Mini-Script filter Plugin\n" +"This plugin is a tool to apply a script filter on:\n" +" o the text selection,\n" +" o the current document,\n" +" o all documents of the current session.\n" +"\n" +"The filter type can be:\n" +" o Unix shell script,\n" +" o perl script,\n" +" o python script,\n" +" o sed commands,\n" +" o awk script.\n" +"\n" +"AUTHOR\n" +" Written by Pascal BURLOT (December,2008)\n" +"\n" +"LICENSE:\n" +"This program is free software; you can redistribute\n" +"it and/or modify it under the terms of the GNU \n" +"General Public License as published by the Free\n" +"Software Foundation; either version 2 of the License,\n" +"or (at your option) any later version." +msgstr "" + #: ../geanyminiscript/src/gms_gui.c:253 msgid "Load Mini-Script File" msgstr "" @@ -3405,112 +3471,111 @@ msgid "Save Mini-Script File" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:418 +#: ../geanyminiscript/src/gms_gui.c:419 msgid "Mini-Script Filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:446 +#: ../geanyminiscript/src/gms_gui.c:445 msgid "Clear the mini-script window" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:451 +#: ../geanyminiscript/src/gms_gui.c:450 msgid "Load a mini-script into this window" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:456 +#: ../geanyminiscript/src/gms_gui.c:455 msgid "Save the mini-script into a file" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:461 +#: ../geanyminiscript/src/gms_gui.c:460 msgid "Display a information about the mini-script plugin" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:469 +#: ../geanyminiscript/src/gms_gui.c:468 msgid "select the mini-script type" msgstr "" #. Hbox : Radio bouttons for choosing the input: #. * selection/current document/all documents of the current session -#: ../geanyminiscript/src/gms_gui.c:500 +#: ../geanyminiscript/src/gms_gui.c:499 msgid "filter input" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:502 +#: ../geanyminiscript/src/gms_gui.c:501 msgid "select the input of mini-script filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:508 +#: ../geanyminiscript/src/gms_gui.c:507 #, fuzzy msgid "selection" msgstr "Выдаліць праэкт" -#: ../geanyminiscript/src/gms_gui.c:509 +#: ../geanyminiscript/src/gms_gui.c:508 #, fuzzy msgid "document" msgstr "Інтэрактыўная даведка" -#: ../geanyminiscript/src/gms_gui.c:510 +#: ../geanyminiscript/src/gms_gui.c:509 msgid "session" msgstr "" #. Hbox : Radio bouttons for choosing the output: #. * current document/ or new document -#: ../geanyminiscript/src/gms_gui.c:519 +#: ../geanyminiscript/src/gms_gui.c:518 msgid "filter output" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:521 +#: ../geanyminiscript/src/gms_gui.c:520 msgid "select the output of mini-script filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:527 +#: ../geanyminiscript/src/gms_gui.c:526 msgid "Current Doc." msgstr "" -#: ../geanyminiscript/src/gms_gui.c:528 +#: ../geanyminiscript/src/gms_gui.c:527 #, fuzzy msgid "New Doc." msgstr "Новы Праэкт" -#: ../geanyminiscript/src/gms_gui.c:749 +#: ../geanyminiscript/src/gms_gui.c:748 msgid "script configuration" msgstr "" -#. All plugins must set name, description, version and author. #: ../geanyminiscript/src/gms.c:58 msgid "Mini Script" msgstr "" -#: ../geanyminiscript/src/gms.c:58 +#: ../geanyminiscript/src/gms.c:59 msgid "" "A tool to apply a script filter on a text selection or current document(s)" msgstr "" -#: ../geanyminiscript/src/gms.c:59 +#: ../geanyminiscript/src/gms.c:60 msgid "Pascal BURLOT, a Geany user" msgstr "" #. Add an item to the Tools menu -#: ../geanyminiscript/src/gms.c:278 +#: ../geanyminiscript/src/gms.c:249 msgid "_Mini-Script" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:58 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:61 msgid "Numbered Bookmarks for Geany" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:923 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:927 #, c-format msgid "Unable to apply all markers to '%s' as all being used." msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:925 -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:969 -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1392 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:929 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:973 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1396 msgid "_Okay" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:967 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:971 #, c-format msgid "" "'%s' has been edited since it was last saved by geany. Marker positions may " @@ -3518,54 +3583,54 @@ "Press Ignore to try an load markers anyway." msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:970 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:974 msgid "_Ignore" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1215 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1219 msgid "remember fold state" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1221 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1225 msgid "Center view when goto bookmark" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1228 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1232 #, fuzzy msgid "Move to start of line" msgstr "Выдаліць праэкт" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1229 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1233 msgid "Move to remembered position in line" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1230 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1234 msgid "Move to position in current line" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1231 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1235 #, fuzzy msgid "Move to End of line" msgstr "Выдаліць праэкт" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1237 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1241 msgid "Save file settings with program settings" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1238 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1242 msgid "Save file settings to filename with suffix" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1243 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1247 msgid "remember normal Bookmarks" msgstr "" #. create dialog box -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1263 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1267 msgid "Numbered Bookmarks help" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1270 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1274 msgid "" "This Plugin implements Numbered Bookmarks in Geany, as well as remembering " "the state of folds, and positions of standard non-numbered bookmarks when a " @@ -3581,7 +3646,7 @@ "previously set bookmark, press Ctrl+a number from 0 to 9." msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1391 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1395 msgid "Unable to apply markers as all being used." msgstr "" @@ -3662,36 +3727,36 @@ msgstr "Выдаліць праэкт" #. shouldn't get here -#: ../geanypg/src/pinentry.c:107 +#: ../geanypg/src/pinentry.c:111 msgid "Could not use pinentry." msgstr "" -#: ../geanypg/src/pinentry.c:119 +#: ../geanypg/src/pinentry.c:123 msgid "Unexpected output from pinentry." msgstr "" #. read the rest of the first line after OK -#: ../geanypg/src/pinentry.c:127 +#: ../geanypg/src/pinentry.c:131 msgid "Passphrase entry" msgstr "" -#: ../geanypg/src/pinentry.c:131 +#: ../geanypg/src/pinentry.c:135 msgid "Passphrase" msgstr "" -#: ../geanypg/src/pinentry.c:136 +#: ../geanypg/src/pinentry.c:140 msgid "Enter passphrase for" msgstr "" -#: ../geanypg/src/pinentry.c:167 +#: ../geanypg/src/pinentry.c:171 msgid "pinentry gave error" msgstr "" -#: ../geanypg/src/pinentry.c:170 +#: ../geanypg/src/pinentry.c:174 msgid "Unexpected error from pinentry." msgstr "" -#: ../geanypg/src/pinentry.c:195 +#: ../geanypg/src/pinentry.c:199 msgid "" "Error, Passphrase input without using gpg-agent is not supported on Windows " "yet." @@ -3701,8 +3766,8 @@ msgid "a key with fingerprint" msgstr "" -#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:522 -#: ../spellcheck/src/gui.c:533 +#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:527 +#: ../spellcheck/src/gui.c:538 msgid "unknown" msgstr "" @@ -3858,7 +3923,7 @@ msgstr "" #: ../geanyprj/src/geanyprj.c:38 ../geanyprj/src/sidebar.c:456 -#: ../gproject/src/gproject-sidebar.c:822 +#: ../gproject/src/gproject-sidebar.c:870 msgid "Project" msgstr "Праэкт" @@ -3887,7 +3952,7 @@ msgid "C_reate" msgstr "Стварыць" -#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:116 +#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:114 #, fuzzy msgid "Name:" msgstr "Імя:" @@ -3968,7 +4033,7 @@ msgid "Remove File" msgstr "Выдаліць файл" -#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:803 +#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:849 msgid "H_ide Sidebar" msgstr "Схаваць сайдбар" @@ -3977,6 +4042,48 @@ msgid "Project \"%s\" opened." msgstr "Праэкт \"%s\" адчынен." +#: ../geanypy/src/geanypy-plugin.c:34 +msgid "GeanyPy" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:35 +msgid "Python plugins support" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:77 +#, c-format +msgid "Unable to pre-load Python library: %s." +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:157 +msgid "Failed to import manager module" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:166 +msgid "Failed to retrieve PluginManager from manager module" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:182 +msgid "System plugin directory not found." +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:211 +msgid "Unable to instantiate new PluginManager" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:227 +msgid "Unable to get show_all() method on plugin manager" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:255 +#, c-format +msgid "Unable to create Python plugins directory: %s: %s" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:266 +msgid "Python Plugin Manager" +msgstr "" + #: ../geanysendmail/src/geanysendmail.c:43 msgid "GeanySendMail" msgstr "" @@ -3995,42 +4102,42 @@ msgid "Enter the recipient's e-mail address:" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:136 +#: ../geanysendmail/src/geanysendmail.c:138 msgid "Filename placeholder not found. The executed command might have failed." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:142 +#: ../geanysendmail/src/geanysendmail.c:144 msgid "" "Recipient address placeholder not found. The executed command might have " "failed." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:157 +#: ../geanysendmail/src/geanysendmail.c:159 msgid "Could not execute mailer. Please check your configuration." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:166 +#: ../geanysendmail/src/geanysendmail.c:168 msgid "Please define a mail client first." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:171 +#: ../geanysendmail/src/geanysendmail.c:173 msgid "File has to be saved before sending." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:187 +#: ../geanysendmail/src/geanysendmail.c:191 msgid "Mail" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:218 +#: ../geanysendmail/src/geanysendmail.c:222 msgid "Send by mail" msgstr "" #. add a label and a text entry to the dialog -#: ../geanysendmail/src/geanysendmail.c:308 +#: ../geanysendmail/src/geanysendmail.c:312 msgid "Path and options for the mail client:" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:316 +#: ../geanysendmail/src/geanysendmail.c:320 msgid "" "Note: \n" "\t%f will be replaced by your file.\n" @@ -4041,28 +4148,28 @@ "\tmutt -s \"Sending '%b'\" -a \"%f\" \"%r\"" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:326 +#: ../geanysendmail/src/geanysendmail.c:330 msgid "Show toolbar icon" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:328 +#: ../geanysendmail/src/geanysendmail.c:332 msgid "Shows a icon in the toolbar to send file more easy." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:334 +#: ../geanysendmail/src/geanysendmail.c:338 msgid "Use dialog for entering email address of recipients" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:356 +#: ../geanysendmail/src/geanysendmail.c:360 msgid "Send file by mail" msgstr "" #. Build up menu entry -#: ../geanysendmail/src/geanysendmail.c:379 +#: ../geanysendmail/src/geanysendmail.c:383 msgid "_Mail document" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:382 +#: ../geanysendmail/src/geanysendmail.c:386 msgid "" "Sends the opened file as unzipped attachment by any mailer from your $PATH" msgstr "" @@ -4080,339 +4187,358 @@ msgid "geanyvc: s_spawn_sync error: %s" msgstr "" -#: ../geanyvc/src/geanyvc.c:609 ../geanyvc/src/geanyvc.c:620 +#: ../geanyvc/src/geanyvc.c:561 +#, c-format +msgid "File %s: action %s executed via %s." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:614 ../geanyvc/src/geanyvc.c:625 #, c-format msgid "geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'" msgstr "" -#: ../geanyvc/src/geanyvc.c:646 ../geanyvc/src/geanyvc.c:696 +#: ../geanyvc/src/geanyvc.c:651 ../geanyvc/src/geanyvc.c:701 msgid "No changes were made." msgstr "" -#: ../geanyvc/src/geanyvc.c:723 +#: ../geanyvc/src/geanyvc.c:728 msgid "No history available" msgstr "" -#: ../geanyvc/src/geanyvc.c:916 ../geanyvc/src/geanyvc.c:924 +#: ../geanyvc/src/geanyvc.c:921 ../geanyvc/src/geanyvc.c:929 #, c-format msgid "Do you really want to revert: %s?" msgstr "" -#: ../geanyvc/src/geanyvc.c:932 +#: ../geanyvc/src/geanyvc.c:937 #, c-format msgid "Do you really want to add: %s?" msgstr "" -#: ../geanyvc/src/geanyvc.c:939 +#: ../geanyvc/src/geanyvc.c:944 #, c-format msgid "Do you really want to remove: %s?" msgstr "" -#: ../geanyvc/src/geanyvc.c:962 +#: ../geanyvc/src/geanyvc.c:967 msgid "Do you really want to update?" msgstr "" -#: ../geanyvc/src/geanyvc.c:1225 +#: ../geanyvc/src/geanyvc.c:1094 +msgid "" +"The resulting differences cannot be displayed because the changes are too " +"big to display here and would slow down the UI significantly.\n" +"\n" +"To view the differences, cancel this dialog and open the differences in " +"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:1243 msgid "Commit Y/N" msgstr "" -#: ../geanyvc/src/geanyvc.c:1235 +#: ../geanyvc/src/geanyvc.c:1253 msgid "Status" msgstr "" -#: ../geanyvc/src/geanyvc.c:1242 +#: ../geanyvc/src/geanyvc.c:1260 msgid "Path" msgstr "" -#: ../geanyvc/src/geanyvc.c:1330 +#: ../geanyvc/src/geanyvc.c:1324 +#, c-format +msgid "Line: %d Column: %d" +msgstr "" + +#: ../geanyvc/src/geanyvc.c:1370 msgid "Commit" msgstr "" -#: ../geanyvc/src/geanyvc.c:1372 +#: ../geanyvc/src/geanyvc.c:1412 msgid "_De-/select all files" msgstr "" -#: ../geanyvc/src/geanyvc.c:1413 +#: ../geanyvc/src/geanyvc.c:1456 msgid "Commit message:" msgstr "" -#: ../geanyvc/src/geanyvc.c:1426 +#: ../geanyvc/src/geanyvc.c:1475 msgid "C_ommit" msgstr "" -#: ../geanyvc/src/geanyvc.c:1500 +#: ../geanyvc/src/geanyvc.c:1556 msgid "Nothing to commit." msgstr "" -#: ../geanyvc/src/geanyvc.c:1546 +#: ../geanyvc/src/geanyvc.c:1602 #, c-format msgid "Error initializing spell checking: %s" msgstr "" -#: ../geanyvc/src/geanyvc.c:1558 +#: ../geanyvc/src/geanyvc.c:1614 #, c-format msgid "" "Error while setting up language for spellchecking. Please check " "configuration. Error message was: %s" msgstr "" -#: ../geanyvc/src/geanyvc.c:1834 +#: ../geanyvc/src/geanyvc.c:1890 msgid "Set Changed-flag for document tabs created by the plugin" msgstr "" -#: ../geanyvc/src/geanyvc.c:1837 +#: ../geanyvc/src/geanyvc.c:1893 msgid "" "If this option is activated, every new by the VC-plugin created document tab " "will be marked as changed. Even this option is useful in some cases, it " "could cause a big number of annoying \"Do you want to save\"-dialogs." msgstr "" -#: ../geanyvc/src/geanyvc.c:1845 +#: ../geanyvc/src/geanyvc.c:1901 msgid "Confirm adding new files to a VCS" msgstr "" -#: ../geanyvc/src/geanyvc.c:1848 +#: ../geanyvc/src/geanyvc.c:1904 msgid "Shows a confirmation dialog on adding a new (created) file to VCS." msgstr "" -#: ../geanyvc/src/geanyvc.c:1854 +#: ../geanyvc/src/geanyvc.c:1910 msgid "Maximize commit dialog" msgstr "" -#: ../geanyvc/src/geanyvc.c:1855 +#: ../geanyvc/src/geanyvc.c:1911 msgid "Show commit dialog maximize." msgstr "" -#: ../geanyvc/src/geanyvc.c:1861 +#: ../geanyvc/src/geanyvc.c:1917 msgid "Use external diff viewer" msgstr "" -#: ../geanyvc/src/geanyvc.c:1863 +#: ../geanyvc/src/geanyvc.c:1919 msgid "Use external diff viewer for file diff." msgstr "" -#: ../geanyvc/src/geanyvc.c:1869 +#: ../geanyvc/src/geanyvc.c:1925 msgid "Show VC entries at editor menu" msgstr "" -#: ../geanyvc/src/geanyvc.c:1871 +#: ../geanyvc/src/geanyvc.c:1927 msgid "Show entries for VC functions inside editor menu" msgstr "" -#: ../geanyvc/src/geanyvc.c:1876 +#: ../geanyvc/src/geanyvc.c:1932 msgid "Attach menu to menubar" msgstr "" -#: ../geanyvc/src/geanyvc.c:1878 +#: ../geanyvc/src/geanyvc.c:1934 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " "directly inside Geany's menubar.Will take in account after next start of " "GeanyVC" msgstr "" -#: ../geanyvc/src/geanyvc.c:1886 +#: ../geanyvc/src/geanyvc.c:1942 msgid "Enable CVS" msgstr "" -#: ../geanyvc/src/geanyvc.c:1891 +#: ../geanyvc/src/geanyvc.c:1947 msgid "Enable GIT" msgstr "" -#: ../geanyvc/src/geanyvc.c:1896 +#: ../geanyvc/src/geanyvc.c:1952 msgid "Enable SVN" msgstr "" -#: ../geanyvc/src/geanyvc.c:1901 +#: ../geanyvc/src/geanyvc.c:1957 msgid "Enable SVK" msgstr "" -#: ../geanyvc/src/geanyvc.c:1906 +#: ../geanyvc/src/geanyvc.c:1962 msgid "Enable Bazaar" msgstr "" -#: ../geanyvc/src/geanyvc.c:1911 +#: ../geanyvc/src/geanyvc.c:1967 msgid "Enable Mercurial" msgstr "" -#: ../geanyvc/src/geanyvc.c:1917 +#: ../geanyvc/src/geanyvc.c:1973 msgid "Spellcheck language" msgstr "" -#: ../geanyvc/src/geanyvc.c:2008 +#: ../geanyvc/src/geanyvc.c:2064 msgid "_VC file Actions" msgstr "" #. Diff of current file #. Diff of the current dir #. Complete diff of base directory -#: ../geanyvc/src/geanyvc.c:2014 ../geanyvc/src/geanyvc.c:2091 -#: ../geanyvc/src/geanyvc.c:2131 +#: ../geanyvc/src/geanyvc.c:2070 ../geanyvc/src/geanyvc.c:2147 +#: ../geanyvc/src/geanyvc.c:2187 msgid "_Diff" msgstr "" -#: ../geanyvc/src/geanyvc.c:2017 +#: ../geanyvc/src/geanyvc.c:2073 msgid "Make a diff from the current active file" msgstr "" #. Revert current file #. Revert current dir #. Revert everything -#: ../geanyvc/src/geanyvc.c:2022 ../geanyvc/src/geanyvc.c:2100 -#: ../geanyvc/src/geanyvc.c:2139 +#: ../geanyvc/src/geanyvc.c:2078 ../geanyvc/src/geanyvc.c:2156 +#: ../geanyvc/src/geanyvc.c:2195 msgid "_Revert" msgstr "" -#: ../geanyvc/src/geanyvc.c:2025 +#: ../geanyvc/src/geanyvc.c:2081 msgid "Restore pristine working copy file (undo local edits)." msgstr "" #. Blame for current file -#: ../geanyvc/src/geanyvc.c:2034 +#: ../geanyvc/src/geanyvc.c:2090 msgid "_Blame" msgstr "" -#: ../geanyvc/src/geanyvc.c:2037 +#: ../geanyvc/src/geanyvc.c:2093 msgid "Shows the changes made at one file per revision and author." msgstr "" #. History/log of current file #. History/log of the current dir #. Complete History/Log of base directory -#: ../geanyvc/src/geanyvc.c:2044 ../geanyvc/src/geanyvc.c:2110 -#: ../geanyvc/src/geanyvc.c:2151 +#: ../geanyvc/src/geanyvc.c:2100 ../geanyvc/src/geanyvc.c:2166 +#: ../geanyvc/src/geanyvc.c:2207 msgid "_History (log)" msgstr "" -#: ../geanyvc/src/geanyvc.c:2047 +#: ../geanyvc/src/geanyvc.c:2103 msgid "Shows the log of the current file" msgstr "" #. base version of the current file -#: ../geanyvc/src/geanyvc.c:2052 +#: ../geanyvc/src/geanyvc.c:2108 msgid "_Original" msgstr "" -#: ../geanyvc/src/geanyvc.c:2055 +#: ../geanyvc/src/geanyvc.c:2111 msgid "Shows the original of the current file" msgstr "" #. add current file -#: ../geanyvc/src/geanyvc.c:2063 +#: ../geanyvc/src/geanyvc.c:2119 msgid "_Add to Version Control" msgstr "" -#: ../geanyvc/src/geanyvc.c:2065 +#: ../geanyvc/src/geanyvc.c:2121 msgid "Add file to repository." msgstr "" #. remove current file -#: ../geanyvc/src/geanyvc.c:2071 +#: ../geanyvc/src/geanyvc.c:2127 msgid "_Remove from Version Control" msgstr "" -#: ../geanyvc/src/geanyvc.c:2073 +#: ../geanyvc/src/geanyvc.c:2129 msgid "Remove file from repository." msgstr "" -#: ../geanyvc/src/geanyvc.c:2088 +#: ../geanyvc/src/geanyvc.c:2144 msgid "_Directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2094 +#: ../geanyvc/src/geanyvc.c:2150 msgid "Make a diff from the directory of the current active file" msgstr "" -#: ../geanyvc/src/geanyvc.c:2103 +#: ../geanyvc/src/geanyvc.c:2159 msgid "Restore original files in the current folder (undo local edits)." msgstr "" -#: ../geanyvc/src/geanyvc.c:2113 +#: ../geanyvc/src/geanyvc.c:2169 msgid "Shows the log of the current directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2127 +#: ../geanyvc/src/geanyvc.c:2183 msgid "_Base Directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2133 +#: ../geanyvc/src/geanyvc.c:2189 msgid "Make a diff from the top VC directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2141 +#: ../geanyvc/src/geanyvc.c:2197 msgid "Revert any local edits." msgstr "" -#: ../geanyvc/src/geanyvc.c:2154 +#: ../geanyvc/src/geanyvc.c:2210 msgid "Shows the log of the top VC directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2180 +#: ../geanyvc/src/geanyvc.c:2236 msgid "VC _Commit" msgstr "" -#: ../geanyvc/src/geanyvc.c:2215 +#: ../geanyvc/src/geanyvc.c:2271 msgid "Show diff of file" msgstr "" -#: ../geanyvc/src/geanyvc.c:2217 +#: ../geanyvc/src/geanyvc.c:2273 msgid "Show diff of directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2219 +#: ../geanyvc/src/geanyvc.c:2275 msgid "Show diff of basedir" msgstr "" -#: ../geanyvc/src/geanyvc.c:2222 +#: ../geanyvc/src/geanyvc.c:2278 msgid "Commit changes" msgstr "" -#: ../geanyvc/src/geanyvc.c:2224 +#: ../geanyvc/src/geanyvc.c:2280 msgid "Show status" msgstr "" -#: ../geanyvc/src/geanyvc.c:2226 +#: ../geanyvc/src/geanyvc.c:2282 msgid "Revert single file" msgstr "" -#: ../geanyvc/src/geanyvc.c:2228 +#: ../geanyvc/src/geanyvc.c:2284 msgid "Revert directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2230 +#: ../geanyvc/src/geanyvc.c:2286 msgid "Revert base directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2232 +#: ../geanyvc/src/geanyvc.c:2288 msgid "Update file" msgstr "" -#: ../geanyvc/src/geanyvc.c:2260 +#: ../geanyvc/src/geanyvc.c:2316 msgid "_VC" msgstr "" -#: ../geanyvc/src/geanyvc.c:2266 +#: ../geanyvc/src/geanyvc.c:2322 msgid "_Version Control" msgstr "" #. Status of basedir -#: ../geanyvc/src/geanyvc.c:2288 +#: ../geanyvc/src/geanyvc.c:2344 msgid "_Status" msgstr "" -#: ../geanyvc/src/geanyvc.c:2290 +#: ../geanyvc/src/geanyvc.c:2346 msgid "Show status." msgstr "" -#: ../geanyvc/src/geanyvc.c:2297 +#: ../geanyvc/src/geanyvc.c:2353 msgid "Update from remote repository." msgstr "" #. Commit all changes -#: ../geanyvc/src/geanyvc.c:2302 +#: ../geanyvc/src/geanyvc.c:2358 msgid "_Commit" msgstr "" -#: ../geanyvc/src/geanyvc.c:2304 +#: ../geanyvc/src/geanyvc.c:2360 msgid "Commit changes." msgstr "" @@ -4560,100 +4686,251 @@ "tab." msgstr "" -#: ../gproject/src/gproject-sidebar.c:81 -#: ../gproject/src/gproject-sidebar.c:792 +#: ../gproject/src/gproject-sidebar.c:90 +#: ../gproject/src/gproject-sidebar.c:838 #, fuzzy msgid "Find File" msgstr "Дадаць файл" -#: ../gproject/src/gproject-sidebar.c:108 +#: ../gproject/src/gproject-sidebar.c:117 msgid "Search inside:" msgstr "" -#: ../gproject/src/gproject-sidebar.c:120 +#: ../gproject/src/gproject-sidebar.c:129 msgid "C_ase sensitive" msgstr "" -#: ../gproject/src/gproject-sidebar.c:123 +#: ../gproject/src/gproject-sidebar.c:132 msgid "Search in full path" msgstr "" -#: ../gproject/src/gproject-sidebar.c:702 +#: ../gproject/src/gproject-sidebar.c:745 msgid "Reload all" msgstr "" -#: ../gproject/src/gproject-sidebar.c:711 -#: ../treebrowser/src/treebrowser.c:1282 +#: ../gproject/src/gproject-sidebar.c:754 +#: ../treebrowser/src/treebrowser.c:1281 msgid "Expand all" msgstr "" -#: ../gproject/src/gproject-sidebar.c:717 -#: ../treebrowser/src/treebrowser.c:1286 +#: ../gproject/src/gproject-sidebar.c:761 +#: ../treebrowser/src/treebrowser.c:1285 msgid "Collapse all" msgstr "" -#: ../gproject/src/gproject-sidebar.c:726 +#: ../gproject/src/gproject-sidebar.c:771 msgid "Follow active editor" msgstr "" -#: ../gproject/src/gproject-sidebar.c:774 +#: ../gproject/src/gproject-sidebar.c:820 msgid "Expand All" msgstr "" -#: ../gproject/src/gproject-sidebar.c:783 -#: ../treebrowser/src/treebrowser.c:1234 +#: ../gproject/src/gproject-sidebar.c:829 #, fuzzy msgid "Find in Files" msgstr "Знайсьці і праэкце" #. POSITION OF VIEW -#: ../markdown/src/conf.c:570 +#: ../markdown/src/conf.c:567 #, fuzzy msgid "Position:" msgstr "Лакацыя:" -#: ../markdown/src/conf.c:576 +#: ../markdown/src/conf.c:573 #, fuzzy msgid "Sidebar" msgstr "Схаваць сайдбар" -#: ../markdown/src/conf.c:584 +#: ../markdown/src/conf.c:581 msgid "Message Window" msgstr "" -#: ../markdown/src/conf.c:598 +#: ../markdown/src/conf.c:595 msgid "Font:" msgstr "" -#: ../markdown/src/conf.c:616 +#: ../markdown/src/conf.c:612 msgid "Code Font:" msgstr "" -#: ../markdown/src/conf.c:634 +#: ../markdown/src/conf.c:629 msgid "BG Color:" msgstr "" -#: ../markdown/src/conf.c:651 +#: ../markdown/src/conf.c:645 msgid "FG Color:" msgstr "" -#: ../markdown/src/conf.c:670 +#: ../markdown/src/conf.c:663 #, fuzzy msgid "Select Template File" msgstr "Выдаліць праэкт" -#: ../markdown/src/plugin.c:33 +#: ../markdown/src/plugin.c:35 msgid "Real-time Markdown preview" msgstr "" -#: ../markdown/src/plugin.c:49 +#: ../markdown/src/plugin.c:51 msgid "Markdown Preview" msgstr "" -#: ../markdown/src/plugin.c:160 +#: ../markdown/src/plugin.c:162 msgid "The current document does not have a Markdown filetype." msgstr "" +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:35 +msgid "Pair Tag Highlighter" +msgstr "" + +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:36 +msgid "Finds and highlights matching opening/closing HTML tag" +msgstr "" + +#: ../pohelper/data/menus.ui.h:1 +msgid "_Translation Helper" +msgstr "" + +#: ../pohelper/data/menus.ui.h:2 +msgid "_Previous String" +msgstr "" + +#: ../pohelper/data/menus.ui.h:3 ../pohelper/src/gph-plugin.c:1031 +msgid "Go to previous string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:4 +msgid "_Next String" +msgstr "" + +#: ../pohelper/data/menus.ui.h:5 ../pohelper/src/gph-plugin.c:1034 +msgid "Go to next string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:6 +msgid "Pre_vious Untranslated" +msgstr "" + +#: ../pohelper/data/menus.ui.h:7 ../pohelper/src/gph-plugin.c:1037 +msgid "Go to previous untranslated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:8 +msgid "Next _Untranslated" +msgstr "" + +#: ../pohelper/data/menus.ui.h:9 ../pohelper/src/gph-plugin.c:1040 +msgid "Go to next untranslated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:10 +msgid "Previous Fu_zzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:11 ../pohelper/src/gph-plugin.c:1043 +msgid "Go to previous fuzzily translated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:12 +msgid "Next _Fuzzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:13 ../pohelper/src/gph-plugin.c:1046 +msgid "Go to next fuzzily translated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:14 +msgid "Previous Untranslated or Fuzz_y" +msgstr "" + +#: ../pohelper/data/menus.ui.h:15 ../pohelper/src/gph-plugin.c:1049 +msgid "Go to previous untranslated or fuzzy string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:16 +msgid "Next Untranslated _or Fuzzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:17 ../pohelper/src/gph-plugin.c:1053 +msgid "Go to next untranslated or fuzzy string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:18 ../pohelper/src/gph-plugin.c:1064 +#, fuzzy +msgid "Toggle current translation fuzziness" +msgstr "Інтэрактыўная даведка" + +#: ../pohelper/data/menus.ui.h:19 +msgid "_Toggle Fuzziness" +msgstr "" + +#: ../pohelper/data/menus.ui.h:20 +msgid "Paste _Message as Translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:21 +msgid "Paste the original untranslated string to the translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:22 ../pohelper/src/gph-plugin.c:1061 +msgid "Reflow the current translation string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:23 +msgid "_Reflow Translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:24 +msgid "" +"Whether to update the translation headers (author, revision date, ...) upon " +"file save" +msgstr "" + +#: ../pohelper/data/menus.ui.h:25 +msgid "Update _Headers Upon Save" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:41 +msgid "Translation Helper" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:42 +msgid "Improves support for GetText translation files." +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1057 +msgid "Paste original untranslated string to translation" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1099 +#, c-format +msgid "Failed to load configuration file: %s" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1124 +#, c-format +msgid "Failed to create configuration directory \"%s\": %s" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1127 +#, c-format +msgid "Failed to save configuration file: %s" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1182 +#, c-format +msgid "" +"Failed to load UI definition, please check your installation. The error was: " +"%s" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1222 +#, c-format +msgid "" +"Cannot find widget \"%s\" in the UI definition, please check your " +"installation." +msgstr "" + #: ../pretty-printer/src/PluginEntry.c:37 msgid "XML PrettyPrinter" msgstr "" @@ -4989,255 +5266,318 @@ msgstr "" #: ../scope/data/scope.glade.h:64 -msgid "_Evaluate/Modify" +msgid "_Raw" msgstr "" #: ../scope/data/scope.glade.h:65 -msgid "_Watch Expression" +msgid "_Evaluate/Modify" msgstr "" #: ../scope/data/scope.glade.h:66 +msgid "_Watch Expression" +msgstr "" + +#: ../scope/data/scope.glade.h:67 #, fuzzy msgid "_Inspect Variable" msgstr "Выдаліць праэкт" -#: ../scope/data/scope.glade.h:67 -msgid "Program Terminal" -msgstr "" - #: ../scope/data/scope.glade.h:68 msgid "Threads" msgstr "" -#: ../scope/data/scope.glade.h:70 +#: ../scope/data/scope.glade.h:69 msgid "Stack" msgstr "" -#: ../scope/data/scope.glade.h:71 +#: ../scope/data/scope.glade.h:70 msgid "Locals" msgstr "" -#: ../scope/data/scope.glade.h:72 +#: ../scope/data/scope.glade.h:71 msgid "Watches" msgstr "" -#: ../scope/data/scope.glade.h:73 +#: ../scope/data/scope.glade.h:72 msgid "Memory" msgstr "" -#: ../scope/data/scope.glade.h:74 -msgid "Debug Console" -msgstr "" - -#: ../scope/data/scope.glade.h:75 +#: ../scope/data/scope.glade.h:73 msgid "Enter gdb command:" msgstr "" -#: ../scope/data/scope.glade.h:76 +#: ../scope/data/scope.glade.h:74 msgid "Convert _UTF-8 to locale" msgstr "" -#: ../scope/data/scope.glade.h:77 +#: ../scope/data/scope.glade.h:75 msgid "_Thread" msgstr "" -#: ../scope/data/scope.glade.h:78 +#: ../scope/data/scope.glade.h:76 msgid "_Group" msgstr "" -#: ../scope/data/scope.glade.h:79 +#: ../scope/data/scope.glade.h:77 msgid "_Frame" msgstr "" -#: ../scope/data/scope.glade.h:80 +#: ../scope/data/scope.glade.h:78 msgid "Setup Program" msgstr "" -#: ../scope/data/scope.glade.h:81 +#: ../scope/data/scope.glade.h:79 msgid "_Executable:" msgstr "" -#: ../scope/data/scope.glade.h:82 +#: ../scope/data/scope.glade.h:80 msgid "_Arguments:" msgstr "" -#: ../scope/data/scope.glade.h:83 +#: ../scope/data/scope.glade.h:81 msgid "En_vironment:" msgstr "" -#: ../scope/data/scope.glade.h:84 +#: ../scope/data/scope.glade.h:82 msgid "_Working dir:" msgstr "" -#: ../scope/data/scope.glade.h:85 +#: ../scope/data/scope.glade.h:83 msgid "_Load script:" msgstr "" -#: ../scope/data/scope.glade.h:86 +#: ../scope/data/scope.glade.h:84 msgid "Auto _run program/exit gdb" msgstr "" -#: ../scope/data/scope.glade.h:87 +#: ../scope/data/scope.glade.h:85 msgid "_Non-stop mode" msgstr "" -#: ../scope/data/scope.glade.h:88 -msgid "_Temporary breakpoint at:" +#: ../scope/data/scope.glade.h:86 +msgid "_Temporary breakpoint on load at:" msgstr "" -#: ../scope/data/scope.glade.h:89 -msgid "_Delete all breakpoints, watches and inspects" +#: ../scope/data/scope.glade.h:87 +msgid "_Delete all breakpoints, watches, inspects and registers" msgstr "" -#: ../scope/data/scope.glade.h:90 ../scope/src/prefs.c:337 +#: ../scope/data/scope.glade.h:88 ../scope/src/scope.c:522 msgid "Program" msgstr "" -#: ../scope/data/scope.glade.h:91 +#: ../scope/data/scope.glade.h:89 msgid "Open on" msgstr "" -#: ../scope/data/scope.glade.h:92 +#: ../scope/data/scope.glade.h:90 msgid "g_db load" msgstr "" -#: ../scope/data/scope.glade.h:93 +#: ../scope/data/scope.glade.h:91 msgid "p_rogram start" msgstr "" -#: ../scope/data/scope.glade.h:94 +#: ../scope/data/scope.glade.h:92 msgid "Update all _views" msgstr "" -#: ../scope/data/scope.glade.h:95 +#: ../scope/data/scope.glade.h:93 msgid "Panel" msgstr "" -#: ../scope/data/scope.glade.h:96 +#: ../scope/data/scope.glade.h:94 msgid "Default 8-bit text mode:" msgstr "" -#: ../scope/data/scope.glade.h:97 +#: ../scope/data/scope.glade.h:95 msgid "_7-bit \\nnn" msgstr "" -#: ../scope/data/scope.glade.h:98 +#: ../scope/data/scope.glade.h:96 msgid "Display" msgstr "" -#: ../scope/data/scope.glade.h:99 +#: ../scope/data/scope.glade.h:97 msgid "_member" msgstr "" -#: ../scope/data/scope.glade.h:100 +#: ../scope/data/scope.glade.h:98 msgid "and" msgstr "" -#: ../scope/data/scope.glade.h:101 +#: ../scope/data/scope.glade.h:99 msgid "_argument" msgstr "" -#: ../scope/data/scope.glade.h:102 +#: ../scope/data/scope.glade.h:100 msgid "names" msgstr "" -#: ../scope/data/scope.glade.h:103 +#: ../scope/data/scope.glade.h:101 msgid "Values" msgstr "" -#: ../scope/data/scope.glade.h:104 +#: ../scope/data/scope.glade.h:102 msgid "E_xpand on apply" msgstr "" -#: ../scope/data/scope.glade.h:105 +#: ../scope/data/scope.glade.h:103 msgid "S_how" msgstr "" -#: ../scope/data/scope.glade.h:106 +#: ../scope/data/scope.glade.h:104 msgid "children" msgstr "" -#: ../scope/data/scope.glade.h:107 +#: ../scope/data/scope.glade.h:105 msgid "Inspect" msgstr "" -#: ../scope/data/scope.glade.h:108 +#: ../scope/data/scope.glade.h:106 msgid "Show =li_brary messages" msgstr "" -#: ../scope/data/scope.glade.h:109 +#: ../scope/data/scope.glade.h:107 msgid "Show _tooltips" msgstr "" -#: ../scope/data/scope.glade.h:110 +#: ../scope/data/scope.glade.h:108 msgid "Others" msgstr "" -#: ../scope/data/scope.glade.h:111 +#: ../scope/data/scope.glade.h:109 msgid "Options" msgstr "" -#: ../scope/data/scope.glade.h:112 +#: ../scope/data/scope.glade.h:110 msgid "_Import" msgstr "" -#: ../scope/data/scope.glade.h:113 +#: ../scope/data/scope.glade.h:111 msgid "Enter assignment expression:" msgstr "" -#: ../scope/data/scope.glade.h:114 +#: ../scope/data/scope.glade.h:112 msgid "Inspect" msgstr "" -#: ../scope/data/scope.glade.h:115 +#: ../scope/data/scope.glade.h:113 msgid "Object:" msgstr "" -#: ../scope/data/scope.glade.h:117 +#: ../scope/data/scope.glade.h:115 msgid "-" msgstr "" -#: ../scope/data/scope.glade.h:118 +#: ../scope/data/scope.glade.h:116 #, fuzzy msgid "Frame:" msgstr "Імя:" -#: ../scope/data/scope.glade.h:119 +#: ../scope/data/scope.glade.h:117 msgid "@" msgstr "" -#: ../scope/data/scope.glade.h:120 +#: ../scope/data/scope.glade.h:118 msgid "_Apply on run" msgstr "" -#: ../scope/data/scope.glade.h:121 +#: ../scope/data/scope.glade.h:119 msgid "Expand" msgstr "" -#: ../scope/data/scope.glade.h:122 +#: ../scope/data/scope.glade.h:120 msgid "Start:" msgstr "" -#: ../scope/data/scope.glade.h:123 +#: ../scope/data/scope.glade.h:121 msgid "Count:" msgstr "" -#: ../scope/data/scope.glade.h:124 +#: ../scope/data/scope.glade.h:122 msgid "_Expand on apply" msgstr "" -#: ../scope/src/break.c:947 +#: ../scope/data/scope.glade.h:123 ../scope/src/scope.c:522 +msgid "Program Terminal" +msgstr "" + +#: ../scope/data/scope.glade.h:125 +msgid "Registers" +msgstr "" + +#: ../scope/src/break.c:97 +msgid "breakpoint" +msgstr "" + +#: ../scope/src/break.c:98 +msgid "hardware breakpoint" +msgstr "" + +#: ../scope/src/break.c:99 +msgid "tracepoint" +msgstr "" + +#: ../scope/src/break.c:100 +msgid "fast tracepoint" +msgstr "" + +#: ../scope/src/break.c:101 +msgid "write watchpoint" +msgstr "" + +#: ../scope/src/break.c:104 +msgid "access watchpoint" +msgstr "" + +#: ../scope/src/break.c:106 +msgid "read watchpoint" +msgstr "" + +#: ../scope/src/break.c:108 +msgid "catchpoint" +msgstr "" + +#: ../scope/src/break.c:135 ../scope/src/break.c:139 +msgid "CLI" +msgstr "" + +#: ../scope/src/break.c:136 +msgid "unsupported MI" +msgstr "" + +#: ../scope/src/break.c:141 +msgid "on load" +msgstr "" + +#: ../scope/src/break.c:142 +msgid "Run to Cursor" +msgstr "" + +#: ../scope/src/break.c:1013 #, c-format msgid "" "There are two or more breakpoints at %s:%d.\n" +"\n" "Use the breakpoint list to remove the exact one." msgstr "" -#: ../scope/src/break.c:1200 +#: ../scope/src/break.c:1252 +#, c-format +msgid ", %s" +msgstr "" + +#: ../scope/src/break.c:1278 +#, c-format +msgid "func %s" +msgstr "" + +#: ../scope/src/break.c:1309 msgid "Add Breakpoint" msgstr "" -#: ../scope/src/break.c:1215 +#: ../scope/src/break.c:1324 msgid "Add Watchpoint" msgstr "" @@ -5249,7 +5589,8 @@ msgid "Enter char # (0..255):" msgstr "" -#: ../scope/src/conterm.c:466 ../scope/src/scope.c:502 +#: ../scope/src/conterm.c:509 ../scope/src/scope.c:550 +#: ../scope/src/scope.c:551 #, c-format msgid "Scope: %s." msgstr "" @@ -5268,61 +5609,62 @@ msgid "Program terminated." msgstr "" -#: ../scope/src/debug.c:468 +#: ../scope/src/debug.c:469 msgid "No breakpoints. Hanging." msgstr "" -#: ../scope/src/debug.c:596 ../scope/src/thread.c:97 +#: ../scope/src/debug.c:598 ../scope/src/thread.c:92 #, c-format msgid "%s." msgstr "" -#: ../scope/src/inspect.c:77 +#: ../scope/src/inspect.c:66 msgid "..." msgstr "" -#: ../scope/src/inspect.c:324 +#: ../scope/src/inspect.c:339 msgid "invalid data" msgstr "" -#: ../scope/src/inspect.c:356 +#: ../scope/src/inspect.c:371 msgid "no children in range" msgstr "" -#: ../scope/src/inspect.c:440 +#: ../scope/src/inspect.c:454 msgid "out of scope" msgstr "" -#: ../scope/src/inspect.c:587 +#: ../scope/src/inspect.c:627 msgid "Duplicate inspect variable name." msgstr "" -#: ../scope/src/memory.c:299 +#: ../scope/src/memory.c:292 msgid "Read Memory" msgstr "" -#: ../scope/src/memory.c:408 -msgid "Scope: pointer size > 8, Data disabled." +#: ../scope/src/memory.c:396 +#, c-format +msgid "Scope: pointer size > %d, Data disabled." msgstr "" -#: ../scope/src/menu.c:380 +#: ../scope/src/menu.c:375 msgid "Modify" msgstr "" -#: ../scope/src/menu.c:490 +#: ../scope/src/menu.c:481 msgid "Evaluate/modify" msgstr "" -#: ../scope/src/menu.c:491 +#: ../scope/src/menu.c:482 msgid "Watch expression" msgstr "" -#: ../scope/src/menu.c:492 +#: ../scope/src/menu.c:483 #, fuzzy msgid "Inspect variable" msgstr "Выдаліць праэкт" -#: ../scope/src/parse.c:416 +#: ../scope/src/parse.c:437 msgid "Undefined GDB error." msgstr "" @@ -5336,34 +5678,26 @@ msgid "Select File" msgstr "Выдаліць праэкт" -#: ../scope/src/prefs.c:338 -msgid "Breaks" -msgstr "" - -#: ../scope/src/prefs.c:339 -msgid "Console" -msgstr "" - -#: ../scope/src/prefs.c:347 ../scope/src/utils.c:570 +#: ../scope/src/prefs.c:294 ../scope/src/utils.c:438 #, c-format msgid "Scope: %s: %s." msgstr "" -#: ../scope/src/prefs.c:352 +#: ../scope/src/prefs.c:299 msgid "Scope: created configuration file." msgstr "" -#: ../scope/src/program.c:231 +#: ../scope/src/program.c:251 #, c-format msgid "Loaded debug settings for %s." msgstr "" -#: ../scope/src/program.c:239 +#: ../scope/src/program.c:259 #, c-format msgid "Could not load debug settings file %s: %s." msgstr "" -#: ../scope/src/program.c:359 +#: ../scope/src/program.c:379 #, c-format msgid "" "%s: %s.\n" @@ -5371,15 +5705,15 @@ "Continue?" msgstr "" -#: ../scope/src/program.c:394 -msgid "Delete all breakpoints, watches and inspects?" +#: ../scope/src/program.c:415 +msgid "Delete all breakpoints, watches et cetera?" msgstr "" -#: ../scope/src/program.c:501 +#: ../scope/src/program.c:523 msgid "as _Name=value" msgstr "" -#: ../scope/src/program.c:502 +#: ../scope/src/program.c:524 msgid "as _Name = value" msgstr "" @@ -5388,159 +5722,171 @@ msgstr "" #: ../scope/src/scope.c:35 -msgid "Simple GDB front-end." +msgid "Relatively simple GDB front-end." msgstr "" -#: ../scope/src/scope.c:63 +#: ../scope/src/scope.c:62 msgid "Setup program" msgstr "" -#: ../scope/src/scope.c:64 +#: ../scope/src/scope.c:63 msgid "Run/continue" msgstr "" -#: ../scope/src/scope.c:66 +#: ../scope/src/scope.c:65 msgid "Run to source" msgstr "" -#: ../scope/src/scope.c:70 +#: ../scope/src/scope.c:69 msgid "Terminate" msgstr "" -#: ../scope/src/scope.c:71 +#: ../scope/src/scope.c:70 msgid "Toggle breakpoint" msgstr "" -#: ../scope/src/scope.c:73 ../scope/src/scope.c:76 +#: ../scope/src/scope.c:72 ../scope/src/scope.c:75 msgid "GDB command" msgstr "" -#: ../scope/src/scope.c:74 +#: ../scope/src/scope.c:73 msgid "Show terminal" msgstr "" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Busy" msgstr "" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Ready" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Hang" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Assem" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Load" msgstr "" -#: ../scope/src/scope.c:394 +#: ../scope/src/scope.c:421 msgid "Build action activated. Terminate debugging?" msgstr "" -#: ../scope/src/thread.c:58 +#: ../scope/src/scope.c:524 +msgid "Breaks" +msgstr "" + +#: ../scope/src/scope.c:526 +msgid "Console" +msgstr "" + +#: ../scope/src/scope.c:526 +msgid "Debug Console" +msgstr "" + +#: ../scope/src/thread.c:48 #, c-format msgid "Thread group %s started." msgstr "" -#: ../scope/src/thread.c:76 +#: ../scope/src/thread.c:63 msgid "Thread group " msgstr "" -#: ../scope/src/thread.c:88 +#: ../scope/src/thread.c:83 msgid " exited" msgstr "" -#: ../scope/src/thread.c:91 +#: ../scope/src/thread.c:86 #, c-format msgid " with exit code %s" msgstr "" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 msgid "Send Signal" msgstr "" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 msgid "Enter signal #:" msgstr "" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Terminate Process" msgstr "" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Enter exit code:" msgstr "" -#: ../scope/src/thread.c:937 +#: ../scope/src/thread.c:891 msgid "Running" msgstr "" -#: ../scope/src/thread.c:938 +#: ../scope/src/thread.c:892 msgid "Stopped" msgstr "" -#: ../scope/src/utils.c:44 +#: ../scope/src/utils.c:45 #, c-format -msgid "%s: error %lu." +msgid "%s: %s" msgstr "" -#: ../scope/src/utils.c:358 +#: ../scope/src/utils.c:225 #, c-format msgid "Scope: error reading [%s]." msgstr "" -#: ../scope/src/views.c:505 +#: ../scope/src/views.c:526 msgid "…" msgstr "" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Send" msgstr "" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Busy" msgstr "" -#: ../scope/src/views.c:535 +#: ../scope/src/views.c:558 #, fuzzy msgid "GDB Command" msgstr "Каманда 0:" -#: ../spellcheck/src/speller.c:94 +#: ../spellcheck/src/speller.c:180 #, fuzzy msgid "Try: " msgstr "Тып:" -#: ../spellcheck/src/speller.c:173 +#: ../spellcheck/src/speller.c:252 msgid "Checking" msgstr "" -#: ../spellcheck/src/speller.c:186 +#: ../spellcheck/src/speller.c:265 #, c-format msgid "Checking file \"%s\" (lines %d to %d using %s):" msgstr "" -#: ../spellcheck/src/speller.c:196 +#: ../spellcheck/src/speller.c:275 #, c-format msgid "Checking file \"%s\" (using %s):" msgstr "" -#: ../spellcheck/src/speller.c:223 +#: ../spellcheck/src/speller.c:302 msgid "The checked text is spelled correctly." msgstr "" -#: ../spellcheck/src/speller.c:233 +#: ../spellcheck/src/speller.c:312 #, c-format msgid "The Enchant library couldn't be initialized (%s)." msgstr "" -#: ../spellcheck/src/speller.c:234 +#: ../spellcheck/src/speller.c:313 msgid "unknown error (maybe the chosen language is not available)" msgstr "" @@ -5631,17 +5977,17 @@ msgid "Ignore All" msgstr "" -#: ../spellcheck/src/gui.c:521 +#: ../spellcheck/src/gui.c:526 #, c-format msgid "Default (%s)" msgstr "" -#: ../spellcheck/src/gui.c:532 +#: ../spellcheck/src/gui.c:537 #, c-format msgid "Toggle spell check while typing (current language: %s)" msgstr "" -#: ../spellcheck/src/gui.c:587 +#: ../spellcheck/src/gui.c:592 msgid "Spelling Suggestions" msgstr "" @@ -5672,177 +6018,182 @@ #. OK. Something went not as expected. #. * We did have a selection but cannot parse it into rows. #. * Aborting -#: ../tableconvert/src/tableconvert.c:236 +#: ../tableconvert/src/tableconvert.c:237 msgid "Something went wrong on parsing selection. Aborting" msgstr "" -#: ../tableconvert/src/tableconvert.c:268 +#: ../tableconvert/src/tableconvert.c:269 msgid "Convert selection to table" msgstr "" #. Build up menu entry -#: ../tableconvert/src/tableconvert.c:281 +#: ../tableconvert/src/tableconvert.c:282 msgid "_Convert to table" msgstr "" -#: ../tableconvert/src/tableconvert.c:284 +#: ../tableconvert/src/tableconvert.c:285 msgid "Converts current marked list to a table." msgstr "" -#: ../treebrowser/src/treebrowser.c:120 +#: ../treebrowser/src/treebrowser.c:124 msgid "TreeBrowser" msgstr "" -#: ../treebrowser/src/treebrowser.c:121 +#: ../treebrowser/src/treebrowser.c:125 msgid "" "This plugin adds a tree browser to Geany, allowing the user to browse files " "using a tree view of the directory being browsed." msgstr "" -#: ../treebrowser/src/treebrowser.c:430 +#: ../treebrowser/src/treebrowser.c:434 #, c-format msgid "%s: no such directory." msgstr "" -#: ../treebrowser/src/treebrowser.c:526 ../treebrowser/src/treebrowser.c:561 -#: ../treebrowser/src/treebrowser.c:663 +#: ../treebrowser/src/treebrowser.c:537 ../treebrowser/src/treebrowser.c:572 +#: ../treebrowser/src/treebrowser.c:670 msgid "(Empty)" msgstr "" -#: ../treebrowser/src/treebrowser.c:966 +#: ../treebrowser/src/treebrowser.c:971 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "" -#: ../treebrowser/src/treebrowser.c:1037 +#: ../treebrowser/src/treebrowser.c:1042 #, fuzzy msgid "NewDirectory" msgstr "Выдаліць праэкт" -#: ../treebrowser/src/treebrowser.c:1039 +#: ../treebrowser/src/treebrowser.c:1044 #, fuzzy msgid "NewFile" msgstr "Дадаць файл" -#: ../treebrowser/src/treebrowser.c:1044 +#: ../treebrowser/src/treebrowser.c:1049 #, c-format msgid "" "Target file '%s' exists\n" ", do you really want to replace it with empty file?" msgstr "" -#: ../treebrowser/src/treebrowser.c:1089 +#: ../treebrowser/src/treebrowser.c:1095 #, c-format msgid "Do you really want to delete '%s' ?" msgstr "" -#: ../treebrowser/src/treebrowser.c:1208 ../treebrowser/src/treebrowser.c:1692 +#: ../treebrowser/src/treebrowser.c:1207 ../treebrowser/src/treebrowser.c:1738 msgid "Go up" msgstr "" -#: ../treebrowser/src/treebrowser.c:1212 ../treebrowser/src/treebrowser.c:1707 +#: ../treebrowser/src/treebrowser.c:1211 ../treebrowser/src/treebrowser.c:1753 msgid "Set path from document" msgstr "" -#: ../treebrowser/src/treebrowser.c:1216 -msgid "Open externally" +#: ../treebrowser/src/treebrowser.c:1215 +msgid "_Open externally" msgstr "" -#: ../treebrowser/src/treebrowser.c:1221 +#: ../treebrowser/src/treebrowser.c:1220 msgid "Open Terminal" msgstr "" -#: ../treebrowser/src/treebrowser.c:1225 +#: ../treebrowser/src/treebrowser.c:1224 msgid "Set as root" msgstr "" -#: ../treebrowser/src/treebrowser.c:1230 ../treebrowser/src/treebrowser.c:1697 -#: ../treebrowser/src/treebrowser.c:2060 +#: ../treebrowser/src/treebrowser.c:1229 ../treebrowser/src/treebrowser.c:1743 +#: ../treebrowser/src/treebrowser.c:2123 msgid "Refresh" msgstr "" -#: ../treebrowser/src/treebrowser.c:1242 +#: ../treebrowser/src/treebrowser.c:1233 +#, fuzzy +msgid "_Find in Files" +msgstr "Знайсьці і праэкце" + +#: ../treebrowser/src/treebrowser.c:1241 #, fuzzy msgid "Create new directory" msgstr "Выдаліць праэкт" -#: ../treebrowser/src/treebrowser.c:1246 +#: ../treebrowser/src/treebrowser.c:1245 msgid "Create new file" msgstr "" -#: ../treebrowser/src/treebrowser.c:1250 +#: ../treebrowser/src/treebrowser.c:1249 msgid "Rename" msgstr "" -#: ../treebrowser/src/treebrowser.c:1255 +#: ../treebrowser/src/treebrowser.c:1254 #, fuzzy msgid "Delete" msgstr "Выдаліць праэкт" -#: ../treebrowser/src/treebrowser.c:1263 +#: ../treebrowser/src/treebrowser.c:1262 #, c-format msgid "Close: %s" msgstr "" -#: ../treebrowser/src/treebrowser.c:1268 +#: ../treebrowser/src/treebrowser.c:1267 #, c-format msgid "Close Child Documents " msgstr "" -#: ../treebrowser/src/treebrowser.c:1273 -msgid "Copy full path to clipboard" +#: ../treebrowser/src/treebrowser.c:1272 +msgid "_Copy full path to clipboard" msgstr "" -#: ../treebrowser/src/treebrowser.c:1293 ../treebrowser/src/treebrowser.c:1974 +#: ../treebrowser/src/treebrowser.c:1292 ../treebrowser/src/treebrowser.c:2032 msgid "Show bookmarks" msgstr "" -#: ../treebrowser/src/treebrowser.c:1298 ../treebrowser/src/treebrowser.c:1928 +#: ../treebrowser/src/treebrowser.c:1297 ../treebrowser/src/treebrowser.c:1981 msgid "Show hidden files" msgstr "" -#: ../treebrowser/src/treebrowser.c:1303 +#: ../treebrowser/src/treebrowser.c:1302 msgid "Show toolbars" msgstr "" -#: ../treebrowser/src/treebrowser.c:1574 +#: ../treebrowser/src/treebrowser.c:1621 #, c-format msgid "Target file '%s' exists, do you really want to replace it?" msgstr "" -#: ../treebrowser/src/treebrowser.c:1702 +#: ../treebrowser/src/treebrowser.c:1748 msgid "Home" msgstr "" -#: ../treebrowser/src/treebrowser.c:1712 +#: ../treebrowser/src/treebrowser.c:1758 #, fuzzy msgid "Track path" msgstr "Базавы шлях:" -#: ../treebrowser/src/treebrowser.c:1717 +#: ../treebrowser/src/treebrowser.c:1763 #, fuzzy msgid "Hide bars" msgstr "Схаваць сайдбар" -#: ../treebrowser/src/treebrowser.c:1727 +#: ../treebrowser/src/treebrowser.c:1773 msgid "" "Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' " "reverse try for example this '!;*.c;*.h;*.cpp'" msgstr "" -#: ../treebrowser/src/treebrowser.c:1735 +#: ../treebrowser/src/treebrowser.c:1781 msgid "Addressbar for example '/projects/my-project'" msgstr "" -#: ../treebrowser/src/treebrowser.c:1760 +#: ../treebrowser/src/treebrowser.c:1806 msgid "Tree Browser" msgstr "" -#: ../treebrowser/src/treebrowser.c:1892 +#: ../treebrowser/src/treebrowser.c:1945 msgid "External open command" msgstr "" -#: ../treebrowser/src/treebrowser.c:1897 +#: ../treebrowser/src/treebrowser.c:1950 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -5852,100 +6203,108 @@ "filename" msgstr "" -#: ../treebrowser/src/treebrowser.c:1905 +#: ../treebrowser/src/treebrowser.c:1958 msgid "Toolbar" msgstr "" -#: ../treebrowser/src/treebrowser.c:1907 +#: ../treebrowser/src/treebrowser.c:1960 msgid "Hidden" msgstr "" -#: ../treebrowser/src/treebrowser.c:1908 +#: ../treebrowser/src/treebrowser.c:1961 msgid "Top" msgstr "" -#: ../treebrowser/src/treebrowser.c:1909 +#: ../treebrowser/src/treebrowser.c:1962 msgid "Bottom" msgstr "" -#: ../treebrowser/src/treebrowser.c:1914 +#: ../treebrowser/src/treebrowser.c:1967 msgid "If position is changed, the option require plugin restart." msgstr "" -#: ../treebrowser/src/treebrowser.c:1918 +#: ../treebrowser/src/treebrowser.c:1971 msgid "Show icons" msgstr "" -#: ../treebrowser/src/treebrowser.c:1920 +#: ../treebrowser/src/treebrowser.c:1973 msgid "None" msgstr "" -#: ../treebrowser/src/treebrowser.c:1921 +#: ../treebrowser/src/treebrowser.c:1974 #, fuzzy msgid "Base" msgstr "Базавы шлях:" -#: ../treebrowser/src/treebrowser.c:1922 +#: ../treebrowser/src/treebrowser.c:1975 msgid "Content-type" msgstr "" -#: ../treebrowser/src/treebrowser.c:1933 +#: ../treebrowser/src/treebrowser.c:1986 msgid "On Windows, this just hide files that are prefixed with '.' (dot)" msgstr "" -#: ../treebrowser/src/treebrowser.c:1935 +#: ../treebrowser/src/treebrowser.c:1988 msgid "Hide object files" msgstr "" -#: ../treebrowser/src/treebrowser.c:1940 +#: ../treebrowser/src/treebrowser.c:1993 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" msgstr "" -#: ../treebrowser/src/treebrowser.c:1942 +#: ../treebrowser/src/treebrowser.c:1995 #, fuzzy msgid "Reverse filter" msgstr "Выдаліць файл" -#: ../treebrowser/src/treebrowser.c:1947 +#: ../treebrowser/src/treebrowser.c:2000 msgid "Follow current document" msgstr "" -#: ../treebrowser/src/treebrowser.c:1952 +#: ../treebrowser/src/treebrowser.c:2005 msgid "Single click, open document and focus it" msgstr "" -#: ../treebrowser/src/treebrowser.c:1957 +#: ../treebrowser/src/treebrowser.c:2010 msgid "Double click open directory" msgstr "" -#: ../treebrowser/src/treebrowser.c:1962 +#: ../treebrowser/src/treebrowser.c:2015 msgid "On delete file, close it if is opened" msgstr "" -#: ../treebrowser/src/treebrowser.c:1967 +#: ../treebrowser/src/treebrowser.c:2020 +msgid "Focus editor on file open" +msgstr "" + +#: ../treebrowser/src/treebrowser.c:2025 msgid "Show tree lines" msgstr "" -#: ../treebrowser/src/treebrowser.c:2050 +#: ../treebrowser/src/treebrowser.c:2037 +msgid "Open new files" +msgstr "" + +#: ../treebrowser/src/treebrowser.c:2113 msgid "Focus File List" msgstr "" -#: ../treebrowser/src/treebrowser.c:2052 +#: ../treebrowser/src/treebrowser.c:2115 msgid "Focus Path Entry" msgstr "" -#: ../treebrowser/src/treebrowser.c:2054 +#: ../treebrowser/src/treebrowser.c:2117 msgid "Rename Object" msgstr "" -#: ../treebrowser/src/treebrowser.c:2056 +#: ../treebrowser/src/treebrowser.c:2119 #, fuzzy msgid "Create New File" msgstr "Выдаліць праэкт" -#: ../treebrowser/src/treebrowser.c:2058 +#: ../treebrowser/src/treebrowser.c:2121 #, fuzzy msgid "Create New Directory" msgstr "Выдаліць праэкт" @@ -6012,44 +6371,44 @@ msgid "utility" msgstr "" -#: ../webhelper/src/gwh-settings.c:775 +#: ../webhelper/src/gwh-settings.c:782 #, c-format msgid "%s:" msgstr "" -#: ../webhelper/src/gwh-browser.c:528 +#: ../webhelper/src/gwh-browser.c:534 msgid "_Zoom" msgstr "" -#: ../webhelper/src/gwh-browser.c:550 +#: ../webhelper/src/gwh-browser.c:556 msgid "Full-_content zoom" msgstr "" -#: ../webhelper/src/gwh-browser.c:561 +#: ../webhelper/src/gwh-browser.c:567 msgid "Flip panes orientation" msgstr "" -#: ../webhelper/src/gwh-browser.c:808 +#: ../webhelper/src/gwh-browser.c:814 msgid "Back" msgstr "" -#: ../webhelper/src/gwh-browser.c:812 +#: ../webhelper/src/gwh-browser.c:818 msgid "Forward" msgstr "" -#: ../webhelper/src/gwh-browser.c:816 +#: ../webhelper/src/gwh-browser.c:822 msgid "Cancel loading" msgstr "" -#: ../webhelper/src/gwh-browser.c:820 +#: ../webhelper/src/gwh-browser.c:826 msgid "Reload current page" msgstr "" -#: ../webhelper/src/gwh-browser.c:833 ../webhelper/src/gwh-browser.c:879 +#: ../webhelper/src/gwh-browser.c:839 ../webhelper/src/gwh-browser.c:885 msgid "Web inspector" msgstr "" -#: ../webhelper/src/gwh-browser.c:834 +#: ../webhelper/src/gwh-browser.c:840 msgid "Toggle web inspector" msgstr "" diff -Nru geany-plugins-1.23+dfsg/po/ca.po geany-plugins-1.24+dfsg/po/ca.po --- geany-plugins-1.23+dfsg/po/ca.po 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/po/ca.po 2014-04-12 14:28:39.000000000 +0000 @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Geany-plugins 1.23\n" +"Project-Id-Version: Geany-plugins 1.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-03 05:19+0000\n" +"POT-Creation-Date: 2014-03-30 19:33+0200\n" "PO-Revision-Date: 2013-03-07 23:48+0100\n" "Last-Translator: Toni Garcia-Navarro \n" "Language-Team: ca \n" @@ -30,20 +30,17 @@ msgid "No." msgstr "No." -#: ../addons/src/ao_bookmarklist.c:341 -#: ../devhelp/src/dhp-object.c:494 +#: ../addons/src/ao_bookmarklist.c:341 ../devhelp/src/dhp-object.c:494 #: ../devhelp/devhelp/dh-window.c:1142 msgid "Contents" msgstr "Continguts" -#: ../addons/src/ao_bookmarklist.c:374 -#: ../treebrowser/src/treebrowser.c:615 +#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:625 msgid "Bookmarks" msgstr "Marcadors" #. complete update -#: ../addons/src/ao_tasks.c:373 -#: ../geanyvc/src/geanyvc.c:2295 +#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2351 msgid "_Update" msgstr "Act_ualitza" @@ -51,13 +48,11 @@ msgid "_Hide Message Window" msgstr "_Amaga la Finestra de Missatges" -#: ../addons/src/ao_tasks.c:412 -#: ../debugger/src/stree.c:387 +#: ../addons/src/ao_tasks.c:412 ../debugger/src/stree.c:387 msgid "File" msgstr "Fitxer" -#: ../addons/src/ao_tasks.c:423 -#: ../debugger/src/bptree.c:702 +#: ../addons/src/ao_tasks.c:423 ../debugger/src/bptree.c:702 #: ../debugger/src/stree.c:394 msgid "Line" msgstr "Línia" @@ -65,10 +60,8 @@ #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../addons/src/ao_tasks.c:434 -#: ../debugger/src/vtree.c:204 -#: ../devhelp/devhelp/dh-link.c:287 -#: ../geanylatex/src/bibtexlabels.c:68 +#: ../addons/src/ao_tasks.c:434 ../debugger/src/vtree.c:204 +#: ../devhelp/devhelp/dh-link.c:287 ../geanylatex/src/bibtexlabels.c:68 msgid "Type" msgstr "Tipus" @@ -84,17 +77,19 @@ msgid "Context:" msgstr "Context:" -#: ../addons/src/ao_xmltagging.c:56 +#: ../addons/src/ao_xmltagging.c:54 msgid "XML tagging" msgstr "" -#: ../addons/src/ao_xmltagging.c:67 +#: ../addons/src/ao_xmltagging.c:65 msgid "Tag name to be inserted:" msgstr "Nom de la etiqueta a inserir:" -#: ../addons/src/ao_xmltagging.c:71 +#: ../addons/src/ao_xmltagging.c:69 #, c-format -msgid "%s will be replaced with your current selection. Please keep care on your selection" +msgid "" +"%s will be replaced with your current selection. Please keep care on your " +"selection" msgstr "" #: ../addons/src/ao_openuri.c:165 @@ -158,15 +153,12 @@ msgid "Run XML tagging" msgstr "" -#: ../addons/src/addons.c:417 -#: ../geanylatex/src/geanylatex.c:241 -#: ../geanyprj/src/geanyprj.c:174 -#: ../geanysendmail/src/geanysendmail.c:121 -#: ../geanysendmail/src/geanysendmail.c:287 -#: ../geanyvc/src/geanyvc.c:1798 -#: ../geniuspaste/src/geniuspaste.c:140 -#: ../spellcheck/src/scplugin.c:146 -#: ../treebrowser/src/treebrowser.c:1880 +#: ../addons/src/addons.c:417 ../autoclose/src/autoclose.c:871 +#: ../geanylatex/src/geanylatex.c:241 ../geanyprj/src/geanyprj.c:174 +#: ../geanysendmail/src/geanysendmail.c:123 +#: ../geanysendmail/src/geanysendmail.c:291 ../geanyvc/src/geanyvc.c:1854 +#: ../geniuspaste/src/geniuspaste.c:140 ../spellcheck/src/scplugin.c:146 +#: ../treebrowser/src/treebrowser.c:1933 #: ../updatechecker/src/updatechecker.c:253 msgid "Plugin configuration directory could not be created." msgstr "No s'ha pogut crear el directori de configuració de connectors." @@ -212,7 +204,9 @@ msgstr "" #: ../addons/src/addons.c:504 -msgid "Whether to show the tasks of all open documents in the list or only those of the current document." +msgid "" +"Whether to show the tasks of all open documents in the list or only those of " +"the current document." msgstr "" #: ../addons/src/addons.c:511 @@ -251,6 +245,14 @@ msgid "Enclose selection automatically (without having to press a keybinding)" msgstr "" +#: ../autoclose/src/autoclose.c:50 +msgid "Auto-close" +msgstr "" + +#: ../autoclose/src/autoclose.c:51 +msgid "Auto-close braces and brackets with lot of features" +msgstr "" + #: ../codenav/src/codenavigation.c:52 msgid "Code navigation" msgstr "Navegació del codi" @@ -264,8 +266,7 @@ msgstr "" #. Add the menu item, sensitive only when a document is opened -#: ../codenav/src/goto_file.c:57 -#: ../codenav/src/goto_file.c:71 +#: ../codenav/src/goto_file.c:57 ../codenav/src/goto_file.c:71 msgid "Goto file" msgstr "Ves al fitxer" @@ -276,8 +277,7 @@ #. Add the menu item and make it sensitive only when a document is opened #. Frame, which is the returned widget -#: ../codenav/src/switch_head_impl.c:85 -#: ../codenav/src/switch_head_impl.c:99 +#: ../codenav/src/switch_head_impl.c:85 ../codenav/src/switch_head_impl.c:99 #: ../codenav/src/switch_head_impl.c:461 msgid "Switch header/implementation" msgstr "Canvia entre capçalera/implementació" @@ -315,20 +315,16 @@ msgid "Various debuggers integration." msgstr "" -#: ../debugger/src/plugin.c:131 -#: ../debugger/src/keys.c:76 -#: ../scope/data/scope.glade.h:16 -#: ../scope/src/scope.c:225 +#: ../debugger/src/plugin.c:133 ../debugger/src/keys.c:76 +#: ../scope/data/scope.glade.h:124 ../scope/src/scope.c:226 msgid "Debug" msgstr "Depuració" -#: ../debugger/src/vtree.c:173 -#: ../debugger/src/envtree.c:417 +#: ../debugger/src/vtree.c:173 ../debugger/src/envtree.c:417 msgid "Name" msgstr "Nom" -#: ../debugger/src/vtree.c:196 -#: ../debugger/src/envtree.c:422 +#: ../debugger/src/vtree.c:196 ../debugger/src/envtree.c:422 msgid "Value" msgstr "Valor" @@ -361,8 +357,7 @@ msgstr "Variables d'Entorn" #. if name is empty - offer to delete variable -#: ../debugger/src/envtree.c:260 -#: ../debugger/src/envtree.c:364 +#: ../debugger/src/envtree.c:260 ../debugger/src/envtree.c:364 #: ../debugger/src/debug.c:254 msgid "Delete variable?" msgstr "Elimina la variable?" @@ -398,9 +393,7 @@ msgstr "" #: ../debugger/src/dbm_gdb.c:782 -msgid "" -"~\"Loading target file.\\n" -"\"" +msgid "~\"Loading target file.\\n\"" msgstr "" #: ../debugger/src/dbm_gdb.c:782 @@ -410,8 +403,7 @@ #. setting asyncronous mode #. setting null-stop array printing #. enable pretty printing -#: ../debugger/src/dbm_gdb.c:786 -#: ../debugger/src/dbm_gdb.c:789 +#: ../debugger/src/dbm_gdb.c:786 ../debugger/src/dbm_gdb.c:789 #: ../debugger/src/dbm_gdb.c:792 msgid "Error configuring GDB" msgstr "S'ha produït un error en configurar GDB" @@ -436,16 +428,14 @@ msgid "Click an arrow to switch to a frame" msgstr "" -#: ../debugger/src/stree.c:363 -#: ../geanylatex/src/bibtexlabels.c:46 +#: ../debugger/src/stree.c:363 ../geanylatex/src/bibtexlabels.c:46 msgid "Address" msgstr "Adreça" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../debugger/src/stree.c:381 -#: ../devhelp/devhelp/dh-link.c:267 +#: ../debugger/src/stree.c:381 ../devhelp/devhelp/dh-link.c:267 msgid "Function" msgstr "Funció" @@ -458,8 +448,7 @@ msgid "Target" msgstr "Objectiu" -#: ../debugger/src/tabs.c:135 -#: ../scope/data/scope.glade.h:12 +#: ../debugger/src/tabs.c:135 ../scope/src/scope.c:524 msgid "Breakpoints" msgstr "Punts de ruptura" @@ -487,37 +476,31 @@ msgid "Run / Continue" msgstr "Executa / Continua" -#: ../debugger/src/keys.c:50 -#: ../debugger/src/btnpanel.c:101 +#: ../debugger/src/keys.c:50 ../debugger/src/btnpanel.c:101 msgid "Stop" msgstr "Atura" -#: ../debugger/src/keys.c:51 -#: ../debugger/src/btnpanel.c:98 +#: ../debugger/src/keys.c:51 ../debugger/src/btnpanel.c:98 msgid "Restart" msgstr "Reinicia" -#: ../debugger/src/keys.c:52 -#: ../debugger/src/btnpanel.c:113 -#: ../scope/src/scope.c:67 +#: ../debugger/src/keys.c:52 ../debugger/src/btnpanel.c:113 +#: ../scope/src/scope.c:66 msgid "Step into" msgstr "Pas avant" -#: ../debugger/src/keys.c:53 -#: ../debugger/src/btnpanel.c:110 -#: ../scope/src/scope.c:68 +#: ../debugger/src/keys.c:53 ../debugger/src/btnpanel.c:110 +#: ../scope/src/scope.c:67 msgid "Step over" msgstr "" -#: ../debugger/src/keys.c:54 -#: ../debugger/src/btnpanel.c:122 -#: ../scope/src/scope.c:69 +#: ../debugger/src/keys.c:54 ../debugger/src/btnpanel.c:122 +#: ../scope/src/scope.c:68 msgid "Step out" msgstr "Pas enrere" -#: ../debugger/src/keys.c:55 -#: ../debugger/src/btnpanel.c:125 -#: ../scope/src/scope.c:65 +#: ../debugger/src/keys.c:55 ../debugger/src/btnpanel.c:125 +#: ../scope/src/scope.c:64 msgid "Run to cursor" msgstr "" @@ -526,7 +509,8 @@ msgstr "Afegeix / Suprimeix el punt de ruptura" #: ../debugger/src/keys.c:57 -msgid "Jump to the currect instruction" +#, fuzzy +msgid "Jump to the current instruction" msgstr "Salta a la instrucció actual" #: ../debugger/src/watch_model.c:220 @@ -537,8 +521,7 @@ msgid "To edit source files stop debugging session" msgstr "" -#: ../debugger/src/btnpanel.c:90 -#: ../debugger/src/btnpanel.c:159 +#: ../debugger/src/btnpanel.c:90 ../debugger/src/btnpanel.c:159 msgid "Run" msgstr "Executa" @@ -558,6 +541,14 @@ msgid "Save debug session data to a project" msgstr "" +#: ../defineformat/src/defineformat.c:56 +msgid "Define formatter" +msgstr "" + +#: ../defineformat/src/defineformat.c:57 +msgid "Automatically align backslash in multi-line defines" +msgstr "" + #. never search for more than this many chars #: ../devhelp/src/dhp.h:38 msgid "Documentation" @@ -573,10 +564,8 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../devhelp/src/dhp-object.c:390 -#: ../devhelp/src/dhp-object.c:503 -#: ../devhelp/devhelp/dh-window.c:727 -#: ../devhelp/devhelp/dh-window.c:1034 +#: ../devhelp/src/dhp-object.c:390 ../devhelp/src/dhp-object.c:503 +#: ../devhelp/devhelp/dh-window.c:727 ../devhelp/devhelp/dh-window.c:1034 #: ../devhelp/devhelp/dh-window.c:1863 msgid "Devhelp" msgstr "" @@ -601,8 +590,7 @@ msgid "Zoom out" msgstr "Allunya" -#: ../devhelp/src/dhp-object.c:497 -#: ../devhelp/devhelp/dh-window.c:1152 +#: ../devhelp/src/dhp-object.c:497 ../devhelp/devhelp/dh-window.c:1152 msgid "Search" msgstr "Cerca" @@ -616,7 +604,9 @@ msgstr "" #: ../devhelp/src/dhp-plugin.c:43 -msgid "Adds support for looking up documentation in Devhelp, manual pages, and Google Code Search in the integrated viewer." +msgid "" +"Adds support for looking up documentation in Devhelp, manual pages, and " +"Google Code Search in the integrated viewer." msgstr "" #: ../devhelp/src/dhp-plugin.c:119 @@ -668,8 +658,7 @@ msgstr "Llibre:" #. i18n: a documentation book -#: ../devhelp/devhelp/dh-link.c:255 -#: ../geanylatex/src/geanylatex.c:1760 +#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1759 msgid "Book" msgstr "Llibre" @@ -705,10 +694,8 @@ msgid "Enum" msgstr "Enum" -#: ../devhelp/devhelp/dh-parser.c:91 -#: ../devhelp/devhelp/dh-parser.c:185 -#: ../devhelp/devhelp/dh-parser.c:249 -#: ../devhelp/devhelp/dh-parser.c:259 +#: ../devhelp/devhelp/dh-parser.c:91 ../devhelp/devhelp/dh-parser.c:185 +#: ../devhelp/devhelp/dh-parser.c:249 ../devhelp/devhelp/dh-parser.c:259 #, c-format msgid "Expected '%s', got '%s' at line %d, column %d" msgstr "S'esperava '%s', però s'ha obtingut '%s' a la línia %d, columna %d" @@ -720,17 +707,21 @@ #: ../devhelp/devhelp/dh-parser.c:136 #, c-format -msgid "\"title\", \"name\" and \"link\" elements are required at line %d, column %d" +msgid "" +"\"title\", \"name\" and \"link\" elements are required at line %d, column %d" msgstr "" #: ../devhelp/devhelp/dh-parser.c:204 #, c-format -msgid "\"name\" and \"link\" elements are required inside on line %d, column %d" +msgid "" +"\"name\" and \"link\" elements are required inside on line %d, column " +"%d" msgstr "" #: ../devhelp/devhelp/dh-parser.c:284 #, c-format -msgid "\"name\" and \"link\" elements are required inside '%s' on line %d, column %d" +msgid "" +"\"name\" and \"link\" elements are required inside '%s' on line %d, column %d" msgstr "" #: ../devhelp/devhelp/dh-parser.c:297 @@ -795,14 +786,12 @@ msgid "A developers' help browser for GNOME" msgstr "Un navegador d'ajuda per a desenvolupadors per al GNOME" -#: ../devhelp/devhelp/dh-window.c:759 -#: ../geanyvc/src/geanyvc.c:2010 +#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2066 msgid "_File" msgstr "_Fitxer" -#: ../devhelp/devhelp/dh-window.c:760 -#: ../geanymacro/src/geanymacro.c:1815 -#: ../geanymacro/src/geanymacro.c:2112 +#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1822 +#: ../geanymacro/src/geanymacro.c:2118 msgid "_Edit" msgstr "_Edita" @@ -831,13 +820,11 @@ msgid "_Print…" msgstr "Im_primir..." -#: ../devhelp/devhelp/dh-window.c:782 -#: ../devhelp/devhelp/eggfindbar.c:342 +#: ../devhelp/devhelp/dh-window.c:782 ../devhelp/devhelp/eggfindbar.c:342 msgid "Find Next" msgstr "Cerca el Següent" -#: ../devhelp/devhelp/dh-window.c:784 -#: ../devhelp/devhelp/eggfindbar.c:329 +#: ../devhelp/devhelp/dh-window.c:784 ../devhelp/devhelp/eggfindbar.c:329 msgid "Find Previous" msgstr "Cerca l'Anterior" @@ -915,8 +902,7 @@ msgid "Error opening the requested link." msgstr "S'ha produït un error en obrir l'enllaç." -#: ../devhelp/devhelp/dh-window.c:1649 -#: ../devhelp/devhelp/dh-window.c:1891 +#: ../devhelp/devhelp/dh-window.c:1649 ../devhelp/devhelp/dh-window.c:1891 msgid "Empty Page" msgstr "Pàgina Buida" @@ -924,13 +910,11 @@ msgid "Find:" msgstr "Cerca:" -#: ../devhelp/devhelp/eggfindbar.c:333 -#: ../devhelp/devhelp/eggfindbar.c:336 +#: ../devhelp/devhelp/eggfindbar.c:333 ../devhelp/devhelp/eggfindbar.c:336 msgid "Find previous occurrence of the search string" msgstr "Cerca l'anterior ocurrència de la cadena de cerca" -#: ../devhelp/devhelp/eggfindbar.c:346 -#: ../devhelp/devhelp/eggfindbar.c:349 +#: ../devhelp/devhelp/eggfindbar.c:346 ../devhelp/devhelp/eggfindbar.c:349 msgid "Find next occurrence of the search string" msgstr "Cerca la següent ocurrència de cadena de cerca" @@ -938,14 +922,12 @@ msgid "C_ase Sensitive" msgstr "_Diferencia entre Majúscules i Minúscules" -#: ../devhelp/devhelp/eggfindbar.c:362 -#: ../devhelp/devhelp/eggfindbar.c:365 +#: ../devhelp/devhelp/eggfindbar.c:362 ../devhelp/devhelp/eggfindbar.c:365 msgid "Toggle case sensitive search" msgstr "Commuta a una cerca que distingeixi entre majúscules i minúscules" #. All plugins must set name, description, version and author. -#: ../geanydoc/src/geanydoc.c:50 -#: ../geanydoc/src/geanydoc.c:347 +#: ../geanydoc/src/geanydoc.c:50 ../geanydoc/src/geanydoc.c:347 msgid "Doc" msgstr "Document" @@ -953,8 +935,7 @@ msgid "Call documentation viewer on current symbol." msgstr "" -#: ../geanydoc/src/geanydoc.c:170 -#: ../geanyvc/src/geanyvc.c:416 +#: ../geanydoc/src/geanydoc.c:170 ../geanyvc/src/geanyvc.c:416 msgid "Could not parse the output of command" msgstr "No s'ha pogut llegir l'eixida de l'ordre" @@ -990,55 +971,64 @@ msgid "Column mode, select to line / brace / anchor." msgstr "" -#: ../geanyextrasel/src/extrasel.c:482 +#: ../geanyextrasel/src/extrasel.c:502 msgid "E_xtra Selection" msgstr "Selecció A_ddicional" -#: ../geanyextrasel/src/extrasel.c:489 +#: ../geanyextrasel/src/extrasel.c:509 msgid "_Column Mode" msgstr "Modalitat de _Columna" -#: ../geanyextrasel/src/extrasel.c:494 +#: ../geanyextrasel/src/extrasel.c:514 msgid "Column mode" msgstr "Modalitat de columna" -#: ../geanyextrasel/src/extrasel.c:496 +#: ../geanyextrasel/src/extrasel.c:516 msgid "Select to _Line" msgstr "Selecciona Fins a la _Línia" -#: ../geanyextrasel/src/extrasel.c:500 +#: ../geanyextrasel/src/extrasel.c:520 msgid "Select to line" msgstr "Selecciona fins a la línia" -#: ../geanyextrasel/src/extrasel.c:502 +#: ../geanyextrasel/src/extrasel.c:522 msgid "Select to Matching _Brace" msgstr "Vés al Parèntesi _Corresponent" -#: ../geanyextrasel/src/extrasel.c:506 +#: ../geanyextrasel/src/extrasel.c:526 msgid "Select to matching brace" msgstr "Vés al parèntesi corresponent" -#: ../geanyextrasel/src/extrasel.c:510 +#: ../geanyextrasel/src/extrasel.c:528 +msgid "_Toggle Stream/Rectangular" +msgstr "" + +#: ../geanyextrasel/src/extrasel.c:532 +#, fuzzy +msgid "Convert selection" +msgstr "Converteix la selecció en una taula" + +#: ../geanyextrasel/src/extrasel.c:537 msgid "_Set Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:514 +#: ../geanyextrasel/src/extrasel.c:541 msgid "Set anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:516 +#: ../geanyextrasel/src/extrasel.c:543 msgid "Select to _Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:520 +#: ../geanyextrasel/src/extrasel.c:547 msgid "Select to anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:522 +#: ../geanyextrasel/src/extrasel.c:549 msgid "_Rectangle Select to Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:527 +#: ../geanyextrasel/src/extrasel.c:554 msgid "Rectangle select to anchor" msgstr "" @@ -1217,7 +1207,9 @@ #: ../geanygendoc/src/ggd-plugin.c:318 #, c-format msgid "Failed to find configuration file for file type \"%s\": %s" -msgstr "No s'ha pogut trobar un fitxer de configuració per al tipus de fitxer \"%s\": %s" +msgstr "" +"No s'ha pogut trobar un fitxer de configuració per al tipus de fitxer \"%s" +"\": %s" #: ../geanygendoc/src/ggd-plugin.c:330 msgid "" @@ -1231,8 +1223,7 @@ msgid "Failed to load file \"%s\": %s" msgstr "No s'ha pogut carregar el fitxer \"%s\": %s" -#: ../geanygendoc/src/ggd-plugin.c:415 -#: ../geanygendoc/src/ggd-plugin.c:426 +#: ../geanygendoc/src/ggd-plugin.c:415 ../geanygendoc/src/ggd-plugin.c:426 msgid "Insert Documentation Comment" msgstr "" @@ -1292,7 +1283,13 @@ msgstr "De_sar el fitxer abans de generar la documentació" #: ../geanygendoc/src/ggd-plugin.c:627 -msgid "Whether the current document should be saved to disc before generating the documentation. This is a technical detail, but it is currently needed to have an up-to-date tag list. If you disable this option and ask for documentation generation on a modified document, the behavior may be surprising since the comment will be generated for the last saved state of this document and not the current one." +msgid "" +"Whether the current document should be saved to disc before generating the " +"documentation. This is a technical detail, but it is currently needed to " +"have an up-to-date tag list. If you disable this option and ask for " +"documentation generation on a modified document, the behavior may be " +"surprising since the comment will be generated for the last saved state of " +"this document and not the current one." msgstr "" #. indent @@ -1301,7 +1298,9 @@ msgstr "" #: ../geanygendoc/src/ggd-plugin.c:639 -msgid "Whether the inserted documentation should be indented to fit the indentation at the insertion position." +msgid "" +"Whether the inserted documentation should be indented to fit the indentation " +"at the insertion position." msgstr "" #. Documentation type @@ -1311,7 +1310,10 @@ msgstr "Tipus de documentació" #: ../geanygendoc/src/ggd-plugin.c:656 -msgid "Choose the documentation type to use with each file type. The special language \"All\" on top of the list is used to choose the default documentation type, used for all languages that haven't one set." +msgid "" +"Choose the documentation type to use with each file type. The special " +"language \"All\" on top of the list is used to choose the default " +"documentation type, used for all languages that haven't one set." msgstr "" #. Environ editor @@ -1320,11 +1322,12 @@ msgstr "Entorn global" #: ../geanygendoc/src/ggd-plugin.c:664 -msgid "Global environment overrides and additions. This environment will be merged with the file-type-specific ones." +msgid "" +"Global environment overrides and additions. This environment will be merged " +"with the file-type-specific ones." msgstr "" -#: ../geanygendoc/src/ggd-utils.c:184 -#: ../geanygendoc/src/ggd-utils.c:195 +#: ../geanygendoc/src/ggd-utils.c:184 ../geanygendoc/src/ggd-utils.c:195 #, c-format msgid "File \"%s\" exists but is not a regular file" msgstr "El fitxer \"%s\" existeix però no és un fitxer normal" @@ -1341,7 +1344,8 @@ #: ../geanygendoc/src/ggd.c:114 #, c-format -msgid "Argument parsing regular expression did not match (argument list was: \"%s\")" +msgid "" +"Argument parsing regular expression did not match (argument list was: \"%s\")" msgstr "" #: ../geanygendoc/src/ggd.c:248 @@ -1378,7 +1382,9 @@ msgstr "Opció desconeguda" #: ../geanygendoc/src/ggd-options.c:335 -msgid "Invalid option or proxy: either the proxy's property or the option type is incompatible." +msgid "" +"Invalid option or proxy: either the proxy's property or the option type is " +"incompatible." msgstr "" #: ../geanygendoc/src/ggd-options.c:512 @@ -1411,77 +1417,76 @@ msgid "Default documentation type for languages that does not have one set" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:37 -#: ../geanyinsertnum/src/insertnum.c:329 -#: ../geanyinsertnum/src/insertnum.c:461 +#: ../geanyinsertnum/src/insertnum.c:44 ../geanyinsertnum/src/insertnum.c:337 +#: ../geanyinsertnum/src/insertnum.c:484 msgid "Insert Numbers" msgstr "Insereix Números" -#: ../geanyinsertnum/src/insertnum.c:37 +#: ../geanyinsertnum/src/insertnum.c:44 msgid "Insert/Fill columns with numbers." msgstr "" -#: ../geanyinsertnum/src/insertnum.c:140 +#: ../geanyinsertnum/src/insertnum.c:146 msgid "Counting..." msgstr "Comptant..." -#: ../geanyinsertnum/src/insertnum.c:188 +#: ../geanyinsertnum/src/insertnum.c:194 msgid "Preparing..." msgstr "S'està preparant..." -#: ../geanyinsertnum/src/insertnum.c:194 +#: ../geanyinsertnum/src/insertnum.c:200 msgid "Inserting..." msgstr "Inserint..." -#: ../geanyinsertnum/src/insertnum.c:318 +#: ../geanyinsertnum/src/insertnum.c:333 msgid "For base 11 and above" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:341 +#: ../geanyinsertnum/src/insertnum.c:353 msgid "_Start:" msgstr "_Inici:" -#: ../geanyinsertnum/src/insertnum.c:346 +#: ../geanyinsertnum/src/insertnum.c:358 msgid "S_tep:" msgstr "_Pas:" -#: ../geanyinsertnum/src/insertnum.c:352 +#: ../geanyinsertnum/src/insertnum.c:364 msgid "_Base:" msgstr "_Base:" -#: ../geanyinsertnum/src/insertnum.c:363 +#: ../geanyinsertnum/src/insertnum.c:380 msgid "Letters:" msgstr "Cartes:" -#: ../geanyinsertnum/src/insertnum.c:366 +#: ../geanyinsertnum/src/insertnum.c:383 msgid "_Upper" msgstr "S_uperior" -#: ../geanyinsertnum/src/insertnum.c:371 +#: ../geanyinsertnum/src/insertnum.c:388 msgid "_Lower" msgstr "_Inferior" -#: ../geanyinsertnum/src/insertnum.c:376 +#: ../geanyinsertnum/src/insertnum.c:393 msgid "Base _prefix" msgstr "Prefix base" -#: ../geanyinsertnum/src/insertnum.c:378 +#: ../geanyinsertnum/src/insertnum.c:395 msgid "0 for octal, 0x for hex, + for positive decimal" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:380 +#: ../geanyinsertnum/src/insertnum.c:397 msgid "Padding:" msgstr "Separació:" -#: ../geanyinsertnum/src/insertnum.c:382 +#: ../geanyinsertnum/src/insertnum.c:399 msgid "Sp_ace" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:385 +#: ../geanyinsertnum/src/insertnum.c:402 msgid "_Zero" msgstr "_Zero" -#: ../geanyinsertnum/src/insertnum.c:454 +#: ../geanyinsertnum/src/insertnum.c:477 msgid "Insert _Numbers" msgstr "Insereix _Números" @@ -1726,7 +1731,9 @@ msgstr "" #: ../geanylatex/src/bibtexlabels.c:115 -msgid "Hidden field used for specifying or overriding the alphabetical order of entries" +msgid "" +"Hidden field used for specifying or overriding the alphabetical order of " +"entries" msgstr "" #: ../geanylatex/src/bibtexlabels.c:116 @@ -1805,18 +1812,15 @@ msgid "Underlines selected text" msgstr "Subratlla el text seleccionat" -#: ../geanylatex/src/geanylatex.c:120 -#: ../geanylatex/src/formatpatterns.c:45 +#: ../geanylatex/src/geanylatex.c:120 ../geanylatex/src/formatpatterns.c:45 msgid "Centered" msgstr "Centrat" -#: ../geanylatex/src/geanylatex.c:121 -#: ../geanylatex/src/formatpatterns.c:46 +#: ../geanylatex/src/geanylatex.c:121 ../geanylatex/src/formatpatterns.c:46 msgid "Left side oriented" msgstr "" -#: ../geanylatex/src/geanylatex.c:122 -#: ../geanylatex/src/formatpatterns.c:47 +#: ../geanylatex/src/geanylatex.c:122 ../geanylatex/src/formatpatterns.c:47 msgid "Right side oriented" msgstr "" @@ -1912,20 +1916,20 @@ msgid "BibTeX reference name:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1680 +#: ../geanylatex/src/geanylatex.c:1679 msgid "Dear Sir or Madame" msgstr "Benvolgut / Benvolguda" -#: ../geanylatex/src/geanylatex.c:1681 +#: ../geanylatex/src/geanylatex.c:1680 msgid "With kind regards" msgstr "" -#: ../geanylatex/src/geanylatex.c:1689 +#: ../geanylatex/src/geanylatex.c:1688 msgid "No template assigned. Aborting" msgstr "" #. Building the wizard-dialog and showing it -#: ../geanylatex/src/geanylatex.c:1716 +#: ../geanylatex/src/geanylatex.c:1715 msgid "LaTeX-Wizard" msgstr "Assitent LaTeX" @@ -1933,338 +1937,342 @@ #. * Adds custom templates if there are any. If there are none just #. * adds default one #. TEMPLATE FILE -#: ../geanylatex/src/geanylatex.c:1731 -#: ../markdown/src/conf.c:668 +#: ../geanylatex/src/geanylatex.c:1730 ../markdown/src/conf.c:659 msgid "Template:" msgstr "Plantilla:" -#: ../geanylatex/src/geanylatex.c:1735 +#: ../geanylatex/src/geanylatex.c:1734 msgid "Set the template which should be used for creating the new document" msgstr "" -#: ../geanylatex/src/geanylatex.c:1744 +#: ../geanylatex/src/geanylatex.c:1743 msgid "Default" msgstr "Predeterminat" #. Documentclass -#: ../geanylatex/src/geanylatex.c:1755 +#: ../geanylatex/src/geanylatex.c:1754 msgid "Documentclass:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1758 +#: ../geanylatex/src/geanylatex.c:1757 msgid "Choose the kind of document you want to write" msgstr "" -#: ../geanylatex/src/geanylatex.c:1762 +#: ../geanylatex/src/geanylatex.c:1761 msgid "Article" msgstr "Article" -#: ../geanylatex/src/geanylatex.c:1764 +#: ../geanylatex/src/geanylatex.c:1763 msgid "Report" msgstr "Informe" -#: ../geanylatex/src/geanylatex.c:1766 +#: ../geanylatex/src/geanylatex.c:1765 msgid "Letter" msgstr "Carta (8,5 x 11 polzades)" -#: ../geanylatex/src/geanylatex.c:1768 +#: ../geanylatex/src/geanylatex.c:1767 msgid "Presentation" msgstr "Presentació" #. Encoding -#: ../geanylatex/src/geanylatex.c:1778 +#: ../geanylatex/src/geanylatex.c:1777 msgid "Encoding:" msgstr "Codificació:" -#: ../geanylatex/src/geanylatex.c:1782 +#: ../geanylatex/src/geanylatex.c:1781 msgid "Set the encoding for your new document" msgstr "Definiu la codificació per al nou document" #. fontsize -#: ../geanylatex/src/geanylatex.c:1798 +#: ../geanylatex/src/geanylatex.c:1797 msgid "Font size" msgstr "Mida de la font" -#: ../geanylatex/src/geanylatex.c:1804 +#: ../geanylatex/src/geanylatex.c:1803 msgid "Set the default font size of your new document" msgstr "" #. Author -#: ../geanylatex/src/geanylatex.c:1816 +#: ../geanylatex/src/geanylatex.c:1815 msgid "Author:" msgstr "Autor:" -#: ../geanylatex/src/geanylatex.c:1819 -msgid "Sets the value of the \\author command. In most cases this should be your name" +#: ../geanylatex/src/geanylatex.c:1818 +msgid "" +"Sets the value of the \\author command. In most cases this should be your " +"name" msgstr "" #. Date -#: ../geanylatex/src/geanylatex.c:1833 +#: ../geanylatex/src/geanylatex.c:1832 msgid "Date:" msgstr "Data:" -#: ../geanylatex/src/geanylatex.c:1836 -msgid "Sets the value of the \\date command inside header of your new created LaTeX-document. Keeping it at \\today is a good decision if you don't need any fixed date." +#: ../geanylatex/src/geanylatex.c:1835 +msgid "" +"Sets the value of the \\date command inside header of your new created LaTeX-" +"document. Keeping it at \\today is a good decision if you don't need any " +"fixed date." msgstr "" #. Title of the new document -#: ../geanylatex/src/geanylatex.c:1848 +#: ../geanylatex/src/geanylatex.c:1847 msgid "Title:" msgstr "Títol:" -#: ../geanylatex/src/geanylatex.c:1851 +#: ../geanylatex/src/geanylatex.c:1850 msgid "Sets the title of your new document." msgstr "" #. Papersize -#: ../geanylatex/src/geanylatex.c:1860 +#: ../geanylatex/src/geanylatex.c:1859 msgid "Paper size:" msgstr "Mida del paper:" -#: ../geanylatex/src/geanylatex.c:1863 +#: ../geanylatex/src/geanylatex.c:1862 msgid "Choose the paper format for the newly created document" msgstr "" #. Paper direction -#: ../geanylatex/src/geanylatex.c:1876 +#: ../geanylatex/src/geanylatex.c:1875 msgid "Paper Orientation:" msgstr "Orientació del Paper:" -#: ../geanylatex/src/geanylatex.c:1879 +#: ../geanylatex/src/geanylatex.c:1878 msgid "Choose the paper orientation for the newly created document" msgstr "" -#: ../geanylatex/src/geanylatex.c:1900 +#: ../geanylatex/src/geanylatex.c:1899 msgid "Use KOMA-script classes if possible" msgstr "" -#: ../geanylatex/src/geanylatex.c:1902 +#: ../geanylatex/src/geanylatex.c:1901 msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" -"Keep in mind: To compile your document these classes have to be installed before." +"Keep in mind: To compile your document these classes have to be installed " +"before." msgstr "" -#: ../geanylatex/src/geanylatex.c:1909 +#: ../geanylatex/src/geanylatex.c:1908 msgid "Use draft mode" msgstr "Usa mode d'esborrany" -#: ../geanylatex/src/geanylatex.c:1911 -msgid "Set the draft flag inside new created documents to get documents with a number of debugging helpers" +#: ../geanylatex/src/geanylatex.c:1910 +msgid "" +"Set the draft flag inside new created documents to get documents with a " +"number of debugging helpers" msgstr "" -#: ../geanylatex/src/geanylatex.c:1928 +#: ../geanylatex/src/geanylatex.c:1927 msgid "Run LaTeX-Wizard" msgstr "Executa l'assistent per a LaTeX" -#: ../geanylatex/src/geanylatex.c:1930 +#: ../geanylatex/src/geanylatex.c:1929 msgid "Insert \\label" msgstr "Insereix \\label" -#: ../geanylatex/src/geanylatex.c:1932 +#: ../geanylatex/src/geanylatex.c:1931 msgid "Insert \\ref" msgstr "Insereix \\ref" -#: ../geanylatex/src/geanylatex.c:1934 +#: ../geanylatex/src/geanylatex.c:1933 msgid "Insert linebreak \\\\ " msgstr "Insereix salt de línia \\\\" -#: ../geanylatex/src/geanylatex.c:1937 +#: ../geanylatex/src/geanylatex.c:1936 msgid "Insert command" msgstr "Insereix una ordre" -#: ../geanylatex/src/geanylatex.c:1939 +#: ../geanylatex/src/geanylatex.c:1938 msgid "Turn input replacement on/off" msgstr "" -#: ../geanylatex/src/geanylatex.c:1943 +#: ../geanylatex/src/geanylatex.c:1942 msgid "Replace special characters" msgstr "Reemplaça els caràcters especials HTML" -#: ../geanylatex/src/geanylatex.c:1946 +#: ../geanylatex/src/geanylatex.c:1945 msgid "Run insert environment dialog" msgstr "" -#: ../geanylatex/src/geanylatex.c:1948 +#: ../geanylatex/src/geanylatex.c:1947 msgid "Insert \\item" msgstr "Insereix \\item" -#: ../geanylatex/src/geanylatex.c:1950 +#: ../geanylatex/src/geanylatex.c:1949 msgid "Format selection in bold font face" msgstr "" -#: ../geanylatex/src/geanylatex.c:1952 +#: ../geanylatex/src/geanylatex.c:1951 msgid "Format selection in italic font face" msgstr "" -#: ../geanylatex/src/geanylatex.c:1954 +#: ../geanylatex/src/geanylatex.c:1953 msgid "Format selection in typewriter font face" msgstr "" -#: ../geanylatex/src/geanylatex.c:1956 +#: ../geanylatex/src/geanylatex.c:1955 msgid "Format selection centered" msgstr "" -#: ../geanylatex/src/geanylatex.c:1958 +#: ../geanylatex/src/geanylatex.c:1957 msgid "Format selection left-aligned" msgstr "" -#: ../geanylatex/src/geanylatex.c:1960 +#: ../geanylatex/src/geanylatex.c:1959 msgid "Format selection right-aligned" msgstr "" -#: ../geanylatex/src/geanylatex.c:1963 +#: ../geanylatex/src/geanylatex.c:1962 msgid "Insert description list" msgstr "" -#: ../geanylatex/src/geanylatex.c:1966 +#: ../geanylatex/src/geanylatex.c:1965 msgid "Insert itemize list" msgstr "" -#: ../geanylatex/src/geanylatex.c:1969 +#: ../geanylatex/src/geanylatex.c:1968 msgid "Insert enumerate list" msgstr "" -#: ../geanylatex/src/geanylatex.c:1972 +#: ../geanylatex/src/geanylatex.c:1971 msgid "Set selection one level up" msgstr "" -#: ../geanylatex/src/geanylatex.c:1975 +#: ../geanylatex/src/geanylatex.c:1974 msgid "Set selection one level down" msgstr "" -#: ../geanylatex/src/geanylatex.c:1978 +#: ../geanylatex/src/geanylatex.c:1977 msgid "Insert \\usepackage{}" msgstr "Insereix \\usepackage{}" -#: ../geanylatex/src/geanylatex.c:1981 +#: ../geanylatex/src/geanylatex.c:1980 msgid "Insert BibTeX reference dialog" msgstr "" -#: ../geanylatex/src/geanylatex.c:1988 +#: ../geanylatex/src/geanylatex.c:1987 msgid "" "GeanyLaTeX is a plugin to improve support for LaTeX in Geany.\n" "\n" "Please report all bugs or feature requests to one of the authors." msgstr "" -#: ../geanylatex/src/geanylatex.c:2026 -msgid "glatex_set_autocompletion_contextsize has been initialized with an invalid value. Default value taken. Please check your configuration file" +#: ../geanylatex/src/geanylatex.c:2025 +msgid "" +"glatex_set_autocompletion_contextsize has been initialized with an invalid " +"value. Default value taken. Please check your configuration file" msgstr "" -#: ../geanylatex/src/geanylatex.c:2048 -#: ../geanylatex/src/geanylatex.c:2055 +#: ../geanylatex/src/geanylatex.c:2047 ../geanylatex/src/geanylatex.c:2054 msgid "page \\pageref{{{reference}}}" msgstr "pàgina \\pageref{{{reference}}}" -#: ../geanylatex/src/geanylatex.c:2052 -#: ../geanylatex/src/geanylatex.c:2059 +#: ../geanylatex/src/geanylatex.c:2051 ../geanylatex/src/geanylatex.c:2058 msgid "\\ref{{{reference}}}, page \\pageref{{{reference}}}" msgstr "\\ref{{{reference}}}, pàgina \\pageref{{{reference}}}" #. Build up menu for menubar -#: ../geanylatex/src/geanylatex.c:2107 +#: ../geanylatex/src/geanylatex.c:2106 msgid "_LaTeX" msgstr "_LaTeX" #. Filling up menubar menus #. LaTeX menu -#: ../geanylatex/src/geanylatex.c:2116 -#: ../geanylatex/src/geanylatex.c:2328 +#: ../geanylatex/src/geanylatex.c:2115 ../geanylatex/src/geanylatex.c:2327 msgid "LaTeX-_Wizard" msgstr "_Assistent LaTeX" -#: ../geanylatex/src/geanylatex.c:2119 -#: ../geanylatex/src/geanylatex.c:2331 +#: ../geanylatex/src/geanylatex.c:2118 ../geanylatex/src/geanylatex.c:2330 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "" -#: ../geanylatex/src/geanylatex.c:2124 +#: ../geanylatex/src/geanylatex.c:2123 msgid "I_nsert Special Character" msgstr "I_nsereix Caràcter E_special" -#: ../geanylatex/src/geanylatex.c:2126 +#: ../geanylatex/src/geanylatex.c:2125 msgid "Helps to use some not very common letters and signs" msgstr "" -#: ../geanylatex/src/geanylatex.c:2136 +#: ../geanylatex/src/geanylatex.c:2135 msgid "Insert _Reference" msgstr "Insereix _Referència" -#: ../geanylatex/src/geanylatex.c:2138 +#: ../geanylatex/src/geanylatex.c:2137 msgid "Inserting references to the document" msgstr "Insereix referències al document" -#: ../geanylatex/src/geanylatex.c:2143 +#: ../geanylatex/src/geanylatex.c:2142 msgid "Insert _Label" msgstr "Insereix E_tiqueta" -#: ../geanylatex/src/geanylatex.c:2145 +#: ../geanylatex/src/geanylatex.c:2144 msgid "Helps at inserting labels to a document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2151 +#: ../geanylatex/src/geanylatex.c:2150 msgid "Insert _Environment" msgstr "Insereix _Entorn" -#: ../geanylatex/src/geanylatex.c:2153 +#: ../geanylatex/src/geanylatex.c:2152 msgid "Helps at inserting an environment a document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2159 +#: ../geanylatex/src/geanylatex.c:2158 msgid "Insert P_ackage" msgstr "Insereix P_aquet" -#: ../geanylatex/src/geanylatex.c:2161 +#: ../geanylatex/src/geanylatex.c:2160 msgid "A small dialog to insert \\usepackage{} into header of current file" msgstr "" -#: ../geanylatex/src/geanylatex.c:2166 -#: ../scope/data/scope.glade.h:82 +#: ../geanylatex/src/geanylatex.c:2165 ../scope/data/scope.glade.h:58 msgid "_Format" msgstr "_Format" #. Add font size menu -#: ../geanylatex/src/geanylatex.c:2183 +#: ../geanylatex/src/geanylatex.c:2182 msgid "F_ont size" msgstr "Mida de la font" -#: ../geanylatex/src/geanylatex.c:2201 +#: ../geanylatex/src/geanylatex.c:2200 msgid "_Special Character Replacement" msgstr "_Reemplaçament de Caràcters Especials HTML" -#: ../geanylatex/src/geanylatex.c:2209 +#: ../geanylatex/src/geanylatex.c:2208 msgid "Bulk _Replace Special Characters" msgstr "Reemplaçament en _Massa de Caràcters Especial HTML" -#: ../geanylatex/src/geanylatex.c:2211 +#: ../geanylatex/src/geanylatex.c:2210 msgid "_Replace selected special characters with TeX substitutes" msgstr "" -#: ../geanylatex/src/geanylatex.c:2219 +#: ../geanylatex/src/geanylatex.c:2218 msgid "Toggle _Special Character Replacement" msgstr "Activa/Desactiva el Reemplaçament de Caràcters Especials HTML" -#: ../geanylatex/src/geanylatex.c:2230 +#: ../geanylatex/src/geanylatex.c:2229 msgid "Insert _Command" msgstr "Insereix _Ordre" -#: ../geanylatex/src/geanylatex.c:2232 +#: ../geanylatex/src/geanylatex.c:2231 msgid "Inserting costumized command to document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2257 +#: ../geanylatex/src/geanylatex.c:2256 msgid "_BibTeX" msgstr "_BibTeX" -#: ../geanylatex/src/geanylatex.c:2265 +#: ../geanylatex/src/geanylatex.c:2264 msgid "Insert B_ibTeX reference" msgstr "Insereix referència B_ibTeX" -#: ../geanylatex/src/geanylatex.c:2267 +#: ../geanylatex/src/geanylatex.c:2266 msgid "Helps to insert a reference out of BibTeX files" msgstr "" -#: ../geanylatex/src/geanylatex.c:2272 +#: ../geanylatex/src/geanylatex.c:2271 msgid "_BibTeX entries" msgstr "" @@ -2420,16 +2428,16 @@ msgid "Creating dummy text with Geany" msgstr "" -#: ../geanylipsum/src/geanylipsum.c:86 +#: ../geanylipsum/src/geanylipsum.c:89 msgid "Lipsum-Generator" msgstr "" -#: ../geanylipsum/src/geanylipsum.c:87 +#: ../geanylipsum/src/geanylipsum.c:90 msgid "Enter the length of Lipsum text here" msgstr "Introduïu la longitud del text Lipsum" #. Building menu entry -#: ../geanylipsum/src/geanylipsum.c:163 +#: ../geanylipsum/src/geanylipsum.c:164 msgid "_Lipsum" msgstr "_Lipsum" @@ -2441,8 +2449,7 @@ msgid "Insert Lipsum text" msgstr "Insereix text Lipsum" -#: ../geanylua/glspi.h:100 -#: ../geanylua/gsdlg_lua.c:95 +#: ../geanylua/glspi.h:100 ../geanylua/gsdlg_lua.c:95 #: ../geanylua/glspi_kfile.c:54 #, c-format msgid "" @@ -2457,8 +2464,7 @@ " expected type \"%s\" or \"%s\" for argument #%d\n" msgstr "" -#: ../geanylua/glspi.h:128 -#: ../geanylua/gsdlg_lua.c:108 +#: ../geanylua/glspi.h:128 ../geanylua/gsdlg_lua.c:108 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2482,8 +2488,7 @@ msgid "Lua Script Plugin" msgstr "" -#: ../geanylua/glspi_run.c:90 -#: ../geanylua/glspi_run.c:97 +#: ../geanylua/glspi_run.c:90 ../geanylua/glspi_run.c:97 msgid "Lua script error:" msgstr "" @@ -2544,8 +2549,7 @@ "to add your own custom configuration dialog." msgstr "" -#: ../geanylua/gsdlg.c:103 -#: ../geanylua/glspi_dlg.c:420 +#: ../geanylua/gsdlg.c:103 ../geanylua/glspi_dlg.c:420 msgid "Open file" msgstr "Obre un Fitxer" @@ -2557,19 +2561,19 @@ msgid "Browse..." msgstr "Navega..." -#: ../geanylua/gsdlg.c:175 +#: ../geanylua/gsdlg.c:176 msgid "Select Color" msgstr "Selecciona un Color" -#: ../geanylua/gsdlg.c:205 +#: ../geanylua/gsdlg.c:207 msgid "Choose..." msgstr "Tria..." -#: ../geanylua/gsdlg.c:226 +#: ../geanylua/gsdlg.c:228 msgid "Select Font" msgstr "Tria la font" -#: ../geanylua/gsdlg.c:253 +#: ../geanylua/gsdlg.c:255 msgid "Select..." msgstr "Selecciona..." @@ -2594,8 +2598,7 @@ "not enough arguments for command \"%s\".\n" msgstr "" -#: ../geanylua/glspi_sci.c:652 -#: ../geanylua/glspi_app.c:398 +#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:396 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2630,14 +2633,14 @@ msgid "Save file" msgstr "Desa el Fitxer" -#: ../geanylua/glspi_dlg.c:436 +#: ../geanylua/glspi_dlg.c:438 #, c-format msgid "" "Error in module \"%s\" at function pickfile():\n" "failed to parse filter string at argument #3.\n" msgstr "" -#: ../geanylua/glspi_dlg.c:486 +#: ../geanylua/glspi_dlg.c:489 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2676,21 +2679,21 @@ "Please check your installation." msgstr "" -#: ../geanylua/glspi_app.c:19 +#: ../geanylua/glspi_app.c:21 #, c-format msgid "" "%s %s: %s\n" "Copyright (c) 2007-2010 " msgstr "" -#: ../geanylua/glspi_app.c:149 +#: ../geanylua/glspi_app.c:151 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" "widget \"%s\" not found for argument #1.\n" msgstr "" -#: ../geanylua/glspi_app.c:158 +#: ../geanylua/glspi_app.c:160 #, c-format msgid "" "Error in module \"%s\" at function %s() argument #2:\n" @@ -2838,7 +2841,9 @@ msgstr "" #: ../geanymacro/src/geanymacro.c:93 -msgid "Move Cursor to 1st non-whitespace character of line, or 1st character of line if already at 1st non-whitespace character" +msgid "" +"Move Cursor to 1st non-whitespace character of line, or 1st character of " +"line if already at 1st non-whitespace character" msgstr "" #: ../geanymacro/src/geanymacro.c:95 @@ -2922,7 +2927,9 @@ msgstr "" #: ../geanymacro/src/geanymacro.c:116 -msgid "Extend Selection to 1st non-whitespace character of line, or 1st character of line if already at 1st non-whitespace character" +msgid "" +"Extend Selection to 1st non-whitespace character of line, or 1st character " +"of line if already at 1st non-whitespace character" msgstr "" #: ../geanymacro/src/geanymacro.c:118 @@ -2974,7 +2981,9 @@ msgstr "" #: ../geanymacro/src/geanymacro.c:131 -msgid "Extend Rectangular Selection to 1st non-whitespace character of line, or 1st character of line if already at 1st non-whitespace character" +msgid "" +"Extend Rectangular Selection to 1st non-whitespace character of line, or 1st " +"character of line if already at 1st non-whitespace character" msgstr "" #: ../geanymacro/src/geanymacro.c:134 @@ -2985,8 +2994,7 @@ msgid "Toggle Insert/Overwrite mode" msgstr "Commuta entre el mode d'Inserció i el mode de Sobreescriptura" -#: ../geanymacro/src/geanymacro.c:137 -#: ../pretty-printer/src/ConfigUI.c:239 +#: ../geanymacro/src/geanymacro.c:137 ../pretty-printer/src/ConfigUI.c:239 msgid "Tab" msgstr "Tabulador" @@ -2994,8 +3002,7 @@ msgid "Newline" msgstr "Línia nova" -#: ../geanymacro/src/geanymacro.c:140 -#: ../geanymacro/src/geanymacro.c:1625 +#: ../geanymacro/src/geanymacro.c:140 ../geanymacro/src/geanymacro.c:1625 #, c-format msgid "Insert/replace with \"\"" msgstr "" @@ -3017,7 +3024,23 @@ msgstr "" #: ../geanymacro/src/geanymacro.c:147 -msgid "Insert duplicate of selected text after selection. If nothing selected, duplicate line" +msgid "" +"Insert duplicate of selected text after selection. If nothing selected, " +"duplicate line" +msgstr "" + +#: ../geanymacro/src/geanymacro.c:150 +#, fuzzy +msgid "Search for next \"\"" +msgstr "Cerca:" + +#: ../geanymacro/src/geanymacro.c:151 +#, fuzzy +msgid "Search for previous \"\"" +msgstr "Concorda al començament de la paraula" + +#: ../geanymacro/src/geanymacro.c:152 +msgid "Set start of search to beginning of selection" msgstr "" #: ../geanymacro/src/geanymacro.c:181 @@ -3063,23 +3086,34 @@ msgstr "" #: ../geanymacro/src/geanymacro.c:857 -msgid "These are sequences of actions that can then be repeated with a single key combination. " +msgid "" +"These are sequences of actions that can then be repeated with a single key " +"combination. " msgstr "" #: ../geanymacro/src/geanymacro.c:858 -msgid "So if you had dozens of lines where you wanted to delete the last 2 characters, you could simply start recording, press End, Backspace, Backspace, down line and then stop recording. " +msgid "" +"So if you had dozens of lines where you wanted to delete the last 2 " +"characters, you could simply start recording, press End, Backspace, " +"Backspace, down line and then stop recording. " msgstr "" #: ../geanymacro/src/geanymacro.c:860 -msgid "Then simply trigger the macro and it would automatically edit the line and move to the next. " +msgid "" +"Then simply trigger the macro and it would automatically edit the line and " +"move to the next. " msgstr "" #: ../geanymacro/src/geanymacro.c:861 -msgid "Select Record Macro from the Tools menu and you will be prompted with a dialog box. " +msgid "" +"Select Record Macro from the Tools menu and you will be prompted with a " +"dialog box. " msgstr "" #: ../geanymacro/src/geanymacro.c:862 -msgid "You need to specify a key combination that isn't being used, and a name for the macro to help you identify it. " +msgid "" +"You need to specify a key combination that isn't being used, and a name for " +"the macro to help you identify it. " msgstr "" #: ../geanymacro/src/geanymacro.c:864 @@ -3087,7 +3121,9 @@ msgstr "" #: ../geanymacro/src/geanymacro.c:865 -msgid "What you do in the editor is then recorded until you select Stop Recording Macro from the Tools menu. " +msgid "" +"What you do in the editor is then recorded until you select Stop Recording " +"Macro from the Tools menu. " msgstr "" #: ../geanymacro/src/geanymacro.c:867 @@ -3103,27 +3139,37 @@ msgstr "" #: ../geanymacro/src/geanymacro.c:870 -msgid "You can also click on a macro's name and change it, or the key combination and re-define that assuming that it's not already in use. " +msgid "" +"You can also click on a macro's name and change it, or the key combination " +"and re-define that assuming that it's not already in use. " msgstr "" #: ../geanymacro/src/geanymacro.c:872 -msgid "Selecting the edit option allows you to view all the individual elements that make up the macro. " +msgid "" +"Selecting the edit option allows you to view all the individual elements " +"that make up the macro. " msgstr "" #: ../geanymacro/src/geanymacro.c:874 msgid "" -"You can select a diferent command for each element, move them, add new elements, delete elements, or if it's replace/insert, you can edit the text that replaces the selected text, or is inserted.\n" +"You can select a diferent command for each element, move them, add new " +"elements, delete elements, or if it's replace/insert, you can edit the text " +"that replaces the selected text, or is inserted.\n" "\n" msgstr "" #: ../geanymacro/src/geanymacro.c:878 msgid "" -"The only thing to bear in mind is that undo and redo actions are not recorded, and won't be replayed when the macro is re-run.\n" +"The only thing to bear in mind is that undo and redo actions are not " +"recorded, and won't be replayed when the macro is re-run.\n" "\n" msgstr "" #: ../geanymacro/src/geanymacro.c:881 -msgid "You can alter the default behaviour of this plugin by selecting Plugin Manager under the Tools menu, selecting this plugin, and cliking Preferences. " +msgid "" +"You can alter the default behaviour of this plugin by selecting Plugin " +"Manager under the Tools menu, selecting this plugin, and cliking " +"Preferences. " msgstr "" #: ../geanymacro/src/geanymacro.c:883 @@ -3131,11 +3177,19 @@ msgstr "" #: ../geanymacro/src/geanymacro.c:884 -msgid "Save Macros when close Geany - If this is selected then Geany will save any recorded macros and reload them for use the next time you open Geany, if not they will be lost when Geany is closed.\n" +msgid "" +"Save Macros when close Geany - If this is selected then Geany will save any " +"recorded macros and reload them for use the next time you open Geany, if not " +"they will be lost when Geany is closed.\n" msgstr "" #: ../geanymacro/src/geanymacro.c:887 -msgid "Ask before replaceing existing Macros - If this is selected then if you try recording a macro over an existing one it will check before over-writing it, giving you the option of trying a different name or key trigger combination, otherwise it will simply erase any existing macros with the same name, or the same key trigger combination." +msgid "" +"Ask before replaceing existing Macros - If this is selected then if you try " +"recording a macro over an existing one it will check before over-writing it, " +"giving you the option of trying a different name or key trigger combination, " +"otherwise it will simply erase any existing macros with the same name, or " +"the same key trigger combination." msgstr "" #. create dialog box @@ -3190,16 +3244,13 @@ msgstr "Opcions de Cerca:" #. create buttons -#: ../geanymacro/src/geanymacro.c:1393 -#: ../geanymacro/src/geanymacro.c:1536 -#: ../geanymacro/src/geanymacro.c:1819 -#: ../geanymacro/src/geanymacro.c:2116 +#: ../geanymacro/src/geanymacro.c:1393 ../geanymacro/src/geanymacro.c:1536 +#: ../geanymacro/src/geanymacro.c:1826 ../geanymacro/src/geanymacro.c:2122 msgid "_Ok" msgstr "_D'acord" -#: ../geanymacro/src/geanymacro.c:1394 -#: ../geanymacro/src/geanymacro.c:1537 -#: ../geanymacro/src/geanymacro.c:1820 +#: ../geanymacro/src/geanymacro.c:1394 ../geanymacro/src/geanymacro.c:1537 +#: ../geanymacro/src/geanymacro.c:1827 msgid "_Cancel" msgstr "_Cancel·la" @@ -3216,8 +3267,7 @@ msgid "Search for contents of clipboard" msgstr "" -#: ../geanymacro/src/geanymacro.c:1424 -#: ../gproject/src/gproject-sidebar.c:92 +#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:101 msgid "Search for:" msgstr "Cerca:" @@ -3251,60 +3301,58 @@ msgid "Text:" msgstr "Text:" -#: ../geanymacro/src/geanymacro.c:1571 -#: ../geanymacro/src/geanymacro.c:1755 +#: ../geanymacro/src/geanymacro.c:1570 ../geanymacro/src/geanymacro.c:1758 #, c-format msgid "Insert/replace with \"%s\"" msgstr "" #. create dialog box -#: ../geanymacro/src/geanymacro.c:1731 +#: ../geanymacro/src/geanymacro.c:1735 #, c-format msgid "Edit: %s" msgstr "Edita: %s" #. add column -#: ../geanymacro/src/geanymacro.c:1794 +#: ../geanymacro/src/geanymacro.c:1801 msgid "Event" msgstr "Esdeveniment" #. add buttons -#: ../geanymacro/src/geanymacro.c:1809 +#: ../geanymacro/src/geanymacro.c:1816 msgid "Move _Up" msgstr "Mou Am_unt" -#: ../geanymacro/src/geanymacro.c:1811 +#: ../geanymacro/src/geanymacro.c:1818 msgid "Move Do_wn" msgstr "Mou A_vall" -#: ../geanymacro/src/geanymacro.c:1813 +#: ../geanymacro/src/geanymacro.c:1820 msgid "New _Above" msgstr "" -#: ../geanymacro/src/geanymacro.c:1814 +#: ../geanymacro/src/geanymacro.c:1821 msgid "New _Below" msgstr "" -#: ../geanymacro/src/geanymacro.c:1817 -#: ../geanymacro/src/geanymacro.c:2114 +#: ../geanymacro/src/geanymacro.c:1824 ../geanymacro/src/geanymacro.c:2120 msgid "_Delete" msgstr "_Elimina" #. create dialog box -#: ../geanymacro/src/geanymacro.c:2059 +#: ../geanymacro/src/geanymacro.c:2065 msgid "Edit Macros" msgstr "Edita les Macros" -#: ../geanymacro/src/geanymacro.c:2089 +#: ../geanymacro/src/geanymacro.c:2095 msgid "Macro Name" msgstr "Nom de la Macro" -#: ../geanymacro/src/geanymacro.c:2095 +#: ../geanymacro/src/geanymacro.c:2101 msgid "Key Trigger" msgstr "" #. add buttons -#: ../geanymacro/src/geanymacro.c:2110 +#: ../geanymacro/src/geanymacro.c:2116 msgid "_Re-Record" msgstr "" @@ -3324,18 +3372,18 @@ msgstr "_Edita les Macros" #. *< \brief It's the information message about geany mini script -#: ../geanyminiscript/src/gms_gui.c:130 +#: ../geanyminiscript/src/gms_gui.c:129 msgid "" "GMS : Geany Mini-Script filter Plugin\n" -"This plugin is a tool to apply a script filter on :\n" +"This plugin is a tool to apply a script filter on:\n" " o the text selection,\n" " o the current document,\n" " o all documents of the current session.\n" "\n" -"The filter type can be : \n" -" o Unix shell script, \n" -" o perl script, \n" -" o python script, \n" +"The filter type can be:\n" +" o Unix shell script,\n" +" o perl script,\n" +" o python script,\n" " o sed commands,\n" " o awk script.\n" "\n" @@ -3350,79 +3398,79 @@ "or (at your option) any later version." msgstr "" -#: ../geanyminiscript/src/gms_gui.c:254 +#: ../geanyminiscript/src/gms_gui.c:253 msgid "Load Mini-Script File" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:311 +#: ../geanyminiscript/src/gms_gui.c:310 msgid "Save Mini-Script File" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:420 +#: ../geanyminiscript/src/gms_gui.c:419 msgid "Mini-Script Filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:448 +#: ../geanyminiscript/src/gms_gui.c:445 msgid "Clear the mini-script window" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:453 +#: ../geanyminiscript/src/gms_gui.c:450 msgid "Load a mini-script into this window" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:458 +#: ../geanyminiscript/src/gms_gui.c:455 msgid "Save the mini-script into a file" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:463 +#: ../geanyminiscript/src/gms_gui.c:460 msgid "Display a information about the mini-script plugin" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:471 +#: ../geanyminiscript/src/gms_gui.c:468 msgid "select the mini-script type" msgstr "" #. Hbox : Radio bouttons for choosing the input: #. * selection/current document/all documents of the current session -#: ../geanyminiscript/src/gms_gui.c:502 +#: ../geanyminiscript/src/gms_gui.c:499 msgid "filter input" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:504 +#: ../geanyminiscript/src/gms_gui.c:501 msgid "select the input of mini-script filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:510 +#: ../geanyminiscript/src/gms_gui.c:507 msgid "selection" msgstr "selecció" -#: ../geanyminiscript/src/gms_gui.c:511 +#: ../geanyminiscript/src/gms_gui.c:508 msgid "document" msgstr "document" -#: ../geanyminiscript/src/gms_gui.c:512 +#: ../geanyminiscript/src/gms_gui.c:509 msgid "session" msgstr "sessió" #. Hbox : Radio bouttons for choosing the output: #. * current document/ or new document -#: ../geanyminiscript/src/gms_gui.c:521 +#: ../geanyminiscript/src/gms_gui.c:518 msgid "filter output" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:523 +#: ../geanyminiscript/src/gms_gui.c:520 msgid "select the output of mini-script filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:529 +#: ../geanyminiscript/src/gms_gui.c:526 msgid "Current Doc." msgstr "" -#: ../geanyminiscript/src/gms_gui.c:530 +#: ../geanyminiscript/src/gms_gui.c:527 msgid "New Doc." msgstr "" -#: ../geanyminiscript/src/gms_gui.c:751 +#: ../geanyminiscript/src/gms_gui.c:748 msgid "script configuration" msgstr "" @@ -3431,7 +3479,8 @@ msgstr "" #: ../geanyminiscript/src/gms.c:59 -msgid "A tool to apply a script filter on a text selection or current document(s)" +msgid "" +"A tool to apply a script filter on a text selection or current document(s)" msgstr "" #: ../geanyminiscript/src/gms.c:60 @@ -3461,7 +3510,8 @@ #: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:971 #, c-format msgid "" -"'%s' has been edited since it was last saved by geany. Marker positions may be unreliable and will not be loaded.\n" +"'%s' has been edited since it was last saved by geany. Marker positions may " +"be unreliable and will not be loaded.\n" "Press Ignore to try an load markers anyway." msgstr "" @@ -3512,17 +3562,25 @@ #: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1274 msgid "" -"This Plugin implements Numbered Bookmarks in Geany, as well as remembering the state of folds, and positions of standard non-numbered bookmarks when a file is saved.\n" +"This Plugin implements Numbered Bookmarks in Geany, as well as remembering " +"the state of folds, and positions of standard non-numbered bookmarks when a " +"file is saved.\n" "\n" -"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to the line number. If you press Ctrl+Shift+a number on a line that already has that bookmark number then it removes the bookmark, otherwise it will move the bookmark there if it was set on a different line, or create it if it had not already been set. Only the most recently set bookmark on a line will be shown, but you can have more than one bookmark per line. To move to a previously set bookmark, press Ctrl+a number from 0 to 9." +"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark " +"press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to " +"the line number. If you press Ctrl+Shift+a number on a line that already has " +"that bookmark number then it removes the bookmark, otherwise it will move " +"the bookmark there if it was set on a different line, or create it if it had " +"not already been set. Only the most recently set bookmark on a line will be " +"shown, but you can have more than one bookmark per line. To move to a " +"previously set bookmark, press Ctrl+a number from 0 to 9." msgstr "" #: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1395 msgid "Unable to apply markers as all being used." msgstr "" -#: ../geanypg/src/decrypt_cb.c:33 -#: ../geanypg/src/encrypt_cb.c:32 +#: ../geanypg/src/decrypt_cb.c:33 ../geanypg/src/encrypt_cb.c:32 #: ../geanypg/src/sign_cb.c:33 msgid "couldn't create tempfile" msgstr "" @@ -3532,7 +3590,8 @@ msgid "" "The key with user ID \"%s\" has validity \"%s\".\n" "\n" -"WARNING: It is NOT certain that the key belongs to the person named in the user ID.\n" +"WARNING: It is NOT certain that the key belongs to the person named in the " +"user ID.\n" "\n" "Are you *really* sure you want to use this key anyway?" msgstr "" @@ -3555,8 +3614,7 @@ msgid "Using libgpgme version:" msgstr "" -#: ../geanypg/src/geanypg.c:60 -#: ../geanypg/src/geanypg.c:61 +#: ../geanypg/src/geanypg.c:60 ../geanypg/src/geanypg.c:61 msgid "Error from" msgstr "" @@ -3597,46 +3655,47 @@ msgstr "Selecciona el signador" #. shouldn't get here -#: ../geanypg/src/pinentry.c:107 +#: ../geanypg/src/pinentry.c:111 msgid "Could not use pinentry." msgstr "" -#: ../geanypg/src/pinentry.c:119 +#: ../geanypg/src/pinentry.c:123 msgid "Unexpected output from pinentry." msgstr "" #. read the rest of the first line after OK -#: ../geanypg/src/pinentry.c:127 +#: ../geanypg/src/pinentry.c:131 msgid "Passphrase entry" msgstr "" -#: ../geanypg/src/pinentry.c:131 +#: ../geanypg/src/pinentry.c:135 msgid "Passphrase" msgstr "Contrasenya" -#: ../geanypg/src/pinentry.c:136 +#: ../geanypg/src/pinentry.c:140 msgid "Enter passphrase for" msgstr "Introduïu la contrasenya per a" -#: ../geanypg/src/pinentry.c:167 +#: ../geanypg/src/pinentry.c:171 msgid "pinentry gave error" msgstr "" -#: ../geanypg/src/pinentry.c:170 +#: ../geanypg/src/pinentry.c:174 msgid "Unexpected error from pinentry." msgstr "" -#: ../geanypg/src/pinentry.c:195 -msgid "Error, Passphrase input without using gpg-agent is not supported on Windows yet." +#: ../geanypg/src/pinentry.c:199 +msgid "" +"Error, Passphrase input without using gpg-agent is not supported on Windows " +"yet." msgstr "" #: ../geanypg/src/verify_aux.c:53 msgid "a key with fingerprint" msgstr "" -#: ../geanypg/src/verify_aux.c:66 -#: ../spellcheck/src/gui.c:522 -#: ../spellcheck/src/gui.c:533 +#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:527 +#: ../spellcheck/src/gui.c:538 msgid "unknown" msgstr "desconegut" @@ -3660,8 +3719,7 @@ msgid "ultimate" msgstr "" -#: ../geanypg/src/verify_aux.c:72 -#: ../geanypg/src/verify_aux.c:74 +#: ../geanypg/src/verify_aux.c:72 ../geanypg/src/verify_aux.c:74 msgid "[bad validity value]" msgstr "" @@ -3726,62 +3784,49 @@ "notations .: %s\n" msgstr "" -#: ../geanypg/src/verify_aux.c:119 -#: ../geanypg/src/verify_aux.c:124 +#: ../geanypg/src/verify_aux.c:119 ../geanypg/src/verify_aux.c:124 msgid "Unknown\n" msgstr "Desconegut\n" -#: ../geanypg/src/verify_aux.c:129 -#: ../geanypg/src/verify_aux.c:136 -#: ../geanypg/src/verify_aux.c:147 -#: ../geanypg/src/verify_aux.c:154 +#: ../geanypg/src/verify_aux.c:129 ../geanypg/src/verify_aux.c:136 +#: ../geanypg/src/verify_aux.c:147 ../geanypg/src/verify_aux.c:154 msgid "[None]" msgstr "[Cap]" -#: ../geanypg/src/verify_aux.c:134 -#: ../geanypg/src/verify_aux.c:135 -#: ../geanypg/src/verify_aux.c:152 -#: ../geanypg/src/verify_aux.c:153 +#: ../geanypg/src/verify_aux.c:134 ../geanypg/src/verify_aux.c:135 +#: ../geanypg/src/verify_aux.c:152 ../geanypg/src/verify_aux.c:153 msgid "Unknown" msgstr "Desconegut" -#: ../geanypg/src/verify_aux.c:137 -#: ../geanypg/src/verify_aux.c:155 +#: ../geanypg/src/verify_aux.c:137 ../geanypg/src/verify_aux.c:155 msgid "n/a" msgstr "n/d" -#: ../geanypg/src/verify_aux.c:137 -#: ../geanypg/src/verify_aux.c:155 +#: ../geanypg/src/verify_aux.c:137 ../geanypg/src/verify_aux.c:155 msgid "bad" msgstr "incorrecte" -#: ../geanypg/src/verify_aux.c:137 -#: ../geanypg/src/verify_aux.c:155 +#: ../geanypg/src/verify_aux.c:137 ../geanypg/src/verify_aux.c:155 msgid "okay" msgstr "" -#: ../geanypg/src/verify_aux.c:137 -#: ../geanypg/src/verify_aux.c:155 +#: ../geanypg/src/verify_aux.c:137 ../geanypg/src/verify_aux.c:155 msgid "RFU" msgstr "" -#: ../geanypg/src/verify_aux.c:138 -#: ../geanypg/src/verify_aux.c:156 +#: ../geanypg/src/verify_aux.c:138 ../geanypg/src/verify_aux.c:156 msgid " wrong-key-usage" msgstr " us-de-clau-incorrecte" -#: ../geanypg/src/verify_aux.c:139 -#: ../geanypg/src/verify_aux.c:156 +#: ../geanypg/src/verify_aux.c:139 ../geanypg/src/verify_aux.c:156 msgid " chain-model" msgstr " model-de-cadena" -#: ../geanypg/src/verify_aux.c:140 -#: ../geanypg/src/verify_aux.c:157 +#: ../geanypg/src/verify_aux.c:140 ../geanypg/src/verify_aux.c:157 msgid "yes" msgstr "sí" -#: ../geanypg/src/verify_aux.c:140 -#: ../geanypg/src/verify_aux.c:157 +#: ../geanypg/src/verify_aux.c:140 ../geanypg/src/verify_aux.c:157 msgid "no" msgstr "no" @@ -3805,9 +3850,8 @@ msgid "Open a signature file" msgstr "Obre un fitxer de signatura" -#: ../geanyprj/src/geanyprj.c:38 -#: ../geanyprj/src/sidebar.c:456 -#: ../gproject/src/gproject-sidebar.c:822 +#: ../geanyprj/src/geanyprj.c:38 ../geanyprj/src/sidebar.c:456 +#: ../gproject/src/gproject-sidebar.c:870 msgid "Project" msgstr "Projecte" @@ -3827,8 +3871,7 @@ msgid "Project Preferences" msgstr "Preferències del Projecte" -#: ../geanyprj/src/menu.c:101 -#: ../geanyprj/src/menu.c:377 +#: ../geanyprj/src/menu.c:101 ../geanyprj/src/menu.c:377 #: ../geanyprj/src/sidebar.c:172 msgid "New Project" msgstr "Projecte Nou" @@ -3837,8 +3880,7 @@ msgid "C_reate" msgstr "C_rea" -#: ../geanyprj/src/menu.c:123 -#: ../scope/data/scope.glade.h:29 +#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:114 msgid "Name:" msgstr "Nom:" @@ -3855,8 +3897,14 @@ msgstr "Directori base:" #: ../geanyprj/src/menu.c:160 -msgid "Base directory of all files that make up the project. This can be a new path, or an existing directory tree. You can use paths relative to the project filename." -msgstr "Directori base per a tots els fitxers que formen part del projecte. Pot ser un directori nou, o un ja existent. Podeu usar directoris relatius al fitxer de projecte." +msgid "" +"Base directory of all files that make up the project. This can be a new " +"path, or an existing directory tree. You can use paths relative to the " +"project filename." +msgstr "" +"Directori base per a tots els fitxers que formen part del projecte. Pot ser " +"un directori nou, o un ja existent. Podeu usar directoris relatius al fitxer " +"de projecte." #: ../geanyprj/src/menu.c:163 msgid "Choose Project Base Path" @@ -3867,7 +3915,10 @@ msgstr "" #: ../geanyprj/src/menu.c:172 -msgid "Automatically add files that match project type on project load automatically. You can't manually add/remove files if you checked this option, since your modification will be lost on on next project load" +msgid "" +"Automatically add files that match project type on project load " +"automatically. You can't manually add/remove files if you checked this " +"option, since your modification will be lost on on next project load" msgstr "" #: ../geanyprj/src/menu.c:180 @@ -3883,23 +3934,19 @@ msgid "_Project" msgstr "_Projecte" -#: ../geanyprj/src/menu.c:386 -#: ../geanyprj/src/sidebar.c:181 +#: ../geanyprj/src/menu.c:386 ../geanyprj/src/sidebar.c:181 msgid "Delete Project" msgstr "Elimina el Pojecte" -#: ../geanyprj/src/menu.c:397 -#: ../geanyprj/src/sidebar.c:194 +#: ../geanyprj/src/menu.c:397 ../geanyprj/src/sidebar.c:194 msgid "Add File" msgstr "Afegeix un Fitxer" -#: ../geanyprj/src/menu.c:408 -#: ../geanyprj/src/sidebar.c:216 +#: ../geanyprj/src/menu.c:408 ../geanyprj/src/sidebar.c:216 msgid "Preferences" msgstr "Preferències" -#: ../geanyprj/src/menu.c:419 -#: ../geanyprj/src/sidebar.c:229 +#: ../geanyprj/src/menu.c:419 ../geanyprj/src/sidebar.c:229 msgid "Find in Project" msgstr "Cerca en el Projecte" @@ -3907,8 +3954,7 @@ msgid "Remove File" msgstr "Elimina un Fitxer" -#: ../geanyprj/src/sidebar.c:240 -#: ../gproject/src/gproject-sidebar.c:803 +#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:849 msgid "H_ide Sidebar" msgstr "Amaga la Barra _Lateral" @@ -3917,12 +3963,57 @@ msgid "Project \"%s\" opened." msgstr "S'ha obert el projecte \"%s\"." +#: ../geanypy/src/geanypy-plugin.c:34 +msgid "GeanyPy" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:35 +msgid "Python plugins support" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:77 +#, fuzzy, c-format +msgid "Unable to pre-load Python library: %s." +msgstr "No s'ha pogut crear el directori de configuració '%s'" + +#: ../geanypy/src/geanypy-plugin.c:157 +msgid "Failed to import manager module" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:166 +msgid "Failed to retrieve PluginManager from manager module" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:182 +#, fuzzy +msgid "System plugin directory not found." +msgstr "No s'ha trobat el directori %s!\n" + +#: ../geanypy/src/geanypy-plugin.c:211 +msgid "Unable to instantiate new PluginManager" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:227 +msgid "Unable to get show_all() method on plugin manager" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:255 +#, fuzzy, c-format +msgid "Unable to create Python plugins directory: %s: %s" +msgstr "No s'ha pogut crear el directori de configuració '%s'" + +#: ../geanypy/src/geanypy-plugin.c:266 +msgid "Python Plugin Manager" +msgstr "" + #: ../geanysendmail/src/geanysendmail.c:43 msgid "GeanySendMail" msgstr "" #: ../geanysendmail/src/geanysendmail.c:44 -msgid "A little plugin to send the current file as attachment by user's favorite mailer" +msgid "" +"A little plugin to send the current file as attachment by user's favorite " +"mailer" msgstr "" #: ../geanysendmail/src/geanysendmail.c:98 @@ -3933,40 +4024,42 @@ msgid "Enter the recipient's e-mail address:" msgstr "Introduïu l'adreça electrònica del destinatari:" -#: ../geanysendmail/src/geanysendmail.c:136 +#: ../geanysendmail/src/geanysendmail.c:138 msgid "Filename placeholder not found. The executed command might have failed." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:142 -msgid "Recipient address placeholder not found. The executed command might have failed." +#: ../geanysendmail/src/geanysendmail.c:144 +msgid "" +"Recipient address placeholder not found. The executed command might have " +"failed." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:157 +#: ../geanysendmail/src/geanysendmail.c:159 msgid "Could not execute mailer. Please check your configuration." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:166 +#: ../geanysendmail/src/geanysendmail.c:168 msgid "Please define a mail client first." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:171 +#: ../geanysendmail/src/geanysendmail.c:173 msgid "File has to be saved before sending." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:187 +#: ../geanysendmail/src/geanysendmail.c:191 msgid "Mail" msgstr "Correu" -#: ../geanysendmail/src/geanysendmail.c:218 +#: ../geanysendmail/src/geanysendmail.c:222 msgid "Send by mail" msgstr "Envia per correu" #. add a label and a text entry to the dialog -#: ../geanysendmail/src/geanysendmail.c:308 +#: ../geanysendmail/src/geanysendmail.c:312 msgid "Path and options for the mail client:" msgstr "Ruta i opcions per al programa de correu:" -#: ../geanysendmail/src/geanysendmail.c:316 +#: ../geanysendmail/src/geanysendmail.c:320 msgid "" "Note: \n" "\t%f will be replaced by your file.\n" @@ -3977,29 +4070,30 @@ "\tmutt -s \"Sending '%b'\" -a \"%f\" \"%r\"" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:326 +#: ../geanysendmail/src/geanysendmail.c:330 msgid "Show toolbar icon" msgstr "Mostra les icones de les barres d'eines" -#: ../geanysendmail/src/geanysendmail.c:328 +#: ../geanysendmail/src/geanysendmail.c:332 msgid "Shows a icon in the toolbar to send file more easy." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:334 +#: ../geanysendmail/src/geanysendmail.c:338 msgid "Use dialog for entering email address of recipients" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:356 +#: ../geanysendmail/src/geanysendmail.c:360 msgid "Send file by mail" msgstr "Envia el fitxer per correu" #. Build up menu entry -#: ../geanysendmail/src/geanysendmail.c:379 +#: ../geanysendmail/src/geanysendmail.c:383 msgid "_Mail document" msgstr "Envia el docu_ment per correu electrònic" -#: ../geanysendmail/src/geanysendmail.c:382 -msgid "Sends the opened file as unzipped attachment by any mailer from your $PATH" +#: ../geanysendmail/src/geanysendmail.c:386 +msgid "" +"Sends the opened file as unzipped attachment by any mailer from your $PATH" msgstr "" #: ../geanyvc/src/geanyvc.c:53 @@ -4015,337 +4109,358 @@ msgid "geanyvc: s_spawn_sync error: %s" msgstr "" -#: ../geanyvc/src/geanyvc.c:609 -#: ../geanyvc/src/geanyvc.c:620 +#: ../geanyvc/src/geanyvc.c:561 +#, c-format +msgid "File %s: action %s executed via %s." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:614 ../geanyvc/src/geanyvc.c:625 #, c-format msgid "geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'" msgstr "" -#: ../geanyvc/src/geanyvc.c:646 -#: ../geanyvc/src/geanyvc.c:696 +#: ../geanyvc/src/geanyvc.c:651 ../geanyvc/src/geanyvc.c:701 msgid "No changes were made." msgstr "No s'han fet canvis." -#: ../geanyvc/src/geanyvc.c:723 +#: ../geanyvc/src/geanyvc.c:728 msgid "No history available" msgstr "No hi ha cap historial disponible" -#: ../geanyvc/src/geanyvc.c:916 -#: ../geanyvc/src/geanyvc.c:924 +#: ../geanyvc/src/geanyvc.c:921 ../geanyvc/src/geanyvc.c:929 #, c-format msgid "Do you really want to revert: %s?" msgstr "Esteu segurs de voler revertir: %s?" -#: ../geanyvc/src/geanyvc.c:932 +#: ../geanyvc/src/geanyvc.c:937 #, c-format msgid "Do you really want to add: %s?" msgstr "Esteu segurs de voler afegir: %s?" -#: ../geanyvc/src/geanyvc.c:939 +#: ../geanyvc/src/geanyvc.c:944 #, c-format msgid "Do you really want to remove: %s?" msgstr "Esteu segurs de voler eliminar: %s?" -#: ../geanyvc/src/geanyvc.c:962 +#: ../geanyvc/src/geanyvc.c:967 msgid "Do you really want to update?" msgstr "Esteu segurs de voler actualitzar?" -#: ../geanyvc/src/geanyvc.c:1225 +#: ../geanyvc/src/geanyvc.c:1094 +msgid "" +"The resulting differences cannot be displayed because the changes are too " +"big to display here and would slow down the UI significantly.\n" +"\n" +"To view the differences, cancel this dialog and open the differences in " +"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:1243 msgid "Commit Y/N" msgstr "" -#: ../geanyvc/src/geanyvc.c:1235 +#: ../geanyvc/src/geanyvc.c:1253 msgid "Status" msgstr "Estat" -#: ../geanyvc/src/geanyvc.c:1242 +#: ../geanyvc/src/geanyvc.c:1260 msgid "Path" msgstr "Directori base" -#: ../geanyvc/src/geanyvc.c:1330 +#: ../geanyvc/src/geanyvc.c:1324 +#, c-format +msgid "Line: %d Column: %d" +msgstr "" + +#: ../geanyvc/src/geanyvc.c:1370 msgid "Commit" msgstr "Confirmació" -#: ../geanyvc/src/geanyvc.c:1372 +#: ../geanyvc/src/geanyvc.c:1412 msgid "_De-/select all files" msgstr "" -#: ../geanyvc/src/geanyvc.c:1413 +#: ../geanyvc/src/geanyvc.c:1456 msgid "Commit message:" msgstr "" -#: ../geanyvc/src/geanyvc.c:1426 +#: ../geanyvc/src/geanyvc.c:1475 msgid "C_ommit" msgstr "" -#: ../geanyvc/src/geanyvc.c:1500 +#: ../geanyvc/src/geanyvc.c:1556 msgid "Nothing to commit." msgstr "" -#: ../geanyvc/src/geanyvc.c:1546 +#: ../geanyvc/src/geanyvc.c:1602 #, c-format msgid "Error initializing spell checking: %s" msgstr "" -#: ../geanyvc/src/geanyvc.c:1558 +#: ../geanyvc/src/geanyvc.c:1614 #, c-format -msgid "Error while setting up language for spellchecking. Please check configuration. Error message was: %s" +msgid "" +"Error while setting up language for spellchecking. Please check " +"configuration. Error message was: %s" msgstr "" -#: ../geanyvc/src/geanyvc.c:1834 +#: ../geanyvc/src/geanyvc.c:1890 msgid "Set Changed-flag for document tabs created by the plugin" msgstr "" -#: ../geanyvc/src/geanyvc.c:1837 -msgid "If this option is activated, every new by the VC-plugin created document tab will be marked as changed. Even this option is useful in some cases, it could cause a big number of annoying \"Do you want to save\"-dialogs." +#: ../geanyvc/src/geanyvc.c:1893 +msgid "" +"If this option is activated, every new by the VC-plugin created document tab " +"will be marked as changed. Even this option is useful in some cases, it " +"could cause a big number of annoying \"Do you want to save\"-dialogs." msgstr "" -#: ../geanyvc/src/geanyvc.c:1845 +#: ../geanyvc/src/geanyvc.c:1901 msgid "Confirm adding new files to a VCS" msgstr "" -#: ../geanyvc/src/geanyvc.c:1848 +#: ../geanyvc/src/geanyvc.c:1904 msgid "Shows a confirmation dialog on adding a new (created) file to VCS." msgstr "" -#: ../geanyvc/src/geanyvc.c:1854 +#: ../geanyvc/src/geanyvc.c:1910 msgid "Maximize commit dialog" msgstr "" -#: ../geanyvc/src/geanyvc.c:1855 +#: ../geanyvc/src/geanyvc.c:1911 msgid "Show commit dialog maximize." msgstr "" -#: ../geanyvc/src/geanyvc.c:1861 +#: ../geanyvc/src/geanyvc.c:1917 msgid "Use external diff viewer" msgstr "" -#: ../geanyvc/src/geanyvc.c:1863 +#: ../geanyvc/src/geanyvc.c:1919 msgid "Use external diff viewer for file diff." msgstr "" -#: ../geanyvc/src/geanyvc.c:1869 +#: ../geanyvc/src/geanyvc.c:1925 msgid "Show VC entries at editor menu" msgstr "" -#: ../geanyvc/src/geanyvc.c:1871 +#: ../geanyvc/src/geanyvc.c:1927 msgid "Show entries for VC functions inside editor menu" msgstr "" -#: ../geanyvc/src/geanyvc.c:1876 +#: ../geanyvc/src/geanyvc.c:1932 msgid "Attach menu to menubar" msgstr "Annexar el menú a la barra d'eines" -#: ../geanyvc/src/geanyvc.c:1878 -msgid "Whether menu for this plugin are getting placed either inside tools menu or directly inside Geany's menubar.Will take in account after next start of GeanyVC" +#: ../geanyvc/src/geanyvc.c:1934 +msgid "" +"Whether menu for this plugin are getting placed either inside tools menu or " +"directly inside Geany's menubar.Will take in account after next start of " +"GeanyVC" msgstr "" -#: ../geanyvc/src/geanyvc.c:1886 +#: ../geanyvc/src/geanyvc.c:1942 msgid "Enable CVS" msgstr "Activa CVS" -#: ../geanyvc/src/geanyvc.c:1891 +#: ../geanyvc/src/geanyvc.c:1947 msgid "Enable GIT" msgstr "Activa GIT" -#: ../geanyvc/src/geanyvc.c:1896 +#: ../geanyvc/src/geanyvc.c:1952 msgid "Enable SVN" msgstr "Activa SVN" -#: ../geanyvc/src/geanyvc.c:1901 +#: ../geanyvc/src/geanyvc.c:1957 msgid "Enable SVK" msgstr "Activa SVK" -#: ../geanyvc/src/geanyvc.c:1906 +#: ../geanyvc/src/geanyvc.c:1962 msgid "Enable Bazaar" msgstr "Activa Bazaar" -#: ../geanyvc/src/geanyvc.c:1911 +#: ../geanyvc/src/geanyvc.c:1967 msgid "Enable Mercurial" msgstr "Activa Mercurial" -#: ../geanyvc/src/geanyvc.c:1917 +#: ../geanyvc/src/geanyvc.c:1973 msgid "Spellcheck language" msgstr "" -#: ../geanyvc/src/geanyvc.c:2008 +#: ../geanyvc/src/geanyvc.c:2064 msgid "_VC file Actions" msgstr "" #. Diff of current file #. Diff of the current dir #. Complete diff of base directory -#: ../geanyvc/src/geanyvc.c:2014 -#: ../geanyvc/src/geanyvc.c:2091 -#: ../geanyvc/src/geanyvc.c:2131 +#: ../geanyvc/src/geanyvc.c:2070 ../geanyvc/src/geanyvc.c:2147 +#: ../geanyvc/src/geanyvc.c:2187 msgid "_Diff" msgstr "_Diferències" -#: ../geanyvc/src/geanyvc.c:2017 +#: ../geanyvc/src/geanyvc.c:2073 msgid "Make a diff from the current active file" msgstr "" #. Revert current file #. Revert current dir #. Revert everything -#: ../geanyvc/src/geanyvc.c:2022 -#: ../geanyvc/src/geanyvc.c:2100 -#: ../geanyvc/src/geanyvc.c:2139 +#: ../geanyvc/src/geanyvc.c:2078 ../geanyvc/src/geanyvc.c:2156 +#: ../geanyvc/src/geanyvc.c:2195 msgid "_Revert" msgstr "_Reverteix" -#: ../geanyvc/src/geanyvc.c:2025 +#: ../geanyvc/src/geanyvc.c:2081 msgid "Restore pristine working copy file (undo local edits)." msgstr "" #. Blame for current file -#: ../geanyvc/src/geanyvc.c:2034 +#: ../geanyvc/src/geanyvc.c:2090 msgid "_Blame" msgstr "" -#: ../geanyvc/src/geanyvc.c:2037 +#: ../geanyvc/src/geanyvc.c:2093 msgid "Shows the changes made at one file per revision and author." msgstr "" #. History/log of current file #. History/log of the current dir #. Complete History/Log of base directory -#: ../geanyvc/src/geanyvc.c:2044 -#: ../geanyvc/src/geanyvc.c:2110 -#: ../geanyvc/src/geanyvc.c:2151 +#: ../geanyvc/src/geanyvc.c:2100 ../geanyvc/src/geanyvc.c:2166 +#: ../geanyvc/src/geanyvc.c:2207 msgid "_History (log)" msgstr "" -#: ../geanyvc/src/geanyvc.c:2047 +#: ../geanyvc/src/geanyvc.c:2103 msgid "Shows the log of the current file" msgstr "" #. base version of the current file -#: ../geanyvc/src/geanyvc.c:2052 +#: ../geanyvc/src/geanyvc.c:2108 msgid "_Original" msgstr "_Original" -#: ../geanyvc/src/geanyvc.c:2055 +#: ../geanyvc/src/geanyvc.c:2111 msgid "Shows the original of the current file" msgstr "" #. add current file -#: ../geanyvc/src/geanyvc.c:2063 +#: ../geanyvc/src/geanyvc.c:2119 msgid "_Add to Version Control" msgstr "" -#: ../geanyvc/src/geanyvc.c:2065 +#: ../geanyvc/src/geanyvc.c:2121 msgid "Add file to repository." msgstr "Afegeix el fitxer al repositori." #. remove current file -#: ../geanyvc/src/geanyvc.c:2071 +#: ../geanyvc/src/geanyvc.c:2127 msgid "_Remove from Version Control" msgstr "" -#: ../geanyvc/src/geanyvc.c:2073 +#: ../geanyvc/src/geanyvc.c:2129 msgid "Remove file from repository." msgstr "Elimina el fitxer del repositori." -#: ../geanyvc/src/geanyvc.c:2088 +#: ../geanyvc/src/geanyvc.c:2144 msgid "_Directory" msgstr "_Directori" -#: ../geanyvc/src/geanyvc.c:2094 +#: ../geanyvc/src/geanyvc.c:2150 msgid "Make a diff from the directory of the current active file" msgstr "" -#: ../geanyvc/src/geanyvc.c:2103 +#: ../geanyvc/src/geanyvc.c:2159 msgid "Restore original files in the current folder (undo local edits)." msgstr "" -#: ../geanyvc/src/geanyvc.c:2113 +#: ../geanyvc/src/geanyvc.c:2169 msgid "Shows the log of the current directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2127 +#: ../geanyvc/src/geanyvc.c:2183 msgid "_Base Directory" msgstr "Directori _Base" -#: ../geanyvc/src/geanyvc.c:2133 +#: ../geanyvc/src/geanyvc.c:2189 msgid "Make a diff from the top VC directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2141 +#: ../geanyvc/src/geanyvc.c:2197 msgid "Revert any local edits." msgstr "" -#: ../geanyvc/src/geanyvc.c:2154 +#: ../geanyvc/src/geanyvc.c:2210 msgid "Shows the log of the top VC directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2180 +#: ../geanyvc/src/geanyvc.c:2236 msgid "VC _Commit" msgstr "" -#: ../geanyvc/src/geanyvc.c:2215 +#: ../geanyvc/src/geanyvc.c:2271 msgid "Show diff of file" msgstr "Mostra diferències entre fitxers" -#: ../geanyvc/src/geanyvc.c:2217 +#: ../geanyvc/src/geanyvc.c:2273 msgid "Show diff of directory" msgstr "Mostra diferències entre directoris" -#: ../geanyvc/src/geanyvc.c:2219 +#: ../geanyvc/src/geanyvc.c:2275 msgid "Show diff of basedir" msgstr "Mostra diferències entre directoris base" -#: ../geanyvc/src/geanyvc.c:2222 +#: ../geanyvc/src/geanyvc.c:2278 msgid "Commit changes" msgstr "" -#: ../geanyvc/src/geanyvc.c:2224 +#: ../geanyvc/src/geanyvc.c:2280 msgid "Show status" msgstr "Mostra l'estat" -#: ../geanyvc/src/geanyvc.c:2226 +#: ../geanyvc/src/geanyvc.c:2282 msgid "Revert single file" msgstr "" -#: ../geanyvc/src/geanyvc.c:2228 +#: ../geanyvc/src/geanyvc.c:2284 msgid "Revert directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2230 +#: ../geanyvc/src/geanyvc.c:2286 msgid "Revert base directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2232 +#: ../geanyvc/src/geanyvc.c:2288 msgid "Update file" msgstr "Actualitza el fitxer" -#: ../geanyvc/src/geanyvc.c:2260 +#: ../geanyvc/src/geanyvc.c:2316 msgid "_VC" msgstr "" -#: ../geanyvc/src/geanyvc.c:2266 +#: ../geanyvc/src/geanyvc.c:2322 msgid "_Version Control" msgstr "Control de _Versions" #. Status of basedir -#: ../geanyvc/src/geanyvc.c:2288 +#: ../geanyvc/src/geanyvc.c:2344 msgid "_Status" msgstr "_Estat" -#: ../geanyvc/src/geanyvc.c:2290 +#: ../geanyvc/src/geanyvc.c:2346 msgid "Show status." msgstr "Mostra l'estat." -#: ../geanyvc/src/geanyvc.c:2297 +#: ../geanyvc/src/geanyvc.c:2353 msgid "Update from remote repository." msgstr "Actualitza des dels repositoris." #. Commit all changes -#: ../geanyvc/src/geanyvc.c:2302 +#: ../geanyvc/src/geanyvc.c:2358 msgid "_Commit" msgstr "Publica els _canvis" -#: ../geanyvc/src/geanyvc.c:2304 +#: ../geanyvc/src/geanyvc.c:2360 msgid "Commit changes." msgstr "Publica els canvis." @@ -4405,8 +4520,7 @@ msgid "_Paste it!" msgstr "" -#: ../gproject/src/gproject-main.c:36 -#: ../gproject/src/gproject-project.c:455 +#: ../gproject/src/gproject-main.c:36 ../gproject/src/gproject-project.c:455 msgid "GProject" msgstr "" @@ -4447,7 +4561,8 @@ msgstr "Patrons de fitxers de codi font:" #: ../gproject/src/gproject-project.c:412 -msgid "Space separated list of patterns that are used to identify source files." +msgid "" +"Space separated list of patterns that are used to identify source files." msgstr "" #: ../gproject/src/gproject-project.c:417 @@ -4455,7 +4570,9 @@ msgstr "Patrons de fitxers de capçalera:" #: ../gproject/src/gproject-project.c:423 -msgid "Space separated list of patterns that are used to identify headers. Used mainly for header/source swapping." +msgid "" +"Space separated list of patterns that are used to identify headers. Used " +"mainly for header/source swapping." msgstr "" #: ../gproject/src/gproject-project.c:429 @@ -4463,7 +4580,9 @@ msgstr "" #: ../gproject/src/gproject-project.c:435 -msgid "Space separated list of patterns that are used to identify directories that are not scanned for source files." +msgid "" +"Space separated list of patterns that are used to identify directories that " +"are not scanned for source files." msgstr "" #: ../gproject/src/gproject-project.c:443 @@ -4471,87 +4590,91 @@ msgstr "" #: ../gproject/src/gproject-project.c:445 -msgid "Generate tag list for all project files instead of only for the currently opened files. Too slow for big projects (>1000 files) and should be disabled in this case." +msgid "" +"Generate tag list for all project files instead of only for the currently " +"opened files. Too slow for big projects (>1000 files) and should be disabled " +"in this case." msgstr "" #: ../gproject/src/gproject-project.c:451 -msgid "Note: set the patterns of files belonging to the project under the Project tab." +msgid "" +"Note: set the patterns of files belonging to the project under the Project " +"tab." msgstr "" -#: ../gproject/src/gproject-sidebar.c:81 -#: ../gproject/src/gproject-sidebar.c:792 +#: ../gproject/src/gproject-sidebar.c:90 +#: ../gproject/src/gproject-sidebar.c:838 msgid "Find File" msgstr "" -#: ../gproject/src/gproject-sidebar.c:108 +#: ../gproject/src/gproject-sidebar.c:117 msgid "Search inside:" msgstr "" -#: ../gproject/src/gproject-sidebar.c:120 +#: ../gproject/src/gproject-sidebar.c:129 msgid "C_ase sensitive" msgstr "Sensible a m_ajúscules" -#: ../gproject/src/gproject-sidebar.c:123 +#: ../gproject/src/gproject-sidebar.c:132 msgid "Search in full path" msgstr "" -#: ../gproject/src/gproject-sidebar.c:702 +#: ../gproject/src/gproject-sidebar.c:745 msgid "Reload all" msgstr "Actualitza tot" -#: ../gproject/src/gproject-sidebar.c:711 -#: ../treebrowser/src/treebrowser.c:1282 +#: ../gproject/src/gproject-sidebar.c:754 +#: ../treebrowser/src/treebrowser.c:1281 msgid "Expand all" msgstr "Expandeix-ho tot" -#: ../gproject/src/gproject-sidebar.c:717 -#: ../treebrowser/src/treebrowser.c:1286 +#: ../gproject/src/gproject-sidebar.c:761 +#: ../treebrowser/src/treebrowser.c:1285 msgid "Collapse all" msgstr "Tanca-ho Tot" -#: ../gproject/src/gproject-sidebar.c:726 +#: ../gproject/src/gproject-sidebar.c:771 msgid "Follow active editor" msgstr "" -#: ../gproject/src/gproject-sidebar.c:774 +#: ../gproject/src/gproject-sidebar.c:820 msgid "Expand All" msgstr "Expandeix-ho Tot" -#: ../gproject/src/gproject-sidebar.c:783 -#: ../treebrowser/src/treebrowser.c:1234 +#: ../gproject/src/gproject-sidebar.c:829 msgid "Find in Files" msgstr "Cerca en els Fitxers" #. POSITION OF VIEW -#: ../markdown/src/conf.c:572 +#: ../markdown/src/conf.c:567 msgid "Position:" msgstr "Posició:" -#: ../markdown/src/conf.c:578 +#: ../markdown/src/conf.c:573 msgid "Sidebar" msgstr "Barra Lateral" -#: ../markdown/src/conf.c:586 +#: ../markdown/src/conf.c:581 msgid "Message Window" msgstr "Finestra de missatges" -#: ../markdown/src/conf.c:600 +#: ../markdown/src/conf.c:595 msgid "Font:" msgstr "Font:" -#: ../markdown/src/conf.c:618 +#: ../markdown/src/conf.c:612 msgid "Code Font:" msgstr "Tipus de Lletra per a Codi:" -#: ../markdown/src/conf.c:636 +#: ../markdown/src/conf.c:629 msgid "BG Color:" msgstr "Color del Fons:" -#: ../markdown/src/conf.c:653 +#: ../markdown/src/conf.c:645 msgid "FG Color:" msgstr "Color del Primer Pla:" -#: ../markdown/src/conf.c:672 +#: ../markdown/src/conf.c:663 msgid "Select Template File" msgstr "" @@ -4567,6 +4690,161 @@ msgid "The current document does not have a Markdown filetype." msgstr "" +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:35 +msgid "Pair Tag Highlighter" +msgstr "" + +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:36 +msgid "Finds and highlights matching opening/closing HTML tag" +msgstr "" + +#: ../pohelper/data/menus.ui.h:1 +msgid "_Translation Helper" +msgstr "" + +#: ../pohelper/data/menus.ui.h:2 +msgid "_Previous String" +msgstr "" + +#: ../pohelper/data/menus.ui.h:3 ../pohelper/src/gph-plugin.c:1031 +#, fuzzy +msgid "Go to previous string" +msgstr "Vés a la pàgina anterior" + +#: ../pohelper/data/menus.ui.h:4 +msgid "_Next String" +msgstr "" + +#: ../pohelper/data/menus.ui.h:5 ../pohelper/src/gph-plugin.c:1034 +#, fuzzy +msgid "Go to next string" +msgstr "Vés a la pàgina següent" + +#: ../pohelper/data/menus.ui.h:6 +msgid "Pre_vious Untranslated" +msgstr "" + +#: ../pohelper/data/menus.ui.h:7 ../pohelper/src/gph-plugin.c:1037 +msgid "Go to previous untranslated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:8 +msgid "Next _Untranslated" +msgstr "" + +#: ../pohelper/data/menus.ui.h:9 ../pohelper/src/gph-plugin.c:1040 +msgid "Go to next untranslated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:10 +msgid "Previous Fu_zzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:11 ../pohelper/src/gph-plugin.c:1043 +msgid "Go to previous fuzzily translated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:12 +msgid "Next _Fuzzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:13 ../pohelper/src/gph-plugin.c:1046 +msgid "Go to next fuzzily translated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:14 +msgid "Previous Untranslated or Fuzz_y" +msgstr "" + +#: ../pohelper/data/menus.ui.h:15 ../pohelper/src/gph-plugin.c:1049 +msgid "Go to previous untranslated or fuzzy string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:16 +msgid "Next Untranslated _or Fuzzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:17 ../pohelper/src/gph-plugin.c:1053 +msgid "Go to next untranslated or fuzzy string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:18 ../pohelper/src/gph-plugin.c:1064 +msgid "Toggle current translation fuzziness" +msgstr "" + +#: ../pohelper/data/menus.ui.h:19 +msgid "_Toggle Fuzziness" +msgstr "" + +#: ../pohelper/data/menus.ui.h:20 +msgid "Paste _Message as Translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:21 +msgid "Paste the original untranslated string to the translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:22 ../pohelper/src/gph-plugin.c:1061 +msgid "Reflow the current translation string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:23 +msgid "_Reflow Translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:24 +msgid "" +"Whether to update the translation headers (author, revision date, ...) upon " +"file save" +msgstr "" + +#: ../pohelper/data/menus.ui.h:25 +msgid "Update _Headers Upon Save" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:41 +msgid "Translation Helper" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:42 +msgid "Improves support for GetText translation files." +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1057 +msgid "Paste original untranslated string to translation" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1099 +#, fuzzy, c-format +msgid "Failed to load configuration file: %s" +msgstr "No s'ha pogut carregar la configuració: %s" + +#: ../pohelper/src/gph-plugin.c:1124 +#, fuzzy, c-format +msgid "Failed to create configuration directory \"%s\": %s" +msgstr "" +"No s'ha pogut trobar un fitxer de configuració per al tipus de fitxer \"%s" +"\": %s" + +#: ../pohelper/src/gph-plugin.c:1127 +#, fuzzy, c-format +msgid "Failed to save configuration file: %s" +msgstr "No s'ha pogut desar la configuració: %s" + +#: ../pohelper/src/gph-plugin.c:1182 +#, c-format +msgid "" +"Failed to load UI definition, please check your installation. The error was: " +"%s" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1222 +#, c-format +msgid "" +"Cannot find widget \"%s\" in the UI definition, please check your " +"installation." +msgstr "" + #: ../pretty-printer/src/PluginEntry.c:37 msgid "XML PrettyPrinter" msgstr "" @@ -4590,7 +4868,8 @@ #: ../pretty-printer/src/PluginEntry.c:159 msgid "" -"Unable to process PrettyPrinting on the specified XML because some features are not supported.\n" +"Unable to process PrettyPrinting on the specified XML because some features " +"are not supported.\n" "\n" "See Help > Debug messages for more details..." msgstr "" @@ -4599,20 +4878,17 @@ msgid "Comments" msgstr "Comentaris" -#: ../pretty-printer/src/ConfigUI.c:73 -#: ../pretty-printer/src/ConfigUI.c:74 +#: ../pretty-printer/src/ConfigUI.c:73 ../pretty-printer/src/ConfigUI.c:74 #: ../pretty-printer/src/ConfigUI.c:75 msgid "Put on one line" msgstr "" -#: ../pretty-printer/src/ConfigUI.c:73 -#: ../pretty-printer/src/ConfigUI.c:74 +#: ../pretty-printer/src/ConfigUI.c:73 ../pretty-printer/src/ConfigUI.c:74 #: ../pretty-printer/src/ConfigUI.c:75 msgid "Inline if possible" msgstr "" -#: ../pretty-printer/src/ConfigUI.c:73 -#: ../pretty-printer/src/ConfigUI.c:74 +#: ../pretty-printer/src/ConfigUI.c:73 ../pretty-printer/src/ConfigUI.c:74 #: ../pretty-printer/src/ConfigUI.c:75 msgid "Alignment" msgstr "Alineació" @@ -4654,506 +4930,574 @@ msgstr "Salt de línia" #: ../scope/data/scope.glade.h:1 -msgid "-" -msgstr "-" +msgid "Debu_g" +msgstr "" #: ../scope/data/scope.glade.h:2 -msgid "Inspect" -msgstr "Inspecciona" +msgid "_Setup Program" +msgstr "" #: ../scope/data/scope.glade.h:3 -msgid "Others" -msgstr "Altres" +msgid "Recent _Programs" +msgstr "_Programes Recents" #: ../scope/data/scope.glade.h:4 -msgid "Panel" -msgstr "Quadre" +msgid "_Run/Continue" +msgstr "E_xecuta/Continua" #: ../scope/data/scope.glade.h:5 -msgid "Values" -msgstr "Valors" +msgid "Run to _Cursor" +msgstr "Executa fins al _Cursor" #: ../scope/data/scope.glade.h:6 -msgid "@" -msgstr "@" +msgid "Run to _Source" +msgstr "" #: ../scope/data/scope.glade.h:7 -msgid "Add _Break" -msgstr "" +msgid "Step _Into" +msgstr "Pas _Enrere" #: ../scope/data/scope.glade.h:8 -msgid "Add _Watch" -msgstr "Afegeix Punt de _Vigilància" +msgid "Step _Over" +msgstr "Passa al _Següent" #: ../scope/data/scope.glade.h:9 -msgid "Apply on _Run" -msgstr "" +msgid "Step O_ut" +msgstr "Pas _Avant" #: ../scope/data/scope.glade.h:10 -msgid "Auto _Hide" -msgstr "_Ocultar Automàticament" +msgid "_Terminate" +msgstr "_Finalitza" #: ../scope/data/scope.glade.h:11 -msgid "Auto _run program/exit gdb" -msgstr "" +msgid "Toggle _Breakpoint" +msgstr "Commuta el Punt de _Ruptura" + +#: ../scope/data/scope.glade.h:12 +msgid "_GDB Command" +msgstr "Ordre _GDB" #: ../scope/data/scope.glade.h:13 -msgid "Convert _UTF-8 to locale" -msgstr "" +msgid "_More" +msgstr "_Més" #: ../scope/data/scope.glade.h:14 -msgid "Count:" -msgstr "Recompte:" +msgid "_Show Terminal" +msgstr "_Mostra el terminal" #: ../scope/data/scope.glade.h:15 -msgid "Debu_g" +msgid "_Reset Markers" +msgstr "Elimina les Ma_rques" + +#: ../scope/data/scope.glade.h:16 +msgid "_Cleanup Files" msgstr "" #: ../scope/data/scope.glade.h:17 -msgid "Debug Console" -msgstr "Consola de Depuració" +msgid "_Feed" +msgstr "_Canal" #: ../scope/data/scope.glade.h:18 -msgid "Default 8-bit text mode:" -msgstr "" +msgid "_Window" +msgstr "_Finestra" #: ../scope/data/scope.glade.h:19 -msgid "Display" -msgstr "Visualització" +msgid "_Auto Show" +msgstr "" #: ../scope/data/scope.glade.h:20 -msgid "E_xpand on apply" -msgstr "" +msgid "Auto _Hide" +msgstr "_Ocultar Automàticament" #: ../scope/data/scope.glade.h:21 -msgid "En_vironment:" -msgstr "En_torn:" +msgid "Show on _Error" +msgstr "" #: ../scope/data/scope.glade.h:22 -msgid "Enter assignment expression:" -msgstr "" +msgid "_Unsorted" +msgstr "Sense _ordre" #: ../scope/data/scope.glade.h:23 -msgid "Enter gdb command:" -msgstr "" +msgid "_View Source" +msgstr "_Visualitza el Codi Font" #: ../scope/data/scope.glade.h:24 -msgid "Expand" -msgstr "Expandeix" +msgid "S_ynchronize" +msgstr "S_incronitza" #: ../scope/data/scope.glade.h:25 -msgid "Frame:" -msgstr "Fotograma:" +msgid "_Interrupt" +msgstr "_Interromp" #: ../scope/data/scope.glade.h:26 -msgid "Inspect" -msgstr "Inspecciona" +msgid "_Send Signal" +msgstr "En_via Senyal" #: ../scope/data/scope.glade.h:27 -msgid "Locals" -msgstr "Locals" +msgid "S_elect on" +msgstr "" #: ../scope/data/scope.glade.h:28 -msgid "Memory" -msgstr "Memòria" +msgid "_Running" +msgstr "En e_xecució" + +#: ../scope/data/scope.glade.h:29 +msgid "_Stopped" +msgstr "A_turat" #: ../scope/data/scope.glade.h:30 -msgid "Object:" -msgstr "Objecte:" +msgid "_Exited" +msgstr "" #: ../scope/data/scope.glade.h:31 -msgid "Open on" -msgstr "Obre a" +msgid "_Follow" +msgstr "Se_gueix" #: ../scope/data/scope.glade.h:32 -msgid "Options" -msgstr "Opcions" +msgid "_Columns" +msgstr "_Columnes" #: ../scope/data/scope.glade.h:33 -#: ../scope/src/prefs.c:337 -msgid "Program" -msgstr "Programa" +msgid "Show _Group" +msgstr "" #: ../scope/data/scope.glade.h:34 -msgid "Program Terminal" -msgstr "Programa del Terminal" +msgid "Show _Core" +msgstr "" #: ../scope/data/scope.glade.h:35 -msgid "R_ead" +msgid "Add _Break" msgstr "" #: ../scope/data/scope.glade.h:36 -msgid "Recent _Programs" -msgstr "_Programes Recents" +msgid "Add _Watch" +msgstr "Afegeix Punt de _Vigilància" #: ../scope/data/scope.glade.h:37 -msgid "Run to _Cursor" -msgstr "Executa fins al _Cursor" +msgid "Apply on _Run" +msgstr "" #: ../scope/data/scope.glade.h:38 -msgid "Run to _Source" +msgid "_Show @entry" msgstr "" #: ../scope/data/scope.glade.h:39 -msgid "S_elect on" +msgid "Show _Address" msgstr "" #: ../scope/data/scope.glade.h:40 -msgid "S_how" -msgstr "_Mostra" +msgid "_Modify" +msgstr "_Modifica" #: ../scope/data/scope.glade.h:41 -msgid "S_ynchronize" -msgstr "S_incronitza" +msgid "_Watch" +msgstr "_Mira" #: ../scope/data/scope.glade.h:42 -msgid "Setup Program" -msgstr "" +msgid "_Inspect" +msgstr "_Inspecciona" #: ../scope/data/scope.glade.h:43 -msgid "Show =li_brary messages" -msgstr "" +msgid "_8-bit mode" +msgstr "_8-bit mode" #: ../scope/data/scope.glade.h:44 -msgid "Show _Address" -msgstr "" +msgid "_Default" +msgstr "Per _defecte" #: ../scope/data/scope.glade.h:45 -msgid "Show _Core" -msgstr "" +msgid "_7 bit" +msgstr "_7 bit" #: ../scope/data/scope.glade.h:46 -msgid "Show _Group" -msgstr "" +msgid "_Locale" +msgstr "_Localització" #: ../scope/data/scope.glade.h:47 -msgid "Show _tooltips" -msgstr "Mostra _consells" +msgid "_UTF-8" +msgstr "_UTF-8" #: ../scope/data/scope.glade.h:48 -msgid "Show on _Error" -msgstr "" +msgid "_Show .names" +msgstr "_Mostra .noms" #: ../scope/data/scope.glade.h:49 -msgid "Stack" -msgstr "Pila" +msgid "R_ead" +msgstr "" #: ../scope/data/scope.glade.h:50 -msgid "Start:" -msgstr "Inici:" +msgid "_Group by" +msgstr "A_grupa per" #: ../scope/data/scope.glade.h:51 -msgid "Step O_ut" -msgstr "Pas _Avant" +msgid "_1" +msgstr "_1" #: ../scope/data/scope.glade.h:52 -msgid "Step _Into" -msgstr "Pas _Enrere" +msgid "_2" +msgstr "_2" #: ../scope/data/scope.glade.h:53 -msgid "Step _Over" -msgstr "Passa al _Següent" +msgid "_4" +msgstr "_4" #: ../scope/data/scope.glade.h:54 -msgid "Threads" -msgstr "Fils d'execució" +msgid "_8" +msgstr "_8" #: ../scope/data/scope.glade.h:55 -msgid "Toggle _Breakpoint" -msgstr "Commuta el Punt de _Ruptura" +msgid "_Jump To" +msgstr "_Vés a" #: ../scope/data/scope.glade.h:56 -msgid "Update all _views" -msgstr "Actualitza _totes les vistes" +msgid "_Apply" +msgstr "_Aplica" #: ../scope/data/scope.glade.h:57 -msgid "Watches" -msgstr "Punts de vigilància" - -#: ../scope/data/scope.glade.h:58 -msgid "_1" -msgstr "_1" +msgid "_Expand" +msgstr "_Expandeix" #: ../scope/data/scope.glade.h:59 -msgid "_2" -msgstr "_2" +msgid "_Natural" +msgstr "_Natural" #: ../scope/data/scope.glade.h:60 -msgid "_4" -msgstr "_4" +msgid "_Decimal" +msgstr "_Decimal" #: ../scope/data/scope.glade.h:61 -msgid "_7 bit" -msgstr "_7 bit" +msgid "_Hex" +msgstr "_Hex" #: ../scope/data/scope.glade.h:62 -msgid "" -"_7-bit \\n" -"nn" -msgstr "" -"_7-bit \\n" -"nn" +msgid "_Octal" +msgstr "_Octal" #: ../scope/data/scope.glade.h:63 -msgid "_8" -msgstr "_8" +msgid "_Binary" +msgstr "_Binari" #: ../scope/data/scope.glade.h:64 -msgid "_8-bit mode" -msgstr "_8-bit mode" +msgid "_Raw" +msgstr "" #: ../scope/data/scope.glade.h:65 -msgid "_Apply" -msgstr "_Aplica" +msgid "_Evaluate/Modify" +msgstr "" #: ../scope/data/scope.glade.h:66 -msgid "_Apply on run" +msgid "_Watch Expression" msgstr "" #: ../scope/data/scope.glade.h:67 -msgid "_Arguments:" -msgstr "_Arguments:" +msgid "_Inspect Variable" +msgstr "" #: ../scope/data/scope.glade.h:68 -msgid "_Auto Show" -msgstr "" +msgid "Threads" +msgstr "Fils d'execució" #: ../scope/data/scope.glade.h:69 -msgid "_Binary" -msgstr "_Binari" +msgid "Stack" +msgstr "Pila" #: ../scope/data/scope.glade.h:70 -msgid "_Cleanup Files" -msgstr "" +msgid "Locals" +msgstr "Locals" #: ../scope/data/scope.glade.h:71 -msgid "_Columns" -msgstr "_Columnes" +msgid "Watches" +msgstr "Punts de vigilància" #: ../scope/data/scope.glade.h:72 -msgid "_Decimal" -msgstr "_Decimal" +msgid "Memory" +msgstr "Memòria" #: ../scope/data/scope.glade.h:73 -msgid "_Default" -msgstr "Per _defecte" +msgid "Enter gdb command:" +msgstr "" #: ../scope/data/scope.glade.h:74 -msgid "_Delete all breakpoints, watches and inspects" +msgid "Convert _UTF-8 to locale" msgstr "" #: ../scope/data/scope.glade.h:75 -msgid "_Evaluate/Modify" -msgstr "" +msgid "_Thread" +msgstr "_Fil d'execució" #: ../scope/data/scope.glade.h:76 -msgid "_Executable:" -msgstr "_Executable:" +msgid "_Group" +msgstr "_Grup" #: ../scope/data/scope.glade.h:77 -msgid "_Exited" -msgstr "" +msgid "_Frame" +msgstr "_Marc" #: ../scope/data/scope.glade.h:78 -msgid "_Expand" -msgstr "_Expandeix" +msgid "Setup Program" +msgstr "" #: ../scope/data/scope.glade.h:79 -msgid "_Expand on apply" -msgstr "" +msgid "_Executable:" +msgstr "_Executable:" #: ../scope/data/scope.glade.h:80 -msgid "_Feed" -msgstr "_Canal" +msgid "_Arguments:" +msgstr "_Arguments:" #: ../scope/data/scope.glade.h:81 -msgid "_Follow" -msgstr "Se_gueix" +msgid "En_vironment:" +msgstr "En_torn:" + +#: ../scope/data/scope.glade.h:82 +msgid "_Working dir:" +msgstr "" #: ../scope/data/scope.glade.h:83 -msgid "_Frame" -msgstr "_Marc" +msgid "_Load script:" +msgstr "" #: ../scope/data/scope.glade.h:84 -msgid "_GDB Command" -msgstr "Ordre _GDB" +msgid "Auto _run program/exit gdb" +msgstr "" #: ../scope/data/scope.glade.h:85 -msgid "_Group" -msgstr "_Grup" +msgid "_Non-stop mode" +msgstr "" #: ../scope/data/scope.glade.h:86 -msgid "_Group by" -msgstr "A_grupa per" +msgid "_Temporary breakpoint on load at:" +msgstr "" #: ../scope/data/scope.glade.h:87 -msgid "_Hex" -msgstr "_Hex" +msgid "_Delete all breakpoints, watches, inspects and registers" +msgstr "" -#: ../scope/data/scope.glade.h:88 -msgid "_Import" -msgstr "_Importa" +#: ../scope/data/scope.glade.h:88 ../scope/src/scope.c:522 +msgid "Program" +msgstr "Programa" #: ../scope/data/scope.glade.h:89 -msgid "_Inspect" -msgstr "_Inspecciona" +msgid "Open on" +msgstr "Obre a" #: ../scope/data/scope.glade.h:90 -msgid "_Inspect Variable" +msgid "g_db load" msgstr "" #: ../scope/data/scope.glade.h:91 -msgid "_Interrupt" -msgstr "_Interromp" +msgid "p_rogram start" +msgstr "" #: ../scope/data/scope.glade.h:92 -msgid "_Jump To" -msgstr "_Vés a" +msgid "Update all _views" +msgstr "Actualitza _totes les vistes" #: ../scope/data/scope.glade.h:93 -msgid "_Load script:" -msgstr "" +msgid "Panel" +msgstr "Quadre" #: ../scope/data/scope.glade.h:94 -msgid "_Locale" -msgstr "_Localització" +msgid "Default 8-bit text mode:" +msgstr "" #: ../scope/data/scope.glade.h:95 -msgid "_Modify" -msgstr "_Modifica" +msgid "_7-bit \\nnn" +msgstr "_7-bit \\nnn" #: ../scope/data/scope.glade.h:96 -msgid "_More" -msgstr "_Més" +msgid "Display" +msgstr "Visualització" #: ../scope/data/scope.glade.h:97 -msgid "_Natural" -msgstr "_Natural" +msgid "_member" +msgstr "_membre" #: ../scope/data/scope.glade.h:98 -msgid "_Non-stop mode" -msgstr "" +msgid "and" +msgstr "i" #: ../scope/data/scope.glade.h:99 -msgid "_Octal" -msgstr "_Octal" +msgid "_argument" +msgstr "_argument" #: ../scope/data/scope.glade.h:100 -msgid "_Reset Markers" -msgstr "Elimina les Ma_rques" +msgid "names" +msgstr "noms" #: ../scope/data/scope.glade.h:101 -msgid "_Run/Continue" -msgstr "E_xecuta/Continua" +msgid "Values" +msgstr "Valors" #: ../scope/data/scope.glade.h:102 -msgid "_Running" -msgstr "En e_xecució" +msgid "E_xpand on apply" +msgstr "" #: ../scope/data/scope.glade.h:103 -msgid "_Send Signal" -msgstr "En_via Senyal" +msgid "S_how" +msgstr "_Mostra" #: ../scope/data/scope.glade.h:104 -msgid "_Setup Program" -msgstr "" +msgid "children" +msgstr "fills" #: ../scope/data/scope.glade.h:105 -msgid "_Show .names" -msgstr "_Mostra .noms" +msgid "Inspect" +msgstr "Inspecciona" #: ../scope/data/scope.glade.h:106 -msgid "_Show @entry" +msgid "Show =li_brary messages" msgstr "" #: ../scope/data/scope.glade.h:107 -msgid "_Show Terminal" -msgstr "_Mostra el terminal" +msgid "Show _tooltips" +msgstr "Mostra _consells" #: ../scope/data/scope.glade.h:108 -msgid "_Stopped" -msgstr "A_turat" +msgid "Others" +msgstr "Altres" #: ../scope/data/scope.glade.h:109 -msgid "_Temporary breakpoint at:" -msgstr "" +msgid "Options" +msgstr "Opcions" #: ../scope/data/scope.glade.h:110 -msgid "_Terminate" -msgstr "_Finalitza" +msgid "_Import" +msgstr "_Importa" #: ../scope/data/scope.glade.h:111 -msgid "_Thread" -msgstr "_Fil d'execució" +msgid "Enter assignment expression:" +msgstr "" #: ../scope/data/scope.glade.h:112 -msgid "_UTF-8" -msgstr "_UTF-8" +msgid "Inspect" +msgstr "Inspecciona" #: ../scope/data/scope.glade.h:113 -msgid "_Unsorted" -msgstr "Sense _ordre" - -#: ../scope/data/scope.glade.h:114 -msgid "_View Source" -msgstr "_Visualitza el Codi Font" +msgid "Object:" +msgstr "Objecte:" #: ../scope/data/scope.glade.h:115 -msgid "_Watch" -msgstr "_Mira" +msgid "-" +msgstr "-" #: ../scope/data/scope.glade.h:116 -msgid "_Watch Expression" -msgstr "" +msgid "Frame:" +msgstr "Fotograma:" #: ../scope/data/scope.glade.h:117 -msgid "_Window" -msgstr "_Finestra" +msgid "@" +msgstr "@" #: ../scope/data/scope.glade.h:118 -msgid "_Working dir:" +msgid "_Apply on run" msgstr "" #: ../scope/data/scope.glade.h:119 -msgid "_argument" -msgstr "_argument" +msgid "Expand" +msgstr "Expandeix" #: ../scope/data/scope.glade.h:120 -msgid "_member" -msgstr "_membre" +msgid "Start:" +msgstr "Inici:" #: ../scope/data/scope.glade.h:121 -msgid "and" -msgstr "i" +msgid "Count:" +msgstr "Recompte:" #: ../scope/data/scope.glade.h:122 -msgid "children" -msgstr "fills" - -#: ../scope/data/scope.glade.h:123 -msgid "g_db load" +msgid "_Expand on apply" msgstr "" -#: ../scope/data/scope.glade.h:124 -msgid "names" -msgstr "noms" +#: ../scope/data/scope.glade.h:123 ../scope/src/scope.c:522 +msgid "Program Terminal" +msgstr "Programa del Terminal" #: ../scope/data/scope.glade.h:125 -msgid "p_rogram start" +msgid "Registers" +msgstr "" + +#: ../scope/src/break.c:97 +#, fuzzy +msgid "breakpoint" +msgstr "Punts de ruptura" + +#: ../scope/src/break.c:98 +#, fuzzy +msgid "hardware breakpoint" +msgstr "Commuta el punt de ruptura" + +#: ../scope/src/break.c:99 +#, fuzzy +msgid "tracepoint" +msgstr "Punts de ruptura" + +#: ../scope/src/break.c:100 +msgid "fast tracepoint" +msgstr "" + +#: ../scope/src/break.c:101 +#, fuzzy +msgid "write watchpoint" +msgstr "Afegeix Punt de Vigilància" + +#: ../scope/src/break.c:104 +#, fuzzy +msgid "access watchpoint" +msgstr "Afegeix Punt de Vigilància" + +#: ../scope/src/break.c:106 +#, fuzzy +msgid "read watchpoint" +msgstr "Afegeix Punt de Vigilància" + +#: ../scope/src/break.c:108 +#, fuzzy +msgid "catchpoint" +msgstr "Afegeix Punt de Vigilància" + +#: ../scope/src/break.c:135 ../scope/src/break.c:139 +msgid "CLI" msgstr "" -#: ../scope/src/break.c:947 +#: ../scope/src/break.c:136 +#, fuzzy +msgid "unsupported MI" +msgstr "Sense _ordre" + +#: ../scope/src/break.c:141 +#, fuzzy +msgid "on load" +msgstr "carregat" + +#: ../scope/src/break.c:142 +#, fuzzy +msgid "Run to Cursor" +msgstr "Executa fins al _Cursor" + +#: ../scope/src/break.c:1013 #, c-format msgid "" "There are two or more breakpoints at %s:%d.\n" +"\n" "Use the breakpoint list to remove the exact one." msgstr "" -#: ../scope/src/break.c:1200 +#: ../scope/src/break.c:1252 +#, c-format +msgid ", %s" +msgstr "" + +#: ../scope/src/break.c:1278 +#, c-format +msgid "func %s" +msgstr "" + +#: ../scope/src/break.c:1309 msgid "Add Breakpoint" msgstr "Afegeix Punt de Ruptura" -#: ../scope/src/break.c:1215 +#: ../scope/src/break.c:1324 msgid "Add Watchpoint" msgstr "Afegeix Punt de Vigilància" @@ -5165,15 +5509,13 @@ msgid "Enter char # (0..255):" msgstr "" -#: ../scope/src/conterm.c:466 -#: ../scope/src/scope.c:502 +#: ../scope/src/conterm.c:509 ../scope/src/scope.c:550 +#: ../scope/src/scope.c:551 #, c-format msgid "Scope: %s." msgstr "" -#: ../scope/src/debug.c:115 -#: ../scope/src/debug.c:120 -#: ../scope/src/utils.c:37 +#: ../scope/src/debug.c:115 ../scope/src/debug.c:120 ../scope/src/utils.c:37 #, c-format msgid "%s: %s." msgstr "%s: %s." @@ -5187,61 +5529,61 @@ msgid "Program terminated." msgstr "El programa ha finalitzat." -#: ../scope/src/debug.c:468 +#: ../scope/src/debug.c:469 msgid "No breakpoints. Hanging." msgstr "" -#: ../scope/src/debug.c:596 -#: ../scope/src/thread.c:97 +#: ../scope/src/debug.c:598 ../scope/src/thread.c:92 #, c-format msgid "%s." msgstr "" -#: ../scope/src/inspect.c:77 +#: ../scope/src/inspect.c:66 msgid "..." msgstr "..." -#: ../scope/src/inspect.c:324 +#: ../scope/src/inspect.c:339 msgid "invalid data" msgstr "" -#: ../scope/src/inspect.c:356 +#: ../scope/src/inspect.c:371 msgid "no children in range" msgstr "" -#: ../scope/src/inspect.c:440 +#: ../scope/src/inspect.c:454 msgid "out of scope" msgstr "" -#: ../scope/src/inspect.c:587 +#: ../scope/src/inspect.c:627 msgid "Duplicate inspect variable name." msgstr "" -#: ../scope/src/memory.c:299 +#: ../scope/src/memory.c:292 msgid "Read Memory" msgstr "" -#: ../scope/src/memory.c:408 -msgid "Scope: pointer size > 8, Data disabled." +#: ../scope/src/memory.c:396 +#, c-format +msgid "Scope: pointer size > %d, Data disabled." msgstr "" -#: ../scope/src/menu.c:380 +#: ../scope/src/menu.c:375 msgid "Modify" msgstr "Modifica" -#: ../scope/src/menu.c:490 +#: ../scope/src/menu.c:481 msgid "Evaluate/modify" msgstr "Avalua/modifica" -#: ../scope/src/menu.c:491 +#: ../scope/src/menu.c:482 msgid "Watch expression" msgstr "" -#: ../scope/src/menu.c:492 +#: ../scope/src/menu.c:483 msgid "Inspect variable" msgstr "Inspecciona la variable" -#: ../scope/src/parse.c:416 +#: ../scope/src/parse.c:437 msgid "Undefined GDB error." msgstr "" @@ -5253,35 +5595,26 @@ msgid "Select File" msgstr "Selecciona Fitxer" -#: ../scope/src/prefs.c:338 -msgid "Breaks" -msgstr "" - -#: ../scope/src/prefs.c:339 -msgid "Console" -msgstr "Consola" - -#: ../scope/src/prefs.c:347 -#: ../scope/src/utils.c:570 +#: ../scope/src/prefs.c:294 ../scope/src/utils.c:438 #, c-format msgid "Scope: %s: %s." msgstr "" -#: ../scope/src/prefs.c:352 +#: ../scope/src/prefs.c:299 msgid "Scope: created configuration file." msgstr "" -#: ../scope/src/program.c:231 +#: ../scope/src/program.c:251 #, c-format msgid "Loaded debug settings for %s." msgstr "" -#: ../scope/src/program.c:239 +#: ../scope/src/program.c:259 #, c-format msgid "Could not load debug settings file %s: %s." msgstr "" -#: ../scope/src/program.c:359 +#: ../scope/src/program.c:379 #, c-format msgid "" "%s: %s.\n" @@ -5289,15 +5622,15 @@ "Continue?" msgstr "" -#: ../scope/src/program.c:394 -msgid "Delete all breakpoints, watches and inspects?" +#: ../scope/src/program.c:415 +msgid "Delete all breakpoints, watches et cetera?" msgstr "" -#: ../scope/src/program.c:501 +#: ../scope/src/program.c:523 msgid "as _Name=value" msgstr "" -#: ../scope/src/program.c:502 +#: ../scope/src/program.c:524 msgid "as _Name = value" msgstr "" @@ -5306,158 +5639,169 @@ msgstr "" #: ../scope/src/scope.c:35 -msgid "Simple GDB front-end." +msgid "Relatively simple GDB front-end." msgstr "" -#: ../scope/src/scope.c:63 +#: ../scope/src/scope.c:62 msgid "Setup program" msgstr "" -#: ../scope/src/scope.c:64 +#: ../scope/src/scope.c:63 msgid "Run/continue" msgstr "Executa/continua" -#: ../scope/src/scope.c:66 +#: ../scope/src/scope.c:65 msgid "Run to source" msgstr "" -#: ../scope/src/scope.c:70 +#: ../scope/src/scope.c:69 msgid "Terminate" msgstr "Finalitza" -#: ../scope/src/scope.c:71 +#: ../scope/src/scope.c:70 msgid "Toggle breakpoint" msgstr "Commuta el punt de ruptura" -#: ../scope/src/scope.c:73 -#: ../scope/src/scope.c:76 +#: ../scope/src/scope.c:72 ../scope/src/scope.c:75 msgid "GDB command" msgstr "ordre GDB" -#: ../scope/src/scope.c:74 +#: ../scope/src/scope.c:73 msgid "Show terminal" msgstr "Mostra el terminal" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Busy" msgstr "Ocupat" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Ready" msgstr "Preparat" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Hang" msgstr "Penja" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Assem" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Load" msgstr "Carrega" -#: ../scope/src/scope.c:394 +#: ../scope/src/scope.c:421 msgid "Build action activated. Terminate debugging?" msgstr "" -#: ../scope/src/thread.c:58 +#: ../scope/src/scope.c:524 +msgid "Breaks" +msgstr "" + +#: ../scope/src/scope.c:526 +msgid "Console" +msgstr "Consola" + +#: ../scope/src/scope.c:526 +msgid "Debug Console" +msgstr "Consola de Depuració" + +#: ../scope/src/thread.c:48 #, c-format msgid "Thread group %s started." msgstr "" -#: ../scope/src/thread.c:76 +#: ../scope/src/thread.c:63 msgid "Thread group " msgstr "" -#: ../scope/src/thread.c:88 +#: ../scope/src/thread.c:83 msgid " exited" msgstr " ha sortit" -#: ../scope/src/thread.c:91 +#: ../scope/src/thread.c:86 #, c-format msgid " with exit code %s" msgstr " amb el codi %s" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 msgid "Send Signal" msgstr "Envia Senyal" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 msgid "Enter signal #:" msgstr "" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Terminate Process" msgstr "" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Enter exit code:" msgstr "" -#: ../scope/src/thread.c:937 +#: ../scope/src/thread.c:891 msgid "Running" msgstr "En execució" -#: ../scope/src/thread.c:938 +#: ../scope/src/thread.c:892 msgid "Stopped" msgstr "Aturat" -#: ../scope/src/utils.c:44 -#, c-format -msgid "%s: error %lu." -msgstr "%s: error %lu." +#: ../scope/src/utils.c:45 +#, fuzzy, c-format +msgid "%s: %s" +msgstr "%s: %s." -#: ../scope/src/utils.c:358 +#: ../scope/src/utils.c:225 #, c-format msgid "Scope: error reading [%s]." msgstr "" -#: ../scope/src/views.c:505 +#: ../scope/src/views.c:526 msgid "…" msgstr "…" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Send" msgstr "_Envia" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Busy" msgstr "_Ocupat" -#: ../scope/src/views.c:535 +#: ../scope/src/views.c:558 msgid "GDB Command" msgstr "Ordre GDB" -#: ../spellcheck/src/speller.c:94 +#: ../spellcheck/src/speller.c:180 msgid "Try: " msgstr "Prova:" -#: ../spellcheck/src/speller.c:173 +#: ../spellcheck/src/speller.c:252 msgid "Checking" msgstr "Verificant" -#: ../spellcheck/src/speller.c:186 +#: ../spellcheck/src/speller.c:265 #, c-format msgid "Checking file \"%s\" (lines %d to %d using %s):" msgstr "" -#: ../spellcheck/src/speller.c:196 +#: ../spellcheck/src/speller.c:275 #, c-format msgid "Checking file \"%s\" (using %s):" msgstr "" -#: ../spellcheck/src/speller.c:223 +#: ../spellcheck/src/speller.c:302 msgid "The checked text is spelled correctly." msgstr "" -#: ../spellcheck/src/speller.c:233 +#: ../spellcheck/src/speller.c:312 #, c-format msgid "The Enchant library couldn't be initialized (%s)." msgstr "" -#: ../spellcheck/src/speller.c:234 +#: ../spellcheck/src/speller.c:313 msgid "unknown error (maybe the chosen language is not available)" msgstr "" @@ -5507,7 +5851,9 @@ msgstr "_Directori per als fitxers de diccionari:" #: ../spellcheck/src/scplugin.c:295 -msgid "Read additional dictionary files from this directory. For now, this only works with myspell dictionaries." +msgid "" +"Read additional dictionary files from this directory. For now, this only " +"works with myspell dictionaries." msgstr "" #: ../spellcheck/src/gui.c:76 @@ -5545,17 +5891,17 @@ msgid "Ignore All" msgstr "Ignora-ho Tot" -#: ../spellcheck/src/gui.c:521 +#: ../spellcheck/src/gui.c:526 #, c-format msgid "Default (%s)" msgstr "Predeterminat (%s)" -#: ../spellcheck/src/gui.c:532 +#: ../spellcheck/src/gui.c:537 #, c-format msgid "Toggle spell check while typing (current language: %s)" msgstr "" -#: ../spellcheck/src/gui.c:587 +#: ../spellcheck/src/gui.c:592 msgid "Spelling Suggestions" msgstr "Suggeriments d'Ortografia" @@ -5567,13 +5913,11 @@ msgid "Shift a selection left and right" msgstr "" -#: ../shiftcolumn/src/shiftcolumn.c:380 -#: ../shiftcolumn/src/shiftcolumn.c:400 +#: ../shiftcolumn/src/shiftcolumn.c:380 ../shiftcolumn/src/shiftcolumn.c:400 msgid "Shift Left" msgstr "" -#: ../shiftcolumn/src/shiftcolumn.c:387 -#: ../shiftcolumn/src/shiftcolumn.c:402 +#: ../shiftcolumn/src/shiftcolumn.c:387 ../shiftcolumn/src/shiftcolumn.c:402 msgid "Shift Right" msgstr "" @@ -5588,272 +5932,291 @@ #. OK. Something went not as expected. #. * We did have a selection but cannot parse it into rows. #. * Aborting -#: ../tableconvert/src/tableconvert.c:236 +#: ../tableconvert/src/tableconvert.c:237 msgid "Something went wrong on parsing selection. Aborting" msgstr "" -#: ../tableconvert/src/tableconvert.c:268 +#: ../tableconvert/src/tableconvert.c:269 msgid "Convert selection to table" msgstr "Converteix la selecció en una taula" #. Build up menu entry -#: ../tableconvert/src/tableconvert.c:281 +#: ../tableconvert/src/tableconvert.c:282 msgid "_Convert to table" msgstr "_Converteix en taula" -#: ../tableconvert/src/tableconvert.c:284 +#: ../tableconvert/src/tableconvert.c:285 msgid "Converts current marked list to a table." msgstr "" -#: ../treebrowser/src/treebrowser.c:120 +#: ../treebrowser/src/treebrowser.c:124 msgid "TreeBrowser" msgstr "" -#: ../treebrowser/src/treebrowser.c:121 -msgid "This plugin adds a tree browser to Geany, allowing the user to browse files using a tree view of the directory being browsed." +#: ../treebrowser/src/treebrowser.c:125 +msgid "" +"This plugin adds a tree browser to Geany, allowing the user to browse files " +"using a tree view of the directory being browsed." msgstr "" -#: ../treebrowser/src/treebrowser.c:430 +#: ../treebrowser/src/treebrowser.c:434 #, c-format msgid "%s: no such directory." msgstr "%s: no existeix el directori." -#: ../treebrowser/src/treebrowser.c:526 -#: ../treebrowser/src/treebrowser.c:561 -#: ../treebrowser/src/treebrowser.c:663 +#: ../treebrowser/src/treebrowser.c:537 ../treebrowser/src/treebrowser.c:572 +#: ../treebrowser/src/treebrowser.c:670 msgid "(Empty)" msgstr "(Buit)" -#: ../treebrowser/src/treebrowser.c:966 +#: ../treebrowser/src/treebrowser.c:971 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "No s'ha pogut executar l'ordre externa '%s' (%s)." -#: ../treebrowser/src/treebrowser.c:1037 +#: ../treebrowser/src/treebrowser.c:1042 msgid "NewDirectory" msgstr "NouDirectori" -#: ../treebrowser/src/treebrowser.c:1039 +#: ../treebrowser/src/treebrowser.c:1044 msgid "NewFile" msgstr "NouFitxer" -#: ../treebrowser/src/treebrowser.c:1044 +#: ../treebrowser/src/treebrowser.c:1049 #, c-format msgid "" "Target file '%s' exists\n" ", do you really want to replace it with empty file?" msgstr "" -#: ../treebrowser/src/treebrowser.c:1089 +#: ../treebrowser/src/treebrowser.c:1095 #, c-format msgid "Do you really want to delete '%s' ?" msgstr "Esteu segurs de voler eliminar '%s'?" -#: ../treebrowser/src/treebrowser.c:1208 -#: ../treebrowser/src/treebrowser.c:1692 +#: ../treebrowser/src/treebrowser.c:1207 ../treebrowser/src/treebrowser.c:1738 msgid "Go up" msgstr "Vés cap a dalt" -#: ../treebrowser/src/treebrowser.c:1212 -#: ../treebrowser/src/treebrowser.c:1707 +#: ../treebrowser/src/treebrowser.c:1211 ../treebrowser/src/treebrowser.c:1753 msgid "Set path from document" msgstr "Especifica el directori pel document" -#: ../treebrowser/src/treebrowser.c:1216 -msgid "Open externally" +#: ../treebrowser/src/treebrowser.c:1215 +#, fuzzy +msgid "_Open externally" msgstr "Obre externament" -#: ../treebrowser/src/treebrowser.c:1221 +#: ../treebrowser/src/treebrowser.c:1220 msgid "Open Terminal" msgstr "Obre el terminal" -#: ../treebrowser/src/treebrowser.c:1225 +#: ../treebrowser/src/treebrowser.c:1224 msgid "Set as root" msgstr "Instal·la com a superusuari" -#: ../treebrowser/src/treebrowser.c:1230 -#: ../treebrowser/src/treebrowser.c:1697 -#: ../treebrowser/src/treebrowser.c:2060 +#: ../treebrowser/src/treebrowser.c:1229 ../treebrowser/src/treebrowser.c:1743 +#: ../treebrowser/src/treebrowser.c:2123 msgid "Refresh" msgstr "Actualitza" -#: ../treebrowser/src/treebrowser.c:1242 +#: ../treebrowser/src/treebrowser.c:1233 +#, fuzzy +msgid "_Find in Files" +msgstr "Cerca en els Fitxers" + +#: ../treebrowser/src/treebrowser.c:1241 msgid "Create new directory" msgstr "Crea un directori nou" -#: ../treebrowser/src/treebrowser.c:1246 +#: ../treebrowser/src/treebrowser.c:1245 msgid "Create new file" msgstr "Crea un nou fitxer" -#: ../treebrowser/src/treebrowser.c:1250 +#: ../treebrowser/src/treebrowser.c:1249 msgid "Rename" msgstr "Reanomena" -#: ../treebrowser/src/treebrowser.c:1255 +#: ../treebrowser/src/treebrowser.c:1254 msgid "Delete" msgstr "Elimina" -#: ../treebrowser/src/treebrowser.c:1263 +#: ../treebrowser/src/treebrowser.c:1262 #, c-format msgid "Close: %s" msgstr "Tanca: %s" -#: ../treebrowser/src/treebrowser.c:1268 +#: ../treebrowser/src/treebrowser.c:1267 #, c-format msgid "Close Child Documents " msgstr "Tanca els Documents Fills" -#: ../treebrowser/src/treebrowser.c:1273 -msgid "Copy full path to clipboard" +#: ../treebrowser/src/treebrowser.c:1272 +#, fuzzy +msgid "_Copy full path to clipboard" msgstr "Copia la ruta completa al porta-retalls" -#: ../treebrowser/src/treebrowser.c:1293 -#: ../treebrowser/src/treebrowser.c:1974 +#: ../treebrowser/src/treebrowser.c:1292 ../treebrowser/src/treebrowser.c:2032 msgid "Show bookmarks" msgstr "Mostra les adreces d'interès" -#: ../treebrowser/src/treebrowser.c:1298 -#: ../treebrowser/src/treebrowser.c:1928 +#: ../treebrowser/src/treebrowser.c:1297 ../treebrowser/src/treebrowser.c:1981 msgid "Show hidden files" msgstr "Mostra els fitxers ocults" -#: ../treebrowser/src/treebrowser.c:1303 +#: ../treebrowser/src/treebrowser.c:1302 msgid "Show toolbars" msgstr "Mostra les barres d'eines" -#: ../treebrowser/src/treebrowser.c:1574 +#: ../treebrowser/src/treebrowser.c:1621 #, c-format msgid "Target file '%s' exists, do you really want to replace it?" msgstr "Ja existeix un fitxer anomenat \"%s\", voleu reemplaçar-lo?" -#: ../treebrowser/src/treebrowser.c:1702 +#: ../treebrowser/src/treebrowser.c:1748 msgid "Home" msgstr "Inici" -#: ../treebrowser/src/treebrowser.c:1712 +#: ../treebrowser/src/treebrowser.c:1758 msgid "Track path" msgstr "" -#: ../treebrowser/src/treebrowser.c:1717 +#: ../treebrowser/src/treebrowser.c:1763 msgid "Hide bars" msgstr "Amaga les barres" -#: ../treebrowser/src/treebrowser.c:1727 -msgid "Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' reverse try for example this '!;*.c;*.h;*.cpp'" +#: ../treebrowser/src/treebrowser.c:1773 +msgid "" +"Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' " +"reverse try for example this '!;*.c;*.h;*.cpp'" msgstr "" -#: ../treebrowser/src/treebrowser.c:1735 +#: ../treebrowser/src/treebrowser.c:1781 msgid "Addressbar for example '/projects/my-project'" msgstr "" -#: ../treebrowser/src/treebrowser.c:1760 +#: ../treebrowser/src/treebrowser.c:1806 msgid "Tree Browser" msgstr "" -#: ../treebrowser/src/treebrowser.c:1892 +#: ../treebrowser/src/treebrowser.c:1945 msgid "External open command" msgstr "Ordre externa per obrir" -#: ../treebrowser/src/treebrowser.c:1897 +#: ../treebrowser/src/treebrowser.c:1950 #, c-format msgid "" -"The command to execute when using \"Open with\". You can use %f and %d wildcards.\n" +"The command to execute when using \"Open with\". You can use %f and %d " +"wildcards.\n" "%f will be replaced with the filename including full path\n" -"%d will be replaced with the path name of the selected file without the filename" +"%d will be replaced with the path name of the selected file without the " +"filename" msgstr "" -"L'ordre a executar quan s'usa \"Obre amb\". Podeu usar els comodins %f i %d.\n" +"L'ordre a executar quan s'usa \"Obre amb\". Podeu usar els comodins %f i " +"%d.\n" "%f serà substituit amb el nom del fitxer, incloent la ruta completa\n" "%d serà substituit amb la ruta completa, sense el nom del fitxer" -#: ../treebrowser/src/treebrowser.c:1905 +#: ../treebrowser/src/treebrowser.c:1958 msgid "Toolbar" msgstr "Barra d'Eines" -#: ../treebrowser/src/treebrowser.c:1907 +#: ../treebrowser/src/treebrowser.c:1960 msgid "Hidden" msgstr "Ocult" -#: ../treebrowser/src/treebrowser.c:1908 +#: ../treebrowser/src/treebrowser.c:1961 msgid "Top" msgstr "Part superior" -#: ../treebrowser/src/treebrowser.c:1909 +#: ../treebrowser/src/treebrowser.c:1962 msgid "Bottom" msgstr "Part inferior" -#: ../treebrowser/src/treebrowser.c:1914 +#: ../treebrowser/src/treebrowser.c:1967 msgid "If position is changed, the option require plugin restart." msgstr "" -#: ../treebrowser/src/treebrowser.c:1918 +#: ../treebrowser/src/treebrowser.c:1971 msgid "Show icons" msgstr "Mostra les icones" -#: ../treebrowser/src/treebrowser.c:1920 +#: ../treebrowser/src/treebrowser.c:1973 msgid "None" msgstr "Cap" -#: ../treebrowser/src/treebrowser.c:1921 +#: ../treebrowser/src/treebrowser.c:1974 msgid "Base" msgstr "Base" -#: ../treebrowser/src/treebrowser.c:1922 +#: ../treebrowser/src/treebrowser.c:1975 msgid "Content-type" msgstr "Tipus de continguts" -#: ../treebrowser/src/treebrowser.c:1933 +#: ../treebrowser/src/treebrowser.c:1986 msgid "On Windows, this just hide files that are prefixed with '.' (dot)" msgstr "" -#: ../treebrowser/src/treebrowser.c:1935 +#: ../treebrowser/src/treebrowser.c:1988 msgid "Hide object files" msgstr "Amaga els fitxers objecte" -#: ../treebrowser/src/treebrowser.c:1940 -msgid "Don't show generated object files in the file browser, this includes *.o, *.obj. *.so, *.dll, *.a, *.lib" +#: ../treebrowser/src/treebrowser.c:1993 +msgid "" +"Don't show generated object files in the file browser, this includes *.o, *." +"obj. *.so, *.dll, *.a, *.lib" msgstr "" -#: ../treebrowser/src/treebrowser.c:1942 +#: ../treebrowser/src/treebrowser.c:1995 msgid "Reverse filter" msgstr "Inverteix el filtre" -#: ../treebrowser/src/treebrowser.c:1947 +#: ../treebrowser/src/treebrowser.c:2000 msgid "Follow current document" msgstr "Segueix el document actual" -#: ../treebrowser/src/treebrowser.c:1952 +#: ../treebrowser/src/treebrowser.c:2005 msgid "Single click, open document and focus it" msgstr "" -#: ../treebrowser/src/treebrowser.c:1957 +#: ../treebrowser/src/treebrowser.c:2010 msgid "Double click open directory" msgstr "Doble clic obre els directoris" -#: ../treebrowser/src/treebrowser.c:1962 +#: ../treebrowser/src/treebrowser.c:2015 msgid "On delete file, close it if is opened" msgstr "" -#: ../treebrowser/src/treebrowser.c:1967 +#: ../treebrowser/src/treebrowser.c:2020 +msgid "Focus editor on file open" +msgstr "" + +#: ../treebrowser/src/treebrowser.c:2025 msgid "Show tree lines" msgstr "Mostra les línies de l'arbre" -#: ../treebrowser/src/treebrowser.c:2050 +#: ../treebrowser/src/treebrowser.c:2037 +#, fuzzy +msgid "Open new files" +msgstr "Obre un Fitxer" + +#: ../treebrowser/src/treebrowser.c:2113 msgid "Focus File List" msgstr "Enfoca la Llista de Fitxers" -#: ../treebrowser/src/treebrowser.c:2052 +#: ../treebrowser/src/treebrowser.c:2115 msgid "Focus Path Entry" msgstr "" -#: ../treebrowser/src/treebrowser.c:2054 +#: ../treebrowser/src/treebrowser.c:2117 msgid "Rename Object" msgstr "Reanomena Objecte" -#: ../treebrowser/src/treebrowser.c:2056 +#: ../treebrowser/src/treebrowser.c:2119 msgid "Create New File" msgstr "Crea un Fitxer Nou" -#: ../treebrowser/src/treebrowser.c:2058 +#: ../treebrowser/src/treebrowser.c:2121 msgid "Create New Directory" msgstr "Crea un Directori Nou" @@ -5862,7 +6225,8 @@ msgstr "" #: ../updatechecker/src/updatechecker.c:42 -msgid "A plugin which is checking whether there are updates for Geany available." +msgid "" +"A plugin which is checking whether there are updates for Geany available." msgstr "" #: ../updatechecker/src/updatechecker.c:190 @@ -5917,45 +6281,44 @@ msgid "utility" msgstr "utilitat" -#: ../webhelper/src/gwh-settings.c:775 +#: ../webhelper/src/gwh-settings.c:782 #, c-format msgid "%s:" msgstr "%s:" -#: ../webhelper/src/gwh-browser.c:528 +#: ../webhelper/src/gwh-browser.c:534 msgid "_Zoom" msgstr "_Zoom" -#: ../webhelper/src/gwh-browser.c:550 +#: ../webhelper/src/gwh-browser.c:556 msgid "Full-_content zoom" msgstr "" -#: ../webhelper/src/gwh-browser.c:561 +#: ../webhelper/src/gwh-browser.c:567 msgid "Flip panes orientation" msgstr "Canvia la orientació dels panells" -#: ../webhelper/src/gwh-browser.c:808 +#: ../webhelper/src/gwh-browser.c:814 msgid "Back" msgstr "Enrere" -#: ../webhelper/src/gwh-browser.c:812 +#: ../webhelper/src/gwh-browser.c:818 msgid "Forward" msgstr "Reenvia" -#: ../webhelper/src/gwh-browser.c:816 +#: ../webhelper/src/gwh-browser.c:822 msgid "Cancel loading" msgstr "Cancel·la la càrrega" -#: ../webhelper/src/gwh-browser.c:820 +#: ../webhelper/src/gwh-browser.c:826 msgid "Reload current page" msgstr "Actualitza la pàgina actual" -#: ../webhelper/src/gwh-browser.c:833 -#: ../webhelper/src/gwh-browser.c:879 +#: ../webhelper/src/gwh-browser.c:839 ../webhelper/src/gwh-browser.c:885 msgid "Web inspector" msgstr "Inspector web" -#: ../webhelper/src/gwh-browser.c:834 +#: ../webhelper/src/gwh-browser.c:840 msgid "Toggle web inspector" msgstr "Habilita l'inspector web" @@ -5964,7 +6327,10 @@ msgstr "" #: ../webhelper/src/gwh-plugin.c:51 -msgid "Display a preview web page that gets updated upon document saving and provide web analysis and debugging tools (aka Web Inspector), all using WebKit." +msgid "" +"Display a preview web page that gets updated upon document saving and " +"provide web analysis and debugging tools (aka Web Inspector), all using " +"WebKit." msgstr "" #: ../webhelper/src/gwh-plugin.c:141 @@ -6040,7 +6406,9 @@ msgstr "" #: ../webhelper/src/gwh-plugin.c:350 -msgid "Whether to tell the window manager not to show the secondary windows in the task bar" +msgid "" +"Whether to tell the window manager not to show the secondary windows in the " +"task bar" msgstr "" #: ../webhelper/src/gwh-plugin.c:355 @@ -6085,15 +6453,15 @@ msgid "Autocompletes XML/HTML tags using snippets." msgstr "" +#~ msgid "%s: error %lu." +#~ msgstr "%s: error %lu." + #~ msgid "Unknown signal" #~ msgstr "Senyal desconeguda" #~ msgid "(unknown)" #~ msgstr "(desconegut)" -#~ msgid "Directory %s not found!\n" -#~ msgstr "No s'ha trobat el directori %s!\n" - #~ msgid "Killing target program.\n" #~ msgstr "Matant el programa.\n" @@ -6156,9 +6524,6 @@ #~ msgid "(no program)" #~ msgstr "(cap programa)" -#~ msgid "loaded" -#~ msgstr "carregat" - #~ msgid "Error:" #~ msgstr "Error:" diff -Nru geany-plugins-1.23+dfsg/po/da.po geany-plugins-1.24+dfsg/po/da.po --- geany-plugins-1.23+dfsg/po/da.po 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/po/da.po 2014-04-12 14:28:39.000000000 +0000 @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Geany-plugins 1.23\n" +"Project-Id-Version: Geany-plugins 1.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-23 14:32+0100\n" +"POT-Creation-Date: 2014-03-30 19:33+0200\n" "PO-Revision-Date: 2009-06-11 10:15+0200\n" "Last-Translator: Andrew L Janke \n" "Language-Team: Danish \n" @@ -34,12 +34,12 @@ msgid "Contents" msgstr "" -#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:615 +#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:625 msgid "Bookmarks" msgstr "" #. complete update -#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2295 +#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2351 msgid "_Update" msgstr "" @@ -76,15 +76,15 @@ msgid "Context:" msgstr "" -#: ../addons/src/ao_xmltagging.c:56 +#: ../addons/src/ao_xmltagging.c:54 msgid "XML tagging" msgstr "" -#: ../addons/src/ao_xmltagging.c:67 +#: ../addons/src/ao_xmltagging.c:65 msgid "Tag name to be inserted:" msgstr "" -#: ../addons/src/ao_xmltagging.c:71 +#: ../addons/src/ao_xmltagging.c:69 #, c-format msgid "" "%s will be replaced with your current selection. Please keep care on your " @@ -152,11 +152,12 @@ msgid "Run XML tagging" msgstr "" -#: ../addons/src/addons.c:417 ../geanylatex/src/geanylatex.c:241 -#: ../geanyprj/src/geanyprj.c:174 ../geanysendmail/src/geanysendmail.c:121 -#: ../geanysendmail/src/geanysendmail.c:287 ../geanyvc/src/geanyvc.c:1798 +#: ../addons/src/addons.c:417 ../autoclose/src/autoclose.c:871 +#: ../geanylatex/src/geanylatex.c:241 ../geanyprj/src/geanyprj.c:174 +#: ../geanysendmail/src/geanysendmail.c:123 +#: ../geanysendmail/src/geanysendmail.c:291 ../geanyvc/src/geanyvc.c:1854 #: ../geniuspaste/src/geniuspaste.c:140 ../spellcheck/src/scplugin.c:146 -#: ../treebrowser/src/treebrowser.c:1880 +#: ../treebrowser/src/treebrowser.c:1933 #: ../updatechecker/src/updatechecker.c:253 msgid "Plugin configuration directory could not be created." msgstr "" @@ -243,6 +244,14 @@ msgid "Enclose selection automatically (without having to press a keybinding)" msgstr "" +#: ../autoclose/src/autoclose.c:50 +msgid "Auto-close" +msgstr "" + +#: ../autoclose/src/autoclose.c:51 +msgid "Auto-close braces and brackets with lot of features" +msgstr "" + #: ../codenav/src/codenavigation.c:52 msgid "Code navigation" msgstr "" @@ -305,8 +314,8 @@ msgid "Various debuggers integration." msgstr "" -#: ../debugger/src/plugin.c:131 ../debugger/src/keys.c:76 -#: ../scope/data/scope.glade.h:125 ../scope/src/scope.c:225 +#: ../debugger/src/plugin.c:133 ../debugger/src/keys.c:76 +#: ../scope/data/scope.glade.h:124 ../scope/src/scope.c:226 msgid "Debug" msgstr "" @@ -438,7 +447,7 @@ msgid "Target" msgstr "" -#: ../debugger/src/tabs.c:135 ../scope/data/scope.glade.h:69 +#: ../debugger/src/tabs.c:135 ../scope/src/scope.c:524 msgid "Breakpoints" msgstr "" @@ -475,22 +484,22 @@ msgstr "" #: ../debugger/src/keys.c:52 ../debugger/src/btnpanel.c:113 -#: ../scope/src/scope.c:67 +#: ../scope/src/scope.c:66 msgid "Step into" msgstr "" #: ../debugger/src/keys.c:53 ../debugger/src/btnpanel.c:110 -#: ../scope/src/scope.c:68 +#: ../scope/src/scope.c:67 msgid "Step over" msgstr "" #: ../debugger/src/keys.c:54 ../debugger/src/btnpanel.c:122 -#: ../scope/src/scope.c:69 +#: ../scope/src/scope.c:68 msgid "Step out" msgstr "" #: ../debugger/src/keys.c:55 ../debugger/src/btnpanel.c:125 -#: ../scope/src/scope.c:65 +#: ../scope/src/scope.c:64 msgid "Run to cursor" msgstr "" @@ -499,7 +508,7 @@ msgstr "" #: ../debugger/src/keys.c:57 -msgid "Jump to the currect instruction" +msgid "Jump to the current instruction" msgstr "" #: ../debugger/src/watch_model.c:220 @@ -530,6 +539,14 @@ msgid "Save debug session data to a project" msgstr "" +#: ../defineformat/src/defineformat.c:56 +msgid "Define formatter" +msgstr "" + +#: ../defineformat/src/defineformat.c:57 +msgid "Automatically align backslash in multi-line defines" +msgstr "" + #. never search for more than this many chars #: ../devhelp/src/dhp.h:38 msgid "Documentation" @@ -639,7 +656,7 @@ msgstr "" #. i18n: a documentation book -#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1760 +#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1759 msgid "Book" msgstr "" @@ -767,12 +784,12 @@ msgid "A developers' help browser for GNOME" msgstr "" -#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2010 +#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2066 msgid "_File" msgstr "" -#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1815 -#: ../geanymacro/src/geanymacro.c:2112 +#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1822 +#: ../geanymacro/src/geanymacro.c:2118 msgid "_Edit" msgstr "" @@ -952,55 +969,64 @@ msgid "Column mode, select to line / brace / anchor." msgstr "" -#: ../geanyextrasel/src/extrasel.c:482 +#: ../geanyextrasel/src/extrasel.c:502 msgid "E_xtra Selection" msgstr "" -#: ../geanyextrasel/src/extrasel.c:489 +#: ../geanyextrasel/src/extrasel.c:509 msgid "_Column Mode" msgstr "" -#: ../geanyextrasel/src/extrasel.c:494 +#: ../geanyextrasel/src/extrasel.c:514 msgid "Column mode" msgstr "" -#: ../geanyextrasel/src/extrasel.c:496 +#: ../geanyextrasel/src/extrasel.c:516 msgid "Select to _Line" msgstr "" -#: ../geanyextrasel/src/extrasel.c:500 +#: ../geanyextrasel/src/extrasel.c:520 msgid "Select to line" msgstr "" -#: ../geanyextrasel/src/extrasel.c:502 +#: ../geanyextrasel/src/extrasel.c:522 msgid "Select to Matching _Brace" msgstr "" -#: ../geanyextrasel/src/extrasel.c:506 +#: ../geanyextrasel/src/extrasel.c:526 msgid "Select to matching brace" msgstr "" -#: ../geanyextrasel/src/extrasel.c:510 +#: ../geanyextrasel/src/extrasel.c:528 +msgid "_Toggle Stream/Rectangular" +msgstr "" + +#: ../geanyextrasel/src/extrasel.c:532 +#, fuzzy +msgid "Convert selection" +msgstr "Flyt det valgte til højre/venstre" + +#: ../geanyextrasel/src/extrasel.c:537 msgid "_Set Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:514 +#: ../geanyextrasel/src/extrasel.c:541 msgid "Set anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:516 +#: ../geanyextrasel/src/extrasel.c:543 msgid "Select to _Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:520 +#: ../geanyextrasel/src/extrasel.c:547 msgid "Select to anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:522 +#: ../geanyextrasel/src/extrasel.c:549 msgid "_Rectangle Select to Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:527 +#: ../geanyextrasel/src/extrasel.c:554 msgid "Rectangle select to anchor" msgstr "" @@ -1387,76 +1413,76 @@ msgid "Default documentation type for languages that does not have one set" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:37 ../geanyinsertnum/src/insertnum.c:329 -#: ../geanyinsertnum/src/insertnum.c:461 +#: ../geanyinsertnum/src/insertnum.c:44 ../geanyinsertnum/src/insertnum.c:337 +#: ../geanyinsertnum/src/insertnum.c:484 msgid "Insert Numbers" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:37 +#: ../geanyinsertnum/src/insertnum.c:44 msgid "Insert/Fill columns with numbers." msgstr "" -#: ../geanyinsertnum/src/insertnum.c:140 +#: ../geanyinsertnum/src/insertnum.c:146 msgid "Counting..." msgstr "" -#: ../geanyinsertnum/src/insertnum.c:188 +#: ../geanyinsertnum/src/insertnum.c:194 msgid "Preparing..." msgstr "" -#: ../geanyinsertnum/src/insertnum.c:194 +#: ../geanyinsertnum/src/insertnum.c:200 msgid "Inserting..." msgstr "" -#: ../geanyinsertnum/src/insertnum.c:318 +#: ../geanyinsertnum/src/insertnum.c:333 msgid "For base 11 and above" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:341 +#: ../geanyinsertnum/src/insertnum.c:353 msgid "_Start:" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:346 +#: ../geanyinsertnum/src/insertnum.c:358 msgid "S_tep:" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:352 +#: ../geanyinsertnum/src/insertnum.c:364 msgid "_Base:" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:363 +#: ../geanyinsertnum/src/insertnum.c:380 msgid "Letters:" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:366 +#: ../geanyinsertnum/src/insertnum.c:383 msgid "_Upper" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:371 +#: ../geanyinsertnum/src/insertnum.c:388 msgid "_Lower" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:376 +#: ../geanyinsertnum/src/insertnum.c:393 msgid "Base _prefix" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:378 +#: ../geanyinsertnum/src/insertnum.c:395 msgid "0 for octal, 0x for hex, + for positive decimal" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:380 +#: ../geanyinsertnum/src/insertnum.c:397 msgid "Padding:" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:382 +#: ../geanyinsertnum/src/insertnum.c:399 msgid "Sp_ace" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:385 +#: ../geanyinsertnum/src/insertnum.c:402 msgid "_Zero" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:454 +#: ../geanyinsertnum/src/insertnum.c:477 msgid "Insert _Numbers" msgstr "" @@ -1886,20 +1912,20 @@ msgid "BibTeX reference name:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1680 +#: ../geanylatex/src/geanylatex.c:1679 msgid "Dear Sir or Madame" msgstr "" -#: ../geanylatex/src/geanylatex.c:1681 +#: ../geanylatex/src/geanylatex.c:1680 msgid "With kind regards" msgstr "" -#: ../geanylatex/src/geanylatex.c:1689 +#: ../geanylatex/src/geanylatex.c:1688 msgid "No template assigned. Aborting" msgstr "" #. Building the wizard-dialog and showing it -#: ../geanylatex/src/geanylatex.c:1716 +#: ../geanylatex/src/geanylatex.c:1715 msgid "LaTeX-Wizard" msgstr "" @@ -1907,78 +1933,78 @@ #. * Adds custom templates if there are any. If there are none just #. * adds default one #. TEMPLATE FILE -#: ../geanylatex/src/geanylatex.c:1731 ../markdown/src/conf.c:666 +#: ../geanylatex/src/geanylatex.c:1730 ../markdown/src/conf.c:659 msgid "Template:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1735 +#: ../geanylatex/src/geanylatex.c:1734 msgid "Set the template which should be used for creating the new document" msgstr "" -#: ../geanylatex/src/geanylatex.c:1744 +#: ../geanylatex/src/geanylatex.c:1743 msgid "Default" msgstr "" #. Documentclass -#: ../geanylatex/src/geanylatex.c:1755 +#: ../geanylatex/src/geanylatex.c:1754 msgid "Documentclass:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1758 +#: ../geanylatex/src/geanylatex.c:1757 msgid "Choose the kind of document you want to write" msgstr "" -#: ../geanylatex/src/geanylatex.c:1762 +#: ../geanylatex/src/geanylatex.c:1761 msgid "Article" msgstr "" -#: ../geanylatex/src/geanylatex.c:1764 +#: ../geanylatex/src/geanylatex.c:1763 msgid "Report" msgstr "" -#: ../geanylatex/src/geanylatex.c:1766 +#: ../geanylatex/src/geanylatex.c:1765 msgid "Letter" msgstr "" -#: ../geanylatex/src/geanylatex.c:1768 +#: ../geanylatex/src/geanylatex.c:1767 msgid "Presentation" msgstr "" #. Encoding -#: ../geanylatex/src/geanylatex.c:1778 +#: ../geanylatex/src/geanylatex.c:1777 msgid "Encoding:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1782 +#: ../geanylatex/src/geanylatex.c:1781 msgid "Set the encoding for your new document" msgstr "" #. fontsize -#: ../geanylatex/src/geanylatex.c:1798 +#: ../geanylatex/src/geanylatex.c:1797 msgid "Font size" msgstr "" -#: ../geanylatex/src/geanylatex.c:1804 +#: ../geanylatex/src/geanylatex.c:1803 msgid "Set the default font size of your new document" msgstr "" #. Author -#: ../geanylatex/src/geanylatex.c:1816 +#: ../geanylatex/src/geanylatex.c:1815 msgid "Author:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1819 +#: ../geanylatex/src/geanylatex.c:1818 msgid "" "Sets the value of the \\author command. In most cases this should be your " "name" msgstr "" #. Date -#: ../geanylatex/src/geanylatex.c:1833 +#: ../geanylatex/src/geanylatex.c:1832 msgid "Date:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1836 +#: ../geanylatex/src/geanylatex.c:1835 msgid "" "Sets the value of the \\date command inside header of your new created LaTeX-" "document. Keeping it at \\today is a good decision if you don't need any " @@ -1986,265 +2012,265 @@ msgstr "" #. Title of the new document -#: ../geanylatex/src/geanylatex.c:1848 +#: ../geanylatex/src/geanylatex.c:1847 msgid "Title:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1851 +#: ../geanylatex/src/geanylatex.c:1850 msgid "Sets the title of your new document." msgstr "" #. Papersize -#: ../geanylatex/src/geanylatex.c:1860 +#: ../geanylatex/src/geanylatex.c:1859 msgid "Paper size:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1863 +#: ../geanylatex/src/geanylatex.c:1862 msgid "Choose the paper format for the newly created document" msgstr "" #. Paper direction -#: ../geanylatex/src/geanylatex.c:1876 +#: ../geanylatex/src/geanylatex.c:1875 msgid "Paper Orientation:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1879 +#: ../geanylatex/src/geanylatex.c:1878 msgid "Choose the paper orientation for the newly created document" msgstr "" -#: ../geanylatex/src/geanylatex.c:1900 +#: ../geanylatex/src/geanylatex.c:1899 msgid "Use KOMA-script classes if possible" msgstr "" -#: ../geanylatex/src/geanylatex.c:1902 +#: ../geanylatex/src/geanylatex.c:1901 msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" "Keep in mind: To compile your document these classes have to be installed " "before." msgstr "" -#: ../geanylatex/src/geanylatex.c:1909 +#: ../geanylatex/src/geanylatex.c:1908 msgid "Use draft mode" msgstr "" -#: ../geanylatex/src/geanylatex.c:1911 +#: ../geanylatex/src/geanylatex.c:1910 msgid "" "Set the draft flag inside new created documents to get documents with a " "number of debugging helpers" msgstr "" -#: ../geanylatex/src/geanylatex.c:1928 +#: ../geanylatex/src/geanylatex.c:1927 msgid "Run LaTeX-Wizard" msgstr "" -#: ../geanylatex/src/geanylatex.c:1930 +#: ../geanylatex/src/geanylatex.c:1929 msgid "Insert \\label" msgstr "" -#: ../geanylatex/src/geanylatex.c:1932 +#: ../geanylatex/src/geanylatex.c:1931 msgid "Insert \\ref" msgstr "" -#: ../geanylatex/src/geanylatex.c:1934 +#: ../geanylatex/src/geanylatex.c:1933 msgid "Insert linebreak \\\\ " msgstr "" -#: ../geanylatex/src/geanylatex.c:1937 +#: ../geanylatex/src/geanylatex.c:1936 msgid "Insert command" msgstr "" -#: ../geanylatex/src/geanylatex.c:1939 +#: ../geanylatex/src/geanylatex.c:1938 msgid "Turn input replacement on/off" msgstr "" -#: ../geanylatex/src/geanylatex.c:1943 +#: ../geanylatex/src/geanylatex.c:1942 msgid "Replace special characters" msgstr "" -#: ../geanylatex/src/geanylatex.c:1946 +#: ../geanylatex/src/geanylatex.c:1945 msgid "Run insert environment dialog" msgstr "" -#: ../geanylatex/src/geanylatex.c:1948 +#: ../geanylatex/src/geanylatex.c:1947 msgid "Insert \\item" msgstr "" -#: ../geanylatex/src/geanylatex.c:1950 +#: ../geanylatex/src/geanylatex.c:1949 msgid "Format selection in bold font face" msgstr "" -#: ../geanylatex/src/geanylatex.c:1952 +#: ../geanylatex/src/geanylatex.c:1951 msgid "Format selection in italic font face" msgstr "" -#: ../geanylatex/src/geanylatex.c:1954 +#: ../geanylatex/src/geanylatex.c:1953 msgid "Format selection in typewriter font face" msgstr "" -#: ../geanylatex/src/geanylatex.c:1956 +#: ../geanylatex/src/geanylatex.c:1955 msgid "Format selection centered" msgstr "" -#: ../geanylatex/src/geanylatex.c:1958 +#: ../geanylatex/src/geanylatex.c:1957 #, fuzzy msgid "Format selection left-aligned" msgstr "Flyt det valgte til højre/venstre" -#: ../geanylatex/src/geanylatex.c:1960 +#: ../geanylatex/src/geanylatex.c:1959 #, fuzzy msgid "Format selection right-aligned" msgstr "Flyt det valgte til højre/venstre" -#: ../geanylatex/src/geanylatex.c:1963 +#: ../geanylatex/src/geanylatex.c:1962 msgid "Insert description list" msgstr "" -#: ../geanylatex/src/geanylatex.c:1966 +#: ../geanylatex/src/geanylatex.c:1965 msgid "Insert itemize list" msgstr "" -#: ../geanylatex/src/geanylatex.c:1969 +#: ../geanylatex/src/geanylatex.c:1968 msgid "Insert enumerate list" msgstr "" -#: ../geanylatex/src/geanylatex.c:1972 +#: ../geanylatex/src/geanylatex.c:1971 msgid "Set selection one level up" msgstr "" -#: ../geanylatex/src/geanylatex.c:1975 +#: ../geanylatex/src/geanylatex.c:1974 msgid "Set selection one level down" msgstr "" -#: ../geanylatex/src/geanylatex.c:1978 +#: ../geanylatex/src/geanylatex.c:1977 msgid "Insert \\usepackage{}" msgstr "" -#: ../geanylatex/src/geanylatex.c:1981 +#: ../geanylatex/src/geanylatex.c:1980 msgid "Insert BibTeX reference dialog" msgstr "" -#: ../geanylatex/src/geanylatex.c:1988 +#: ../geanylatex/src/geanylatex.c:1987 msgid "" "GeanyLaTeX is a plugin to improve support for LaTeX in Geany.\n" "\n" "Please report all bugs or feature requests to one of the authors." msgstr "" -#: ../geanylatex/src/geanylatex.c:2026 +#: ../geanylatex/src/geanylatex.c:2025 msgid "" "glatex_set_autocompletion_contextsize has been initialized with an invalid " "value. Default value taken. Please check your configuration file" msgstr "" -#: ../geanylatex/src/geanylatex.c:2048 ../geanylatex/src/geanylatex.c:2055 +#: ../geanylatex/src/geanylatex.c:2047 ../geanylatex/src/geanylatex.c:2054 msgid "page \\pageref{{{reference}}}" msgstr "" -#: ../geanylatex/src/geanylatex.c:2052 ../geanylatex/src/geanylatex.c:2059 +#: ../geanylatex/src/geanylatex.c:2051 ../geanylatex/src/geanylatex.c:2058 msgid "\\ref{{{reference}}}, page \\pageref{{{reference}}}" msgstr "" #. Build up menu for menubar -#: ../geanylatex/src/geanylatex.c:2107 +#: ../geanylatex/src/geanylatex.c:2106 msgid "_LaTeX" msgstr "" #. Filling up menubar menus #. LaTeX menu -#: ../geanylatex/src/geanylatex.c:2116 ../geanylatex/src/geanylatex.c:2328 +#: ../geanylatex/src/geanylatex.c:2115 ../geanylatex/src/geanylatex.c:2327 msgid "LaTeX-_Wizard" msgstr "" -#: ../geanylatex/src/geanylatex.c:2119 ../geanylatex/src/geanylatex.c:2331 +#: ../geanylatex/src/geanylatex.c:2118 ../geanylatex/src/geanylatex.c:2330 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "" -#: ../geanylatex/src/geanylatex.c:2124 +#: ../geanylatex/src/geanylatex.c:2123 msgid "I_nsert Special Character" msgstr "" -#: ../geanylatex/src/geanylatex.c:2126 +#: ../geanylatex/src/geanylatex.c:2125 msgid "Helps to use some not very common letters and signs" msgstr "" -#: ../geanylatex/src/geanylatex.c:2136 +#: ../geanylatex/src/geanylatex.c:2135 msgid "Insert _Reference" msgstr "" -#: ../geanylatex/src/geanylatex.c:2138 +#: ../geanylatex/src/geanylatex.c:2137 msgid "Inserting references to the document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2143 +#: ../geanylatex/src/geanylatex.c:2142 msgid "Insert _Label" msgstr "" -#: ../geanylatex/src/geanylatex.c:2145 +#: ../geanylatex/src/geanylatex.c:2144 msgid "Helps at inserting labels to a document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2151 +#: ../geanylatex/src/geanylatex.c:2150 msgid "Insert _Environment" msgstr "" -#: ../geanylatex/src/geanylatex.c:2153 +#: ../geanylatex/src/geanylatex.c:2152 msgid "Helps at inserting an environment a document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2159 +#: ../geanylatex/src/geanylatex.c:2158 msgid "Insert P_ackage" msgstr "" -#: ../geanylatex/src/geanylatex.c:2161 +#: ../geanylatex/src/geanylatex.c:2160 msgid "A small dialog to insert \\usepackage{} into header of current file" msgstr "" -#: ../geanylatex/src/geanylatex.c:2166 ../scope/data/scope.glade.h:58 +#: ../geanylatex/src/geanylatex.c:2165 ../scope/data/scope.glade.h:58 msgid "_Format" msgstr "" #. Add font size menu -#: ../geanylatex/src/geanylatex.c:2183 +#: ../geanylatex/src/geanylatex.c:2182 msgid "F_ont size" msgstr "" -#: ../geanylatex/src/geanylatex.c:2201 +#: ../geanylatex/src/geanylatex.c:2200 msgid "_Special Character Replacement" msgstr "" -#: ../geanylatex/src/geanylatex.c:2209 +#: ../geanylatex/src/geanylatex.c:2208 msgid "Bulk _Replace Special Characters" msgstr "" -#: ../geanylatex/src/geanylatex.c:2211 +#: ../geanylatex/src/geanylatex.c:2210 msgid "_Replace selected special characters with TeX substitutes" msgstr "" -#: ../geanylatex/src/geanylatex.c:2219 +#: ../geanylatex/src/geanylatex.c:2218 msgid "Toggle _Special Character Replacement" msgstr "" -#: ../geanylatex/src/geanylatex.c:2230 +#: ../geanylatex/src/geanylatex.c:2229 msgid "Insert _Command" msgstr "" -#: ../geanylatex/src/geanylatex.c:2232 +#: ../geanylatex/src/geanylatex.c:2231 msgid "Inserting costumized command to document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2257 +#: ../geanylatex/src/geanylatex.c:2256 msgid "_BibTeX" msgstr "" -#: ../geanylatex/src/geanylatex.c:2265 +#: ../geanylatex/src/geanylatex.c:2264 msgid "Insert B_ibTeX reference" msgstr "" -#: ../geanylatex/src/geanylatex.c:2267 +#: ../geanylatex/src/geanylatex.c:2266 msgid "Helps to insert a reference out of BibTeX files" msgstr "" -#: ../geanylatex/src/geanylatex.c:2272 +#: ../geanylatex/src/geanylatex.c:2271 msgid "_BibTeX entries" msgstr "" @@ -2400,16 +2426,16 @@ msgid "Creating dummy text with Geany" msgstr "" -#: ../geanylipsum/src/geanylipsum.c:86 +#: ../geanylipsum/src/geanylipsum.c:89 msgid "Lipsum-Generator" msgstr "" -#: ../geanylipsum/src/geanylipsum.c:87 +#: ../geanylipsum/src/geanylipsum.c:90 msgid "Enter the length of Lipsum text here" msgstr "" #. Building menu entry -#: ../geanylipsum/src/geanylipsum.c:163 +#: ../geanylipsum/src/geanylipsum.c:164 msgid "_Lipsum" msgstr "" @@ -2533,19 +2559,19 @@ msgid "Browse..." msgstr "" -#: ../geanylua/gsdlg.c:175 +#: ../geanylua/gsdlg.c:176 msgid "Select Color" msgstr "" -#: ../geanylua/gsdlg.c:205 +#: ../geanylua/gsdlg.c:207 msgid "Choose..." msgstr "" -#: ../geanylua/gsdlg.c:226 +#: ../geanylua/gsdlg.c:228 msgid "Select Font" msgstr "" -#: ../geanylua/gsdlg.c:253 +#: ../geanylua/gsdlg.c:255 msgid "Select..." msgstr "" @@ -2570,7 +2596,7 @@ "not enough arguments for command \"%s\".\n" msgstr "" -#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:398 +#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:396 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2605,14 +2631,14 @@ msgid "Save file" msgstr "" -#: ../geanylua/glspi_dlg.c:436 +#: ../geanylua/glspi_dlg.c:438 #, c-format msgid "" "Error in module \"%s\" at function pickfile():\n" "failed to parse filter string at argument #3.\n" msgstr "" -#: ../geanylua/glspi_dlg.c:486 +#: ../geanylua/glspi_dlg.c:489 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2651,21 +2677,21 @@ "Please check your installation." msgstr "" -#: ../geanylua/glspi_app.c:19 +#: ../geanylua/glspi_app.c:21 #, c-format msgid "" "%s %s: %s\n" "Copyright (c) 2007-2010 " msgstr "" -#: ../geanylua/glspi_app.c:149 +#: ../geanylua/glspi_app.c:151 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" "widget \"%s\" not found for argument #1.\n" msgstr "" -#: ../geanylua/glspi_app.c:158 +#: ../geanylua/glspi_app.c:160 #, c-format msgid "" "Error in module \"%s\" at function %s() argument #2:\n" @@ -3031,6 +3057,19 @@ "duplicate line" msgstr "" +#: ../geanymacro/src/geanymacro.c:150 +msgid "Search for next \"\"" +msgstr "" + +#: ../geanymacro/src/geanymacro.c:151 +msgid "Search for previous \"\"" +msgstr "" + +#: ../geanymacro/src/geanymacro.c:152 +#, fuzzy +msgid "Set start of search to beginning of selection" +msgstr "Flyt det valgte til højre/venstre" + #: ../geanymacro/src/geanymacro.c:181 msgid "Macros" msgstr "" @@ -3230,12 +3269,12 @@ #. create buttons #: ../geanymacro/src/geanymacro.c:1393 ../geanymacro/src/geanymacro.c:1536 -#: ../geanymacro/src/geanymacro.c:1819 ../geanymacro/src/geanymacro.c:2116 +#: ../geanymacro/src/geanymacro.c:1826 ../geanymacro/src/geanymacro.c:2122 msgid "_Ok" msgstr "" #: ../geanymacro/src/geanymacro.c:1394 ../geanymacro/src/geanymacro.c:1537 -#: ../geanymacro/src/geanymacro.c:1820 +#: ../geanymacro/src/geanymacro.c:1827 msgid "_Cancel" msgstr "" @@ -3252,7 +3291,7 @@ msgid "Search for contents of clipboard" msgstr "" -#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:92 +#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:101 msgid "Search for:" msgstr "" @@ -3286,58 +3325,58 @@ msgid "Text:" msgstr "" -#: ../geanymacro/src/geanymacro.c:1571 ../geanymacro/src/geanymacro.c:1755 +#: ../geanymacro/src/geanymacro.c:1570 ../geanymacro/src/geanymacro.c:1758 #, c-format msgid "Insert/replace with \"%s\"" msgstr "" #. create dialog box -#: ../geanymacro/src/geanymacro.c:1731 +#: ../geanymacro/src/geanymacro.c:1735 #, c-format msgid "Edit: %s" msgstr "" #. add column -#: ../geanymacro/src/geanymacro.c:1794 +#: ../geanymacro/src/geanymacro.c:1801 msgid "Event" msgstr "" #. add buttons -#: ../geanymacro/src/geanymacro.c:1809 +#: ../geanymacro/src/geanymacro.c:1816 msgid "Move _Up" msgstr "" -#: ../geanymacro/src/geanymacro.c:1811 +#: ../geanymacro/src/geanymacro.c:1818 msgid "Move Do_wn" msgstr "" -#: ../geanymacro/src/geanymacro.c:1813 +#: ../geanymacro/src/geanymacro.c:1820 msgid "New _Above" msgstr "" -#: ../geanymacro/src/geanymacro.c:1814 +#: ../geanymacro/src/geanymacro.c:1821 msgid "New _Below" msgstr "" -#: ../geanymacro/src/geanymacro.c:1817 ../geanymacro/src/geanymacro.c:2114 +#: ../geanymacro/src/geanymacro.c:1824 ../geanymacro/src/geanymacro.c:2120 msgid "_Delete" msgstr "" #. create dialog box -#: ../geanymacro/src/geanymacro.c:2059 +#: ../geanymacro/src/geanymacro.c:2065 msgid "Edit Macros" msgstr "" -#: ../geanymacro/src/geanymacro.c:2089 +#: ../geanymacro/src/geanymacro.c:2095 msgid "Macro Name" msgstr "" -#: ../geanymacro/src/geanymacro.c:2095 +#: ../geanymacro/src/geanymacro.c:2101 msgid "Key Trigger" msgstr "" #. add buttons -#: ../geanymacro/src/geanymacro.c:2110 +#: ../geanymacro/src/geanymacro.c:2116 msgid "_Re-Record" msgstr "" @@ -3356,6 +3395,33 @@ msgid "_Edit Macros" msgstr "" +#. *< \brief It's the information message about geany mini script +#: ../geanyminiscript/src/gms_gui.c:129 +msgid "" +"GMS : Geany Mini-Script filter Plugin\n" +"This plugin is a tool to apply a script filter on:\n" +" o the text selection,\n" +" o the current document,\n" +" o all documents of the current session.\n" +"\n" +"The filter type can be:\n" +" o Unix shell script,\n" +" o perl script,\n" +" o python script,\n" +" o sed commands,\n" +" o awk script.\n" +"\n" +"AUTHOR\n" +" Written by Pascal BURLOT (December,2008)\n" +"\n" +"LICENSE:\n" +"This program is free software; you can redistribute\n" +"it and/or modify it under the terms of the GNU \n" +"General Public License as published by the Free\n" +"Software Foundation; either version 2 of the License,\n" +"or (at your option) any later version." +msgstr "" + #: ../geanyminiscript/src/gms_gui.c:253 msgid "Load Mini-Script File" msgstr "" @@ -3364,109 +3430,108 @@ msgid "Save Mini-Script File" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:418 +#: ../geanyminiscript/src/gms_gui.c:419 msgid "Mini-Script Filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:446 +#: ../geanyminiscript/src/gms_gui.c:445 msgid "Clear the mini-script window" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:451 +#: ../geanyminiscript/src/gms_gui.c:450 msgid "Load a mini-script into this window" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:456 +#: ../geanyminiscript/src/gms_gui.c:455 msgid "Save the mini-script into a file" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:461 +#: ../geanyminiscript/src/gms_gui.c:460 msgid "Display a information about the mini-script plugin" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:469 +#: ../geanyminiscript/src/gms_gui.c:468 msgid "select the mini-script type" msgstr "" #. Hbox : Radio bouttons for choosing the input: #. * selection/current document/all documents of the current session -#: ../geanyminiscript/src/gms_gui.c:500 +#: ../geanyminiscript/src/gms_gui.c:499 msgid "filter input" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:502 +#: ../geanyminiscript/src/gms_gui.c:501 msgid "select the input of mini-script filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:508 +#: ../geanyminiscript/src/gms_gui.c:507 msgid "selection" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:509 +#: ../geanyminiscript/src/gms_gui.c:508 msgid "document" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:510 +#: ../geanyminiscript/src/gms_gui.c:509 msgid "session" msgstr "" #. Hbox : Radio bouttons for choosing the output: #. * current document/ or new document -#: ../geanyminiscript/src/gms_gui.c:519 +#: ../geanyminiscript/src/gms_gui.c:518 msgid "filter output" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:521 +#: ../geanyminiscript/src/gms_gui.c:520 msgid "select the output of mini-script filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:527 +#: ../geanyminiscript/src/gms_gui.c:526 msgid "Current Doc." msgstr "" -#: ../geanyminiscript/src/gms_gui.c:528 +#: ../geanyminiscript/src/gms_gui.c:527 msgid "New Doc." msgstr "" -#: ../geanyminiscript/src/gms_gui.c:749 +#: ../geanyminiscript/src/gms_gui.c:748 msgid "script configuration" msgstr "" -#. All plugins must set name, description, version and author. #: ../geanyminiscript/src/gms.c:58 msgid "Mini Script" msgstr "" -#: ../geanyminiscript/src/gms.c:58 +#: ../geanyminiscript/src/gms.c:59 msgid "" "A tool to apply a script filter on a text selection or current document(s)" msgstr "" -#: ../geanyminiscript/src/gms.c:59 +#: ../geanyminiscript/src/gms.c:60 msgid "Pascal BURLOT, a Geany user" msgstr "" #. Add an item to the Tools menu -#: ../geanyminiscript/src/gms.c:278 +#: ../geanyminiscript/src/gms.c:249 msgid "_Mini-Script" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:58 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:61 msgid "Numbered Bookmarks for Geany" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:923 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:927 #, c-format msgid "Unable to apply all markers to '%s' as all being used." msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:925 -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:969 -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1392 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:929 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:973 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1396 msgid "_Okay" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:967 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:971 #, c-format msgid "" "'%s' has been edited since it was last saved by geany. Marker positions may " @@ -3474,54 +3539,54 @@ "Press Ignore to try an load markers anyway." msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:970 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:974 msgid "_Ignore" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1215 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1219 msgid "remember fold state" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1221 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1225 msgid "Center view when goto bookmark" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1228 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1232 #, fuzzy msgid "Move to start of line" msgstr "Flyt det valgte til højre/venstre" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1229 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1233 msgid "Move to remembered position in line" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1230 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1234 msgid "Move to position in current line" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1231 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1235 #, fuzzy msgid "Move to End of line" msgstr "Flyt det valgte til højre/venstre" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1237 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1241 msgid "Save file settings with program settings" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1238 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1242 msgid "Save file settings to filename with suffix" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1243 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1247 msgid "remember normal Bookmarks" msgstr "" #. create dialog box -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1263 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1267 msgid "Numbered Bookmarks help" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1270 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1274 msgid "" "This Plugin implements Numbered Bookmarks in Geany, as well as remembering " "the state of folds, and positions of standard non-numbered bookmarks when a " @@ -3537,7 +3602,7 @@ "previously set bookmark, press Ctrl+a number from 0 to 9." msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1391 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1395 msgid "Unable to apply markers as all being used." msgstr "" @@ -3616,36 +3681,36 @@ msgstr "" #. shouldn't get here -#: ../geanypg/src/pinentry.c:107 +#: ../geanypg/src/pinentry.c:111 msgid "Could not use pinentry." msgstr "" -#: ../geanypg/src/pinentry.c:119 +#: ../geanypg/src/pinentry.c:123 msgid "Unexpected output from pinentry." msgstr "" #. read the rest of the first line after OK -#: ../geanypg/src/pinentry.c:127 +#: ../geanypg/src/pinentry.c:131 msgid "Passphrase entry" msgstr "" -#: ../geanypg/src/pinentry.c:131 +#: ../geanypg/src/pinentry.c:135 msgid "Passphrase" msgstr "" -#: ../geanypg/src/pinentry.c:136 +#: ../geanypg/src/pinentry.c:140 msgid "Enter passphrase for" msgstr "" -#: ../geanypg/src/pinentry.c:167 +#: ../geanypg/src/pinentry.c:171 msgid "pinentry gave error" msgstr "" -#: ../geanypg/src/pinentry.c:170 +#: ../geanypg/src/pinentry.c:174 msgid "Unexpected error from pinentry." msgstr "" -#: ../geanypg/src/pinentry.c:195 +#: ../geanypg/src/pinentry.c:199 msgid "" "Error, Passphrase input without using gpg-agent is not supported on Windows " "yet." @@ -3655,8 +3720,8 @@ msgid "a key with fingerprint" msgstr "" -#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:522 -#: ../spellcheck/src/gui.c:533 +#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:527 +#: ../spellcheck/src/gui.c:538 msgid "unknown" msgstr "" @@ -3812,7 +3877,7 @@ msgstr "" #: ../geanyprj/src/geanyprj.c:38 ../geanyprj/src/sidebar.c:456 -#: ../gproject/src/gproject-sidebar.c:822 +#: ../gproject/src/gproject-sidebar.c:870 msgid "Project" msgstr "" @@ -3841,7 +3906,7 @@ msgid "C_reate" msgstr "" -#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:116 +#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:114 msgid "Name:" msgstr "" @@ -3912,7 +3977,7 @@ msgid "Remove File" msgstr "" -#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:803 +#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:849 msgid "H_ide Sidebar" msgstr "" @@ -3921,6 +3986,48 @@ msgid "Project \"%s\" opened." msgstr "" +#: ../geanypy/src/geanypy-plugin.c:34 +msgid "GeanyPy" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:35 +msgid "Python plugins support" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:77 +#, c-format +msgid "Unable to pre-load Python library: %s." +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:157 +msgid "Failed to import manager module" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:166 +msgid "Failed to retrieve PluginManager from manager module" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:182 +msgid "System plugin directory not found." +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:211 +msgid "Unable to instantiate new PluginManager" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:227 +msgid "Unable to get show_all() method on plugin manager" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:255 +#, c-format +msgid "Unable to create Python plugins directory: %s: %s" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:266 +msgid "Python Plugin Manager" +msgstr "" + #: ../geanysendmail/src/geanysendmail.c:43 msgid "GeanySendMail" msgstr "" @@ -3939,42 +4046,42 @@ msgid "Enter the recipient's e-mail address:" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:136 +#: ../geanysendmail/src/geanysendmail.c:138 msgid "Filename placeholder not found. The executed command might have failed." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:142 +#: ../geanysendmail/src/geanysendmail.c:144 msgid "" "Recipient address placeholder not found. The executed command might have " "failed." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:157 +#: ../geanysendmail/src/geanysendmail.c:159 msgid "Could not execute mailer. Please check your configuration." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:166 +#: ../geanysendmail/src/geanysendmail.c:168 msgid "Please define a mail client first." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:171 +#: ../geanysendmail/src/geanysendmail.c:173 msgid "File has to be saved before sending." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:187 +#: ../geanysendmail/src/geanysendmail.c:191 msgid "Mail" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:218 +#: ../geanysendmail/src/geanysendmail.c:222 msgid "Send by mail" msgstr "" #. add a label and a text entry to the dialog -#: ../geanysendmail/src/geanysendmail.c:308 +#: ../geanysendmail/src/geanysendmail.c:312 msgid "Path and options for the mail client:" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:316 +#: ../geanysendmail/src/geanysendmail.c:320 msgid "" "Note: \n" "\t%f will be replaced by your file.\n" @@ -3985,28 +4092,28 @@ "\tmutt -s \"Sending '%b'\" -a \"%f\" \"%r\"" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:326 +#: ../geanysendmail/src/geanysendmail.c:330 msgid "Show toolbar icon" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:328 +#: ../geanysendmail/src/geanysendmail.c:332 msgid "Shows a icon in the toolbar to send file more easy." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:334 +#: ../geanysendmail/src/geanysendmail.c:338 msgid "Use dialog for entering email address of recipients" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:356 +#: ../geanysendmail/src/geanysendmail.c:360 msgid "Send file by mail" msgstr "" #. Build up menu entry -#: ../geanysendmail/src/geanysendmail.c:379 +#: ../geanysendmail/src/geanysendmail.c:383 msgid "_Mail document" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:382 +#: ../geanysendmail/src/geanysendmail.c:386 msgid "" "Sends the opened file as unzipped attachment by any mailer from your $PATH" msgstr "" @@ -4024,339 +4131,358 @@ msgid "geanyvc: s_spawn_sync error: %s" msgstr "" -#: ../geanyvc/src/geanyvc.c:609 ../geanyvc/src/geanyvc.c:620 +#: ../geanyvc/src/geanyvc.c:561 +#, c-format +msgid "File %s: action %s executed via %s." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:614 ../geanyvc/src/geanyvc.c:625 #, c-format msgid "geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'" msgstr "" -#: ../geanyvc/src/geanyvc.c:646 ../geanyvc/src/geanyvc.c:696 +#: ../geanyvc/src/geanyvc.c:651 ../geanyvc/src/geanyvc.c:701 msgid "No changes were made." msgstr "" -#: ../geanyvc/src/geanyvc.c:723 +#: ../geanyvc/src/geanyvc.c:728 msgid "No history available" msgstr "" -#: ../geanyvc/src/geanyvc.c:916 ../geanyvc/src/geanyvc.c:924 +#: ../geanyvc/src/geanyvc.c:921 ../geanyvc/src/geanyvc.c:929 #, c-format msgid "Do you really want to revert: %s?" msgstr "" -#: ../geanyvc/src/geanyvc.c:932 +#: ../geanyvc/src/geanyvc.c:937 #, c-format msgid "Do you really want to add: %s?" msgstr "" -#: ../geanyvc/src/geanyvc.c:939 +#: ../geanyvc/src/geanyvc.c:944 #, c-format msgid "Do you really want to remove: %s?" msgstr "" -#: ../geanyvc/src/geanyvc.c:962 +#: ../geanyvc/src/geanyvc.c:967 msgid "Do you really want to update?" msgstr "" -#: ../geanyvc/src/geanyvc.c:1225 +#: ../geanyvc/src/geanyvc.c:1094 +msgid "" +"The resulting differences cannot be displayed because the changes are too " +"big to display here and would slow down the UI significantly.\n" +"\n" +"To view the differences, cancel this dialog and open the differences in " +"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:1243 msgid "Commit Y/N" msgstr "" -#: ../geanyvc/src/geanyvc.c:1235 +#: ../geanyvc/src/geanyvc.c:1253 msgid "Status" msgstr "" -#: ../geanyvc/src/geanyvc.c:1242 +#: ../geanyvc/src/geanyvc.c:1260 msgid "Path" msgstr "" -#: ../geanyvc/src/geanyvc.c:1330 +#: ../geanyvc/src/geanyvc.c:1324 +#, c-format +msgid "Line: %d Column: %d" +msgstr "" + +#: ../geanyvc/src/geanyvc.c:1370 msgid "Commit" msgstr "" -#: ../geanyvc/src/geanyvc.c:1372 +#: ../geanyvc/src/geanyvc.c:1412 msgid "_De-/select all files" msgstr "" -#: ../geanyvc/src/geanyvc.c:1413 +#: ../geanyvc/src/geanyvc.c:1456 msgid "Commit message:" msgstr "" -#: ../geanyvc/src/geanyvc.c:1426 +#: ../geanyvc/src/geanyvc.c:1475 msgid "C_ommit" msgstr "" -#: ../geanyvc/src/geanyvc.c:1500 +#: ../geanyvc/src/geanyvc.c:1556 msgid "Nothing to commit." msgstr "" -#: ../geanyvc/src/geanyvc.c:1546 +#: ../geanyvc/src/geanyvc.c:1602 #, c-format msgid "Error initializing spell checking: %s" msgstr "" -#: ../geanyvc/src/geanyvc.c:1558 +#: ../geanyvc/src/geanyvc.c:1614 #, c-format msgid "" "Error while setting up language for spellchecking. Please check " "configuration. Error message was: %s" msgstr "" -#: ../geanyvc/src/geanyvc.c:1834 +#: ../geanyvc/src/geanyvc.c:1890 msgid "Set Changed-flag for document tabs created by the plugin" msgstr "" -#: ../geanyvc/src/geanyvc.c:1837 +#: ../geanyvc/src/geanyvc.c:1893 msgid "" "If this option is activated, every new by the VC-plugin created document tab " "will be marked as changed. Even this option is useful in some cases, it " "could cause a big number of annoying \"Do you want to save\"-dialogs." msgstr "" -#: ../geanyvc/src/geanyvc.c:1845 +#: ../geanyvc/src/geanyvc.c:1901 msgid "Confirm adding new files to a VCS" msgstr "" -#: ../geanyvc/src/geanyvc.c:1848 +#: ../geanyvc/src/geanyvc.c:1904 msgid "Shows a confirmation dialog on adding a new (created) file to VCS." msgstr "" -#: ../geanyvc/src/geanyvc.c:1854 +#: ../geanyvc/src/geanyvc.c:1910 msgid "Maximize commit dialog" msgstr "" -#: ../geanyvc/src/geanyvc.c:1855 +#: ../geanyvc/src/geanyvc.c:1911 msgid "Show commit dialog maximize." msgstr "" -#: ../geanyvc/src/geanyvc.c:1861 +#: ../geanyvc/src/geanyvc.c:1917 msgid "Use external diff viewer" msgstr "" -#: ../geanyvc/src/geanyvc.c:1863 +#: ../geanyvc/src/geanyvc.c:1919 msgid "Use external diff viewer for file diff." msgstr "" -#: ../geanyvc/src/geanyvc.c:1869 +#: ../geanyvc/src/geanyvc.c:1925 msgid "Show VC entries at editor menu" msgstr "" -#: ../geanyvc/src/geanyvc.c:1871 +#: ../geanyvc/src/geanyvc.c:1927 msgid "Show entries for VC functions inside editor menu" msgstr "" -#: ../geanyvc/src/geanyvc.c:1876 +#: ../geanyvc/src/geanyvc.c:1932 msgid "Attach menu to menubar" msgstr "" -#: ../geanyvc/src/geanyvc.c:1878 +#: ../geanyvc/src/geanyvc.c:1934 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " "directly inside Geany's menubar.Will take in account after next start of " "GeanyVC" msgstr "" -#: ../geanyvc/src/geanyvc.c:1886 +#: ../geanyvc/src/geanyvc.c:1942 msgid "Enable CVS" msgstr "" -#: ../geanyvc/src/geanyvc.c:1891 +#: ../geanyvc/src/geanyvc.c:1947 msgid "Enable GIT" msgstr "" -#: ../geanyvc/src/geanyvc.c:1896 +#: ../geanyvc/src/geanyvc.c:1952 msgid "Enable SVN" msgstr "" -#: ../geanyvc/src/geanyvc.c:1901 +#: ../geanyvc/src/geanyvc.c:1957 msgid "Enable SVK" msgstr "" -#: ../geanyvc/src/geanyvc.c:1906 +#: ../geanyvc/src/geanyvc.c:1962 msgid "Enable Bazaar" msgstr "" -#: ../geanyvc/src/geanyvc.c:1911 +#: ../geanyvc/src/geanyvc.c:1967 msgid "Enable Mercurial" msgstr "" -#: ../geanyvc/src/geanyvc.c:1917 +#: ../geanyvc/src/geanyvc.c:1973 msgid "Spellcheck language" msgstr "" -#: ../geanyvc/src/geanyvc.c:2008 +#: ../geanyvc/src/geanyvc.c:2064 msgid "_VC file Actions" msgstr "" #. Diff of current file #. Diff of the current dir #. Complete diff of base directory -#: ../geanyvc/src/geanyvc.c:2014 ../geanyvc/src/geanyvc.c:2091 -#: ../geanyvc/src/geanyvc.c:2131 +#: ../geanyvc/src/geanyvc.c:2070 ../geanyvc/src/geanyvc.c:2147 +#: ../geanyvc/src/geanyvc.c:2187 msgid "_Diff" msgstr "" -#: ../geanyvc/src/geanyvc.c:2017 +#: ../geanyvc/src/geanyvc.c:2073 msgid "Make a diff from the current active file" msgstr "" #. Revert current file #. Revert current dir #. Revert everything -#: ../geanyvc/src/geanyvc.c:2022 ../geanyvc/src/geanyvc.c:2100 -#: ../geanyvc/src/geanyvc.c:2139 +#: ../geanyvc/src/geanyvc.c:2078 ../geanyvc/src/geanyvc.c:2156 +#: ../geanyvc/src/geanyvc.c:2195 msgid "_Revert" msgstr "" -#: ../geanyvc/src/geanyvc.c:2025 +#: ../geanyvc/src/geanyvc.c:2081 msgid "Restore pristine working copy file (undo local edits)." msgstr "" #. Blame for current file -#: ../geanyvc/src/geanyvc.c:2034 +#: ../geanyvc/src/geanyvc.c:2090 msgid "_Blame" msgstr "" -#: ../geanyvc/src/geanyvc.c:2037 +#: ../geanyvc/src/geanyvc.c:2093 msgid "Shows the changes made at one file per revision and author." msgstr "" #. History/log of current file #. History/log of the current dir #. Complete History/Log of base directory -#: ../geanyvc/src/geanyvc.c:2044 ../geanyvc/src/geanyvc.c:2110 -#: ../geanyvc/src/geanyvc.c:2151 +#: ../geanyvc/src/geanyvc.c:2100 ../geanyvc/src/geanyvc.c:2166 +#: ../geanyvc/src/geanyvc.c:2207 msgid "_History (log)" msgstr "" -#: ../geanyvc/src/geanyvc.c:2047 +#: ../geanyvc/src/geanyvc.c:2103 msgid "Shows the log of the current file" msgstr "" #. base version of the current file -#: ../geanyvc/src/geanyvc.c:2052 +#: ../geanyvc/src/geanyvc.c:2108 msgid "_Original" msgstr "" -#: ../geanyvc/src/geanyvc.c:2055 +#: ../geanyvc/src/geanyvc.c:2111 msgid "Shows the original of the current file" msgstr "" #. add current file -#: ../geanyvc/src/geanyvc.c:2063 +#: ../geanyvc/src/geanyvc.c:2119 msgid "_Add to Version Control" msgstr "" -#: ../geanyvc/src/geanyvc.c:2065 +#: ../geanyvc/src/geanyvc.c:2121 msgid "Add file to repository." msgstr "" #. remove current file -#: ../geanyvc/src/geanyvc.c:2071 +#: ../geanyvc/src/geanyvc.c:2127 msgid "_Remove from Version Control" msgstr "" -#: ../geanyvc/src/geanyvc.c:2073 +#: ../geanyvc/src/geanyvc.c:2129 msgid "Remove file from repository." msgstr "" -#: ../geanyvc/src/geanyvc.c:2088 +#: ../geanyvc/src/geanyvc.c:2144 msgid "_Directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2094 +#: ../geanyvc/src/geanyvc.c:2150 msgid "Make a diff from the directory of the current active file" msgstr "" -#: ../geanyvc/src/geanyvc.c:2103 +#: ../geanyvc/src/geanyvc.c:2159 msgid "Restore original files in the current folder (undo local edits)." msgstr "" -#: ../geanyvc/src/geanyvc.c:2113 +#: ../geanyvc/src/geanyvc.c:2169 msgid "Shows the log of the current directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2127 +#: ../geanyvc/src/geanyvc.c:2183 msgid "_Base Directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2133 +#: ../geanyvc/src/geanyvc.c:2189 msgid "Make a diff from the top VC directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2141 +#: ../geanyvc/src/geanyvc.c:2197 msgid "Revert any local edits." msgstr "" -#: ../geanyvc/src/geanyvc.c:2154 +#: ../geanyvc/src/geanyvc.c:2210 msgid "Shows the log of the top VC directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2180 +#: ../geanyvc/src/geanyvc.c:2236 msgid "VC _Commit" msgstr "" -#: ../geanyvc/src/geanyvc.c:2215 +#: ../geanyvc/src/geanyvc.c:2271 msgid "Show diff of file" msgstr "" -#: ../geanyvc/src/geanyvc.c:2217 +#: ../geanyvc/src/geanyvc.c:2273 msgid "Show diff of directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2219 +#: ../geanyvc/src/geanyvc.c:2275 msgid "Show diff of basedir" msgstr "" -#: ../geanyvc/src/geanyvc.c:2222 +#: ../geanyvc/src/geanyvc.c:2278 msgid "Commit changes" msgstr "" -#: ../geanyvc/src/geanyvc.c:2224 +#: ../geanyvc/src/geanyvc.c:2280 msgid "Show status" msgstr "" -#: ../geanyvc/src/geanyvc.c:2226 +#: ../geanyvc/src/geanyvc.c:2282 msgid "Revert single file" msgstr "" -#: ../geanyvc/src/geanyvc.c:2228 +#: ../geanyvc/src/geanyvc.c:2284 msgid "Revert directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2230 +#: ../geanyvc/src/geanyvc.c:2286 msgid "Revert base directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2232 +#: ../geanyvc/src/geanyvc.c:2288 msgid "Update file" msgstr "" -#: ../geanyvc/src/geanyvc.c:2260 +#: ../geanyvc/src/geanyvc.c:2316 msgid "_VC" msgstr "" -#: ../geanyvc/src/geanyvc.c:2266 +#: ../geanyvc/src/geanyvc.c:2322 msgid "_Version Control" msgstr "" #. Status of basedir -#: ../geanyvc/src/geanyvc.c:2288 +#: ../geanyvc/src/geanyvc.c:2344 msgid "_Status" msgstr "" -#: ../geanyvc/src/geanyvc.c:2290 +#: ../geanyvc/src/geanyvc.c:2346 msgid "Show status." msgstr "" -#: ../geanyvc/src/geanyvc.c:2297 +#: ../geanyvc/src/geanyvc.c:2353 msgid "Update from remote repository." msgstr "" #. Commit all changes -#: ../geanyvc/src/geanyvc.c:2302 +#: ../geanyvc/src/geanyvc.c:2358 msgid "_Commit" msgstr "" -#: ../geanyvc/src/geanyvc.c:2304 +#: ../geanyvc/src/geanyvc.c:2360 msgid "Commit changes." msgstr "" @@ -4498,95 +4624,245 @@ "tab." msgstr "" -#: ../gproject/src/gproject-sidebar.c:81 -#: ../gproject/src/gproject-sidebar.c:792 +#: ../gproject/src/gproject-sidebar.c:90 +#: ../gproject/src/gproject-sidebar.c:838 msgid "Find File" msgstr "" -#: ../gproject/src/gproject-sidebar.c:108 +#: ../gproject/src/gproject-sidebar.c:117 msgid "Search inside:" msgstr "" -#: ../gproject/src/gproject-sidebar.c:120 +#: ../gproject/src/gproject-sidebar.c:129 msgid "C_ase sensitive" msgstr "" -#: ../gproject/src/gproject-sidebar.c:123 +#: ../gproject/src/gproject-sidebar.c:132 msgid "Search in full path" msgstr "" -#: ../gproject/src/gproject-sidebar.c:702 +#: ../gproject/src/gproject-sidebar.c:745 msgid "Reload all" msgstr "" -#: ../gproject/src/gproject-sidebar.c:711 -#: ../treebrowser/src/treebrowser.c:1282 +#: ../gproject/src/gproject-sidebar.c:754 +#: ../treebrowser/src/treebrowser.c:1281 msgid "Expand all" msgstr "" -#: ../gproject/src/gproject-sidebar.c:717 -#: ../treebrowser/src/treebrowser.c:1286 +#: ../gproject/src/gproject-sidebar.c:761 +#: ../treebrowser/src/treebrowser.c:1285 msgid "Collapse all" msgstr "" -#: ../gproject/src/gproject-sidebar.c:726 +#: ../gproject/src/gproject-sidebar.c:771 msgid "Follow active editor" msgstr "" -#: ../gproject/src/gproject-sidebar.c:774 +#: ../gproject/src/gproject-sidebar.c:820 msgid "Expand All" msgstr "" -#: ../gproject/src/gproject-sidebar.c:783 -#: ../treebrowser/src/treebrowser.c:1234 +#: ../gproject/src/gproject-sidebar.c:829 msgid "Find in Files" msgstr "" #. POSITION OF VIEW -#: ../markdown/src/conf.c:570 +#: ../markdown/src/conf.c:567 msgid "Position:" msgstr "" -#: ../markdown/src/conf.c:576 +#: ../markdown/src/conf.c:573 msgid "Sidebar" msgstr "" -#: ../markdown/src/conf.c:584 +#: ../markdown/src/conf.c:581 msgid "Message Window" msgstr "" -#: ../markdown/src/conf.c:598 +#: ../markdown/src/conf.c:595 msgid "Font:" msgstr "" -#: ../markdown/src/conf.c:616 +#: ../markdown/src/conf.c:612 msgid "Code Font:" msgstr "" -#: ../markdown/src/conf.c:634 +#: ../markdown/src/conf.c:629 msgid "BG Color:" msgstr "" -#: ../markdown/src/conf.c:651 +#: ../markdown/src/conf.c:645 msgid "FG Color:" msgstr "" -#: ../markdown/src/conf.c:670 +#: ../markdown/src/conf.c:663 msgid "Select Template File" msgstr "" -#: ../markdown/src/plugin.c:33 +#: ../markdown/src/plugin.c:35 msgid "Real-time Markdown preview" msgstr "" -#: ../markdown/src/plugin.c:49 +#: ../markdown/src/plugin.c:51 msgid "Markdown Preview" msgstr "" -#: ../markdown/src/plugin.c:160 +#: ../markdown/src/plugin.c:162 msgid "The current document does not have a Markdown filetype." msgstr "" +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:35 +msgid "Pair Tag Highlighter" +msgstr "" + +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:36 +msgid "Finds and highlights matching opening/closing HTML tag" +msgstr "" + +#: ../pohelper/data/menus.ui.h:1 +msgid "_Translation Helper" +msgstr "" + +#: ../pohelper/data/menus.ui.h:2 +msgid "_Previous String" +msgstr "" + +#: ../pohelper/data/menus.ui.h:3 ../pohelper/src/gph-plugin.c:1031 +msgid "Go to previous string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:4 +msgid "_Next String" +msgstr "" + +#: ../pohelper/data/menus.ui.h:5 ../pohelper/src/gph-plugin.c:1034 +msgid "Go to next string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:6 +msgid "Pre_vious Untranslated" +msgstr "" + +#: ../pohelper/data/menus.ui.h:7 ../pohelper/src/gph-plugin.c:1037 +msgid "Go to previous untranslated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:8 +msgid "Next _Untranslated" +msgstr "" + +#: ../pohelper/data/menus.ui.h:9 ../pohelper/src/gph-plugin.c:1040 +msgid "Go to next untranslated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:10 +msgid "Previous Fu_zzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:11 ../pohelper/src/gph-plugin.c:1043 +msgid "Go to previous fuzzily translated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:12 +msgid "Next _Fuzzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:13 ../pohelper/src/gph-plugin.c:1046 +msgid "Go to next fuzzily translated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:14 +msgid "Previous Untranslated or Fuzz_y" +msgstr "" + +#: ../pohelper/data/menus.ui.h:15 ../pohelper/src/gph-plugin.c:1049 +msgid "Go to previous untranslated or fuzzy string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:16 +msgid "Next Untranslated _or Fuzzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:17 ../pohelper/src/gph-plugin.c:1053 +msgid "Go to next untranslated or fuzzy string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:18 ../pohelper/src/gph-plugin.c:1064 +msgid "Toggle current translation fuzziness" +msgstr "" + +#: ../pohelper/data/menus.ui.h:19 +msgid "_Toggle Fuzziness" +msgstr "" + +#: ../pohelper/data/menus.ui.h:20 +msgid "Paste _Message as Translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:21 +msgid "Paste the original untranslated string to the translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:22 ../pohelper/src/gph-plugin.c:1061 +msgid "Reflow the current translation string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:23 +msgid "_Reflow Translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:24 +msgid "" +"Whether to update the translation headers (author, revision date, ...) upon " +"file save" +msgstr "" + +#: ../pohelper/data/menus.ui.h:25 +msgid "Update _Headers Upon Save" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:41 +msgid "Translation Helper" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:42 +msgid "Improves support for GetText translation files." +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1057 +msgid "Paste original untranslated string to translation" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1099 +#, c-format +msgid "Failed to load configuration file: %s" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1124 +#, c-format +msgid "Failed to create configuration directory \"%s\": %s" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1127 +#, c-format +msgid "Failed to save configuration file: %s" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1182 +#, c-format +msgid "" +"Failed to load UI definition, please check your installation. The error was: " +"%s" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1222 +#, c-format +msgid "" +"Cannot find widget \"%s\" in the UI definition, please check your " +"installation." +msgstr "" + #: ../pretty-printer/src/PluginEntry.c:37 msgid "XML PrettyPrinter" msgstr "" @@ -4921,254 +5197,317 @@ msgstr "" #: ../scope/data/scope.glade.h:64 -msgid "_Evaluate/Modify" +msgid "_Raw" msgstr "" #: ../scope/data/scope.glade.h:65 -msgid "_Watch Expression" +msgid "_Evaluate/Modify" msgstr "" #: ../scope/data/scope.glade.h:66 -msgid "_Inspect Variable" +msgid "_Watch Expression" msgstr "" #: ../scope/data/scope.glade.h:67 -msgid "Program Terminal" +msgid "_Inspect Variable" msgstr "" #: ../scope/data/scope.glade.h:68 msgid "Threads" msgstr "" -#: ../scope/data/scope.glade.h:70 +#: ../scope/data/scope.glade.h:69 msgid "Stack" msgstr "" -#: ../scope/data/scope.glade.h:71 +#: ../scope/data/scope.glade.h:70 msgid "Locals" msgstr "" -#: ../scope/data/scope.glade.h:72 +#: ../scope/data/scope.glade.h:71 msgid "Watches" msgstr "" -#: ../scope/data/scope.glade.h:73 +#: ../scope/data/scope.glade.h:72 msgid "Memory" msgstr "" -#: ../scope/data/scope.glade.h:74 -msgid "Debug Console" -msgstr "" - -#: ../scope/data/scope.glade.h:75 +#: ../scope/data/scope.glade.h:73 msgid "Enter gdb command:" msgstr "" -#: ../scope/data/scope.glade.h:76 +#: ../scope/data/scope.glade.h:74 #, fuzzy msgid "Convert _UTF-8 to locale" msgstr "Flyt det valgte til højre/venstre" -#: ../scope/data/scope.glade.h:77 +#: ../scope/data/scope.glade.h:75 msgid "_Thread" msgstr "" -#: ../scope/data/scope.glade.h:78 +#: ../scope/data/scope.glade.h:76 msgid "_Group" msgstr "" -#: ../scope/data/scope.glade.h:79 +#: ../scope/data/scope.glade.h:77 msgid "_Frame" msgstr "" -#: ../scope/data/scope.glade.h:80 +#: ../scope/data/scope.glade.h:78 msgid "Setup Program" msgstr "" -#: ../scope/data/scope.glade.h:81 +#: ../scope/data/scope.glade.h:79 msgid "_Executable:" msgstr "" -#: ../scope/data/scope.glade.h:82 +#: ../scope/data/scope.glade.h:80 msgid "_Arguments:" msgstr "" -#: ../scope/data/scope.glade.h:83 +#: ../scope/data/scope.glade.h:81 msgid "En_vironment:" msgstr "" -#: ../scope/data/scope.glade.h:84 +#: ../scope/data/scope.glade.h:82 msgid "_Working dir:" msgstr "" -#: ../scope/data/scope.glade.h:85 +#: ../scope/data/scope.glade.h:83 msgid "_Load script:" msgstr "" -#: ../scope/data/scope.glade.h:86 +#: ../scope/data/scope.glade.h:84 msgid "Auto _run program/exit gdb" msgstr "" -#: ../scope/data/scope.glade.h:87 +#: ../scope/data/scope.glade.h:85 msgid "_Non-stop mode" msgstr "" -#: ../scope/data/scope.glade.h:88 -msgid "_Temporary breakpoint at:" +#: ../scope/data/scope.glade.h:86 +msgid "_Temporary breakpoint on load at:" msgstr "" -#: ../scope/data/scope.glade.h:89 -msgid "_Delete all breakpoints, watches and inspects" +#: ../scope/data/scope.glade.h:87 +msgid "_Delete all breakpoints, watches, inspects and registers" msgstr "" -#: ../scope/data/scope.glade.h:90 ../scope/src/prefs.c:337 +#: ../scope/data/scope.glade.h:88 ../scope/src/scope.c:522 msgid "Program" msgstr "" -#: ../scope/data/scope.glade.h:91 +#: ../scope/data/scope.glade.h:89 msgid "Open on" msgstr "" -#: ../scope/data/scope.glade.h:92 +#: ../scope/data/scope.glade.h:90 msgid "g_db load" msgstr "" -#: ../scope/data/scope.glade.h:93 +#: ../scope/data/scope.glade.h:91 msgid "p_rogram start" msgstr "" -#: ../scope/data/scope.glade.h:94 +#: ../scope/data/scope.glade.h:92 msgid "Update all _views" msgstr "" -#: ../scope/data/scope.glade.h:95 +#: ../scope/data/scope.glade.h:93 msgid "Panel" msgstr "" -#: ../scope/data/scope.glade.h:96 +#: ../scope/data/scope.glade.h:94 msgid "Default 8-bit text mode:" msgstr "" -#: ../scope/data/scope.glade.h:97 +#: ../scope/data/scope.glade.h:95 msgid "_7-bit \\nnn" msgstr "" -#: ../scope/data/scope.glade.h:98 +#: ../scope/data/scope.glade.h:96 msgid "Display" msgstr "" -#: ../scope/data/scope.glade.h:99 +#: ../scope/data/scope.glade.h:97 msgid "_member" msgstr "" -#: ../scope/data/scope.glade.h:100 +#: ../scope/data/scope.glade.h:98 msgid "and" msgstr "" -#: ../scope/data/scope.glade.h:101 +#: ../scope/data/scope.glade.h:99 msgid "_argument" msgstr "" -#: ../scope/data/scope.glade.h:102 +#: ../scope/data/scope.glade.h:100 msgid "names" msgstr "" -#: ../scope/data/scope.glade.h:103 +#: ../scope/data/scope.glade.h:101 msgid "Values" msgstr "" -#: ../scope/data/scope.glade.h:104 +#: ../scope/data/scope.glade.h:102 msgid "E_xpand on apply" msgstr "" -#: ../scope/data/scope.glade.h:105 +#: ../scope/data/scope.glade.h:103 msgid "S_how" msgstr "" -#: ../scope/data/scope.glade.h:106 +#: ../scope/data/scope.glade.h:104 msgid "children" msgstr "" -#: ../scope/data/scope.glade.h:107 +#: ../scope/data/scope.glade.h:105 msgid "Inspect" msgstr "" -#: ../scope/data/scope.glade.h:108 +#: ../scope/data/scope.glade.h:106 msgid "Show =li_brary messages" msgstr "" -#: ../scope/data/scope.glade.h:109 +#: ../scope/data/scope.glade.h:107 msgid "Show _tooltips" msgstr "" -#: ../scope/data/scope.glade.h:110 +#: ../scope/data/scope.glade.h:108 msgid "Others" msgstr "" -#: ../scope/data/scope.glade.h:111 +#: ../scope/data/scope.glade.h:109 msgid "Options" msgstr "" -#: ../scope/data/scope.glade.h:112 +#: ../scope/data/scope.glade.h:110 msgid "_Import" msgstr "" -#: ../scope/data/scope.glade.h:113 +#: ../scope/data/scope.glade.h:111 msgid "Enter assignment expression:" msgstr "" -#: ../scope/data/scope.glade.h:114 +#: ../scope/data/scope.glade.h:112 msgid "Inspect" msgstr "" -#: ../scope/data/scope.glade.h:115 +#: ../scope/data/scope.glade.h:113 msgid "Object:" msgstr "" -#: ../scope/data/scope.glade.h:117 +#: ../scope/data/scope.glade.h:115 msgid "-" msgstr "" -#: ../scope/data/scope.glade.h:118 +#: ../scope/data/scope.glade.h:116 msgid "Frame:" msgstr "" -#: ../scope/data/scope.glade.h:119 +#: ../scope/data/scope.glade.h:117 msgid "@" msgstr "" -#: ../scope/data/scope.glade.h:120 +#: ../scope/data/scope.glade.h:118 msgid "_Apply on run" msgstr "" -#: ../scope/data/scope.glade.h:121 +#: ../scope/data/scope.glade.h:119 msgid "Expand" msgstr "" -#: ../scope/data/scope.glade.h:122 +#: ../scope/data/scope.glade.h:120 msgid "Start:" msgstr "" -#: ../scope/data/scope.glade.h:123 +#: ../scope/data/scope.glade.h:121 msgid "Count:" msgstr "" -#: ../scope/data/scope.glade.h:124 +#: ../scope/data/scope.glade.h:122 msgid "_Expand on apply" msgstr "" -#: ../scope/src/break.c:947 +#: ../scope/data/scope.glade.h:123 ../scope/src/scope.c:522 +msgid "Program Terminal" +msgstr "" + +#: ../scope/data/scope.glade.h:125 +msgid "Registers" +msgstr "" + +#: ../scope/src/break.c:97 +msgid "breakpoint" +msgstr "" + +#: ../scope/src/break.c:98 +msgid "hardware breakpoint" +msgstr "" + +#: ../scope/src/break.c:99 +msgid "tracepoint" +msgstr "" + +#: ../scope/src/break.c:100 +msgid "fast tracepoint" +msgstr "" + +#: ../scope/src/break.c:101 +msgid "write watchpoint" +msgstr "" + +#: ../scope/src/break.c:104 +msgid "access watchpoint" +msgstr "" + +#: ../scope/src/break.c:106 +msgid "read watchpoint" +msgstr "" + +#: ../scope/src/break.c:108 +msgid "catchpoint" +msgstr "" + +#: ../scope/src/break.c:135 ../scope/src/break.c:139 +msgid "CLI" +msgstr "" + +#: ../scope/src/break.c:136 +msgid "unsupported MI" +msgstr "" + +#: ../scope/src/break.c:141 +msgid "on load" +msgstr "" + +#: ../scope/src/break.c:142 +msgid "Run to Cursor" +msgstr "" + +#: ../scope/src/break.c:1013 #, c-format msgid "" "There are two or more breakpoints at %s:%d.\n" +"\n" "Use the breakpoint list to remove the exact one." msgstr "" -#: ../scope/src/break.c:1200 +#: ../scope/src/break.c:1252 +#, c-format +msgid ", %s" +msgstr "" + +#: ../scope/src/break.c:1278 +#, c-format +msgid "func %s" +msgstr "" + +#: ../scope/src/break.c:1309 msgid "Add Breakpoint" msgstr "" -#: ../scope/src/break.c:1215 +#: ../scope/src/break.c:1324 msgid "Add Watchpoint" msgstr "" @@ -5180,7 +5519,8 @@ msgid "Enter char # (0..255):" msgstr "" -#: ../scope/src/conterm.c:466 ../scope/src/scope.c:502 +#: ../scope/src/conterm.c:509 ../scope/src/scope.c:550 +#: ../scope/src/scope.c:551 #, c-format msgid "Scope: %s." msgstr "" @@ -5199,60 +5539,61 @@ msgid "Program terminated." msgstr "" -#: ../scope/src/debug.c:468 +#: ../scope/src/debug.c:469 msgid "No breakpoints. Hanging." msgstr "" -#: ../scope/src/debug.c:596 ../scope/src/thread.c:97 +#: ../scope/src/debug.c:598 ../scope/src/thread.c:92 #, c-format msgid "%s." msgstr "" -#: ../scope/src/inspect.c:77 +#: ../scope/src/inspect.c:66 msgid "..." msgstr "" -#: ../scope/src/inspect.c:324 +#: ../scope/src/inspect.c:339 msgid "invalid data" msgstr "" -#: ../scope/src/inspect.c:356 +#: ../scope/src/inspect.c:371 msgid "no children in range" msgstr "" -#: ../scope/src/inspect.c:440 +#: ../scope/src/inspect.c:454 msgid "out of scope" msgstr "" -#: ../scope/src/inspect.c:587 +#: ../scope/src/inspect.c:627 msgid "Duplicate inspect variable name." msgstr "" -#: ../scope/src/memory.c:299 +#: ../scope/src/memory.c:292 msgid "Read Memory" msgstr "" -#: ../scope/src/memory.c:408 -msgid "Scope: pointer size > 8, Data disabled." +#: ../scope/src/memory.c:396 +#, c-format +msgid "Scope: pointer size > %d, Data disabled." msgstr "" -#: ../scope/src/menu.c:380 +#: ../scope/src/menu.c:375 msgid "Modify" msgstr "" -#: ../scope/src/menu.c:490 +#: ../scope/src/menu.c:481 msgid "Evaluate/modify" msgstr "" -#: ../scope/src/menu.c:491 +#: ../scope/src/menu.c:482 msgid "Watch expression" msgstr "" -#: ../scope/src/menu.c:492 +#: ../scope/src/menu.c:483 msgid "Inspect variable" msgstr "" -#: ../scope/src/parse.c:416 +#: ../scope/src/parse.c:437 msgid "Undefined GDB error." msgstr "" @@ -5264,34 +5605,26 @@ msgid "Select File" msgstr "" -#: ../scope/src/prefs.c:338 -msgid "Breaks" -msgstr "" - -#: ../scope/src/prefs.c:339 -msgid "Console" -msgstr "" - -#: ../scope/src/prefs.c:347 ../scope/src/utils.c:570 +#: ../scope/src/prefs.c:294 ../scope/src/utils.c:438 #, c-format msgid "Scope: %s: %s." msgstr "" -#: ../scope/src/prefs.c:352 +#: ../scope/src/prefs.c:299 msgid "Scope: created configuration file." msgstr "" -#: ../scope/src/program.c:231 +#: ../scope/src/program.c:251 #, c-format msgid "Loaded debug settings for %s." msgstr "" -#: ../scope/src/program.c:239 +#: ../scope/src/program.c:259 #, c-format msgid "Could not load debug settings file %s: %s." msgstr "" -#: ../scope/src/program.c:359 +#: ../scope/src/program.c:379 #, c-format msgid "" "%s: %s.\n" @@ -5299,15 +5632,15 @@ "Continue?" msgstr "" -#: ../scope/src/program.c:394 -msgid "Delete all breakpoints, watches and inspects?" +#: ../scope/src/program.c:415 +msgid "Delete all breakpoints, watches et cetera?" msgstr "" -#: ../scope/src/program.c:501 +#: ../scope/src/program.c:523 msgid "as _Name=value" msgstr "" -#: ../scope/src/program.c:502 +#: ../scope/src/program.c:524 msgid "as _Name = value" msgstr "" @@ -5316,157 +5649,169 @@ msgstr "" #: ../scope/src/scope.c:35 -msgid "Simple GDB front-end." +msgid "Relatively simple GDB front-end." msgstr "" -#: ../scope/src/scope.c:63 +#: ../scope/src/scope.c:62 msgid "Setup program" msgstr "" -#: ../scope/src/scope.c:64 +#: ../scope/src/scope.c:63 msgid "Run/continue" msgstr "" -#: ../scope/src/scope.c:66 +#: ../scope/src/scope.c:65 msgid "Run to source" msgstr "" -#: ../scope/src/scope.c:70 +#: ../scope/src/scope.c:69 msgid "Terminate" msgstr "" -#: ../scope/src/scope.c:71 +#: ../scope/src/scope.c:70 msgid "Toggle breakpoint" msgstr "" -#: ../scope/src/scope.c:73 ../scope/src/scope.c:76 +#: ../scope/src/scope.c:72 ../scope/src/scope.c:75 msgid "GDB command" msgstr "" -#: ../scope/src/scope.c:74 +#: ../scope/src/scope.c:73 msgid "Show terminal" msgstr "" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Busy" msgstr "" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Ready" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Hang" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Assem" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Load" msgstr "" -#: ../scope/src/scope.c:394 +#: ../scope/src/scope.c:421 msgid "Build action activated. Terminate debugging?" msgstr "" -#: ../scope/src/thread.c:58 +#: ../scope/src/scope.c:524 +msgid "Breaks" +msgstr "" + +#: ../scope/src/scope.c:526 +msgid "Console" +msgstr "" + +#: ../scope/src/scope.c:526 +msgid "Debug Console" +msgstr "" + +#: ../scope/src/thread.c:48 #, c-format msgid "Thread group %s started." msgstr "" -#: ../scope/src/thread.c:76 +#: ../scope/src/thread.c:63 msgid "Thread group " msgstr "" -#: ../scope/src/thread.c:88 +#: ../scope/src/thread.c:83 msgid " exited" msgstr "" -#: ../scope/src/thread.c:91 +#: ../scope/src/thread.c:86 #, c-format msgid " with exit code %s" msgstr "" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 msgid "Send Signal" msgstr "" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 msgid "Enter signal #:" msgstr "" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Terminate Process" msgstr "" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Enter exit code:" msgstr "" -#: ../scope/src/thread.c:937 +#: ../scope/src/thread.c:891 msgid "Running" msgstr "" -#: ../scope/src/thread.c:938 +#: ../scope/src/thread.c:892 msgid "Stopped" msgstr "" -#: ../scope/src/utils.c:44 +#: ../scope/src/utils.c:45 #, c-format -msgid "%s: error %lu." +msgid "%s: %s" msgstr "" -#: ../scope/src/utils.c:358 +#: ../scope/src/utils.c:225 #, c-format msgid "Scope: error reading [%s]." msgstr "" -#: ../scope/src/views.c:505 +#: ../scope/src/views.c:526 msgid "…" msgstr "" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Send" msgstr "" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Busy" msgstr "" -#: ../scope/src/views.c:535 +#: ../scope/src/views.c:558 msgid "GDB Command" msgstr "" -#: ../spellcheck/src/speller.c:94 +#: ../spellcheck/src/speller.c:180 msgid "Try: " msgstr "" -#: ../spellcheck/src/speller.c:173 +#: ../spellcheck/src/speller.c:252 msgid "Checking" msgstr "" -#: ../spellcheck/src/speller.c:186 +#: ../spellcheck/src/speller.c:265 #, c-format msgid "Checking file \"%s\" (lines %d to %d using %s):" msgstr "" -#: ../spellcheck/src/speller.c:196 +#: ../spellcheck/src/speller.c:275 #, c-format msgid "Checking file \"%s\" (using %s):" msgstr "" -#: ../spellcheck/src/speller.c:223 +#: ../spellcheck/src/speller.c:302 msgid "The checked text is spelled correctly." msgstr "" -#: ../spellcheck/src/speller.c:233 +#: ../spellcheck/src/speller.c:312 #, c-format msgid "The Enchant library couldn't be initialized (%s)." msgstr "" -#: ../spellcheck/src/speller.c:234 +#: ../spellcheck/src/speller.c:313 msgid "unknown error (maybe the chosen language is not available)" msgstr "" @@ -5556,17 +5901,17 @@ msgid "Ignore All" msgstr "" -#: ../spellcheck/src/gui.c:521 +#: ../spellcheck/src/gui.c:526 #, c-format msgid "Default (%s)" msgstr "" -#: ../spellcheck/src/gui.c:532 +#: ../spellcheck/src/gui.c:537 #, c-format msgid "Toggle spell check while typing (current language: %s)" msgstr "" -#: ../spellcheck/src/gui.c:587 +#: ../spellcheck/src/gui.c:592 msgid "Spelling Suggestions" msgstr "" @@ -5597,172 +5942,176 @@ #. OK. Something went not as expected. #. * We did have a selection but cannot parse it into rows. #. * Aborting -#: ../tableconvert/src/tableconvert.c:236 +#: ../tableconvert/src/tableconvert.c:237 msgid "Something went wrong on parsing selection. Aborting" msgstr "" -#: ../tableconvert/src/tableconvert.c:268 +#: ../tableconvert/src/tableconvert.c:269 #, fuzzy msgid "Convert selection to table" msgstr "Flyt det valgte til højre/venstre" #. Build up menu entry -#: ../tableconvert/src/tableconvert.c:281 +#: ../tableconvert/src/tableconvert.c:282 msgid "_Convert to table" msgstr "" -#: ../tableconvert/src/tableconvert.c:284 +#: ../tableconvert/src/tableconvert.c:285 msgid "Converts current marked list to a table." msgstr "" -#: ../treebrowser/src/treebrowser.c:120 +#: ../treebrowser/src/treebrowser.c:124 msgid "TreeBrowser" msgstr "" -#: ../treebrowser/src/treebrowser.c:121 +#: ../treebrowser/src/treebrowser.c:125 msgid "" "This plugin adds a tree browser to Geany, allowing the user to browse files " "using a tree view of the directory being browsed." msgstr "" -#: ../treebrowser/src/treebrowser.c:430 +#: ../treebrowser/src/treebrowser.c:434 #, c-format msgid "%s: no such directory." msgstr "" -#: ../treebrowser/src/treebrowser.c:526 ../treebrowser/src/treebrowser.c:561 -#: ../treebrowser/src/treebrowser.c:663 +#: ../treebrowser/src/treebrowser.c:537 ../treebrowser/src/treebrowser.c:572 +#: ../treebrowser/src/treebrowser.c:670 msgid "(Empty)" msgstr "" -#: ../treebrowser/src/treebrowser.c:966 +#: ../treebrowser/src/treebrowser.c:971 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "" -#: ../treebrowser/src/treebrowser.c:1037 +#: ../treebrowser/src/treebrowser.c:1042 msgid "NewDirectory" msgstr "" -#: ../treebrowser/src/treebrowser.c:1039 +#: ../treebrowser/src/treebrowser.c:1044 msgid "NewFile" msgstr "" -#: ../treebrowser/src/treebrowser.c:1044 +#: ../treebrowser/src/treebrowser.c:1049 #, c-format msgid "" "Target file '%s' exists\n" ", do you really want to replace it with empty file?" msgstr "" -#: ../treebrowser/src/treebrowser.c:1089 +#: ../treebrowser/src/treebrowser.c:1095 #, c-format msgid "Do you really want to delete '%s' ?" msgstr "" -#: ../treebrowser/src/treebrowser.c:1208 ../treebrowser/src/treebrowser.c:1692 +#: ../treebrowser/src/treebrowser.c:1207 ../treebrowser/src/treebrowser.c:1738 msgid "Go up" msgstr "" -#: ../treebrowser/src/treebrowser.c:1212 ../treebrowser/src/treebrowser.c:1707 +#: ../treebrowser/src/treebrowser.c:1211 ../treebrowser/src/treebrowser.c:1753 msgid "Set path from document" msgstr "" -#: ../treebrowser/src/treebrowser.c:1216 -msgid "Open externally" +#: ../treebrowser/src/treebrowser.c:1215 +msgid "_Open externally" msgstr "" -#: ../treebrowser/src/treebrowser.c:1221 +#: ../treebrowser/src/treebrowser.c:1220 msgid "Open Terminal" msgstr "" -#: ../treebrowser/src/treebrowser.c:1225 +#: ../treebrowser/src/treebrowser.c:1224 msgid "Set as root" msgstr "" -#: ../treebrowser/src/treebrowser.c:1230 ../treebrowser/src/treebrowser.c:1697 -#: ../treebrowser/src/treebrowser.c:2060 +#: ../treebrowser/src/treebrowser.c:1229 ../treebrowser/src/treebrowser.c:1743 +#: ../treebrowser/src/treebrowser.c:2123 msgid "Refresh" msgstr "" -#: ../treebrowser/src/treebrowser.c:1242 +#: ../treebrowser/src/treebrowser.c:1233 +msgid "_Find in Files" +msgstr "" + +#: ../treebrowser/src/treebrowser.c:1241 msgid "Create new directory" msgstr "" -#: ../treebrowser/src/treebrowser.c:1246 +#: ../treebrowser/src/treebrowser.c:1245 msgid "Create new file" msgstr "" -#: ../treebrowser/src/treebrowser.c:1250 +#: ../treebrowser/src/treebrowser.c:1249 msgid "Rename" msgstr "" -#: ../treebrowser/src/treebrowser.c:1255 +#: ../treebrowser/src/treebrowser.c:1254 msgid "Delete" msgstr "" -#: ../treebrowser/src/treebrowser.c:1263 +#: ../treebrowser/src/treebrowser.c:1262 #, c-format msgid "Close: %s" msgstr "" -#: ../treebrowser/src/treebrowser.c:1268 +#: ../treebrowser/src/treebrowser.c:1267 #, c-format msgid "Close Child Documents " msgstr "" -#: ../treebrowser/src/treebrowser.c:1273 -msgid "Copy full path to clipboard" +#: ../treebrowser/src/treebrowser.c:1272 +msgid "_Copy full path to clipboard" msgstr "" -#: ../treebrowser/src/treebrowser.c:1293 ../treebrowser/src/treebrowser.c:1974 +#: ../treebrowser/src/treebrowser.c:1292 ../treebrowser/src/treebrowser.c:2032 msgid "Show bookmarks" msgstr "" -#: ../treebrowser/src/treebrowser.c:1298 ../treebrowser/src/treebrowser.c:1928 +#: ../treebrowser/src/treebrowser.c:1297 ../treebrowser/src/treebrowser.c:1981 msgid "Show hidden files" msgstr "" -#: ../treebrowser/src/treebrowser.c:1303 +#: ../treebrowser/src/treebrowser.c:1302 msgid "Show toolbars" msgstr "" -#: ../treebrowser/src/treebrowser.c:1574 +#: ../treebrowser/src/treebrowser.c:1621 #, c-format msgid "Target file '%s' exists, do you really want to replace it?" msgstr "" -#: ../treebrowser/src/treebrowser.c:1702 +#: ../treebrowser/src/treebrowser.c:1748 msgid "Home" msgstr "" -#: ../treebrowser/src/treebrowser.c:1712 +#: ../treebrowser/src/treebrowser.c:1758 msgid "Track path" msgstr "" -#: ../treebrowser/src/treebrowser.c:1717 +#: ../treebrowser/src/treebrowser.c:1763 msgid "Hide bars" msgstr "" -#: ../treebrowser/src/treebrowser.c:1727 +#: ../treebrowser/src/treebrowser.c:1773 msgid "" "Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' " "reverse try for example this '!;*.c;*.h;*.cpp'" msgstr "" -#: ../treebrowser/src/treebrowser.c:1735 +#: ../treebrowser/src/treebrowser.c:1781 msgid "Addressbar for example '/projects/my-project'" msgstr "" -#: ../treebrowser/src/treebrowser.c:1760 +#: ../treebrowser/src/treebrowser.c:1806 msgid "Tree Browser" msgstr "" -#: ../treebrowser/src/treebrowser.c:1892 +#: ../treebrowser/src/treebrowser.c:1945 msgid "External open command" msgstr "" -#: ../treebrowser/src/treebrowser.c:1897 +#: ../treebrowser/src/treebrowser.c:1950 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -5772,97 +6121,105 @@ "filename" msgstr "" -#: ../treebrowser/src/treebrowser.c:1905 +#: ../treebrowser/src/treebrowser.c:1958 msgid "Toolbar" msgstr "" -#: ../treebrowser/src/treebrowser.c:1907 +#: ../treebrowser/src/treebrowser.c:1960 msgid "Hidden" msgstr "" -#: ../treebrowser/src/treebrowser.c:1908 +#: ../treebrowser/src/treebrowser.c:1961 msgid "Top" msgstr "" -#: ../treebrowser/src/treebrowser.c:1909 +#: ../treebrowser/src/treebrowser.c:1962 msgid "Bottom" msgstr "" -#: ../treebrowser/src/treebrowser.c:1914 +#: ../treebrowser/src/treebrowser.c:1967 msgid "If position is changed, the option require plugin restart." msgstr "" -#: ../treebrowser/src/treebrowser.c:1918 +#: ../treebrowser/src/treebrowser.c:1971 msgid "Show icons" msgstr "" -#: ../treebrowser/src/treebrowser.c:1920 +#: ../treebrowser/src/treebrowser.c:1973 msgid "None" msgstr "" -#: ../treebrowser/src/treebrowser.c:1921 +#: ../treebrowser/src/treebrowser.c:1974 msgid "Base" msgstr "" -#: ../treebrowser/src/treebrowser.c:1922 +#: ../treebrowser/src/treebrowser.c:1975 msgid "Content-type" msgstr "" -#: ../treebrowser/src/treebrowser.c:1933 +#: ../treebrowser/src/treebrowser.c:1986 msgid "On Windows, this just hide files that are prefixed with '.' (dot)" msgstr "" -#: ../treebrowser/src/treebrowser.c:1935 +#: ../treebrowser/src/treebrowser.c:1988 msgid "Hide object files" msgstr "" -#: ../treebrowser/src/treebrowser.c:1940 +#: ../treebrowser/src/treebrowser.c:1993 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" msgstr "" -#: ../treebrowser/src/treebrowser.c:1942 +#: ../treebrowser/src/treebrowser.c:1995 msgid "Reverse filter" msgstr "" -#: ../treebrowser/src/treebrowser.c:1947 +#: ../treebrowser/src/treebrowser.c:2000 msgid "Follow current document" msgstr "" -#: ../treebrowser/src/treebrowser.c:1952 +#: ../treebrowser/src/treebrowser.c:2005 msgid "Single click, open document and focus it" msgstr "" -#: ../treebrowser/src/treebrowser.c:1957 +#: ../treebrowser/src/treebrowser.c:2010 msgid "Double click open directory" msgstr "" -#: ../treebrowser/src/treebrowser.c:1962 +#: ../treebrowser/src/treebrowser.c:2015 msgid "On delete file, close it if is opened" msgstr "" -#: ../treebrowser/src/treebrowser.c:1967 +#: ../treebrowser/src/treebrowser.c:2020 +msgid "Focus editor on file open" +msgstr "" + +#: ../treebrowser/src/treebrowser.c:2025 msgid "Show tree lines" msgstr "" -#: ../treebrowser/src/treebrowser.c:2050 +#: ../treebrowser/src/treebrowser.c:2037 +msgid "Open new files" +msgstr "" + +#: ../treebrowser/src/treebrowser.c:2113 msgid "Focus File List" msgstr "" -#: ../treebrowser/src/treebrowser.c:2052 +#: ../treebrowser/src/treebrowser.c:2115 msgid "Focus Path Entry" msgstr "" -#: ../treebrowser/src/treebrowser.c:2054 +#: ../treebrowser/src/treebrowser.c:2117 msgid "Rename Object" msgstr "" -#: ../treebrowser/src/treebrowser.c:2056 +#: ../treebrowser/src/treebrowser.c:2119 msgid "Create New File" msgstr "" -#: ../treebrowser/src/treebrowser.c:2058 +#: ../treebrowser/src/treebrowser.c:2121 msgid "Create New Directory" msgstr "" @@ -5927,44 +6284,44 @@ msgid "utility" msgstr "" -#: ../webhelper/src/gwh-settings.c:775 +#: ../webhelper/src/gwh-settings.c:782 #, c-format msgid "%s:" msgstr "" -#: ../webhelper/src/gwh-browser.c:528 +#: ../webhelper/src/gwh-browser.c:534 msgid "_Zoom" msgstr "" -#: ../webhelper/src/gwh-browser.c:550 +#: ../webhelper/src/gwh-browser.c:556 msgid "Full-_content zoom" msgstr "" -#: ../webhelper/src/gwh-browser.c:561 +#: ../webhelper/src/gwh-browser.c:567 msgid "Flip panes orientation" msgstr "" -#: ../webhelper/src/gwh-browser.c:808 +#: ../webhelper/src/gwh-browser.c:814 msgid "Back" msgstr "" -#: ../webhelper/src/gwh-browser.c:812 +#: ../webhelper/src/gwh-browser.c:818 msgid "Forward" msgstr "" -#: ../webhelper/src/gwh-browser.c:816 +#: ../webhelper/src/gwh-browser.c:822 msgid "Cancel loading" msgstr "" -#: ../webhelper/src/gwh-browser.c:820 +#: ../webhelper/src/gwh-browser.c:826 msgid "Reload current page" msgstr "" -#: ../webhelper/src/gwh-browser.c:833 ../webhelper/src/gwh-browser.c:879 +#: ../webhelper/src/gwh-browser.c:839 ../webhelper/src/gwh-browser.c:885 msgid "Web inspector" msgstr "" -#: ../webhelper/src/gwh-browser.c:834 +#: ../webhelper/src/gwh-browser.c:840 msgid "Toggle web inspector" msgstr "" diff -Nru geany-plugins-1.23+dfsg/po/de.po geany-plugins-1.24+dfsg/po/de.po --- geany-plugins-1.23+dfsg/po/de.po 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/po/de.po 2014-04-12 14:28:39.000000000 +0000 @@ -1,18 +1,18 @@ # German translation for geany-plugins -# Copyright (C) 2009-2011 THE PACKAGE'S COPYRIGHT HOLDER +# Copyright (C) 2009-2014 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany-plugins package. # Andrew Janke , 2009 -# Frank Lanitz , 2009-2013 +# Frank Lanitz , 2009-2014 # Dominic Hopf , 2009 # Michael Spahn , 2009 # Fabian Nowak , 2012 # msgid "" msgstr "" -"Project-Id-Version: Geany-plugins 1.23\n" +"Project-Id-Version: Geany-plugins 1.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-09 13:37+0100\n" -"PO-Revision-Date: 2013-03-09 13:48+0100\n" +"POT-Creation-Date: 2014-04-06 18:49+0200\n" +"PO-Revision-Date: 2013-10-28 12:05+0100\n" "Last-Translator: Frank Lanitz \n" "Language-Team: German \n" "Language: de\n" @@ -35,20 +35,17 @@ msgid "No." msgstr "Nein." -#: ../addons/src/ao_bookmarklist.c:341 -#: ../devhelp/src/dhp-object.c:494 +#: ../addons/src/ao_bookmarklist.c:341 ../devhelp/src/dhp-object.c:494 #: ../devhelp/devhelp/dh-window.c:1142 msgid "Contents" msgstr "Inhalte" -#: ../addons/src/ao_bookmarklist.c:374 -#: ../treebrowser/src/treebrowser.c:624 +#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:625 msgid "Bookmarks" msgstr "Lesezeichen" #. complete update -#: ../addons/src/ao_tasks.c:373 -#: ../geanyvc/src/geanyvc.c:2295 +#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2351 msgid "_Update" msgstr "_Aktualisieren" @@ -56,13 +53,11 @@ msgid "_Hide Message Window" msgstr "Meldungsfenster _verstecken" -#: ../addons/src/ao_tasks.c:412 -#: ../debugger/src/stree.c:387 +#: ../addons/src/ao_tasks.c:412 ../debugger/src/stree.c:387 msgid "File" msgstr "Datei" -#: ../addons/src/ao_tasks.c:423 -#: ../debugger/src/bptree.c:702 +#: ../addons/src/ao_tasks.c:423 ../debugger/src/bptree.c:702 #: ../debugger/src/stree.c:394 msgid "Line" msgstr "Zeile" @@ -70,10 +65,8 @@ #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../addons/src/ao_tasks.c:434 -#: ../debugger/src/vtree.c:204 -#: ../devhelp/devhelp/dh-link.c:287 -#: ../geanylatex/src/bibtexlabels.c:68 +#: ../addons/src/ao_tasks.c:434 ../debugger/src/vtree.c:204 +#: ../devhelp/devhelp/dh-link.c:287 ../geanylatex/src/bibtexlabels.c:68 msgid "Type" msgstr "Typ" @@ -90,18 +83,21 @@ msgid "Context:" msgstr "Kontext:" -#: ../addons/src/ao_xmltagging.c:56 +#: ../addons/src/ao_xmltagging.c:54 msgid "XML tagging" msgstr "XML-Tagging" -#: ../addons/src/ao_xmltagging.c:67 +#: ../addons/src/ao_xmltagging.c:65 msgid "Tag name to be inserted:" msgstr "Tag zum Einfügen:" -#: ../addons/src/ao_xmltagging.c:71 +#: ../addons/src/ao_xmltagging.c:69 #, c-format -msgid "%s will be replaced with your current selection. Please keep care on your selection" -msgstr "%s wird mit der jeweils aktuellen Auswahl ersetzt. Beachten Sie Ihre Auswahl!" +msgid "" +"%s will be replaced with your current selection. Please keep care on your " +"selection" +msgstr "" +"%s wird mit der jeweils aktuellen Auswahl ersetzt. Beachten Sie Ihre Auswahl!" #: ../addons/src/ao_openuri.c:165 msgid "Open URI" @@ -164,22 +160,22 @@ msgid "Run XML tagging" msgstr "XML-Tagging ausführen" -#: ../addons/src/addons.c:417 -#: ../geanylatex/src/geanylatex.c:241 -#: ../geanyprj/src/geanyprj.c:174 -#: ../geanysendmail/src/geanysendmail.c:121 -#: ../geanysendmail/src/geanysendmail.c:287 -#: ../geanyvc/src/geanyvc.c:1798 -#: ../geniuspaste/src/geniuspaste.c:140 -#: ../spellcheck/src/scplugin.c:146 -#: ../treebrowser/src/treebrowser.c:1883 +#: ../addons/src/addons.c:417 ../autoclose/src/autoclose.c:871 +#: ../geanylatex/src/geanylatex.c:241 ../geanyprj/src/geanyprj.c:174 +#: ../geanysendmail/src/geanysendmail.c:123 +#: ../geanysendmail/src/geanysendmail.c:291 ../geanyvc/src/geanyvc.c:1854 +#: ../geniuspaste/src/geniuspaste.c:140 ../spellcheck/src/scplugin.c:146 +#: ../treebrowser/src/treebrowser.c:1935 #: ../updatechecker/src/updatechecker.c:253 msgid "Plugin configuration directory could not be created." -msgstr "Das Konfigurationsverzeichnis für das Plugin konnte nicht erstellt werden." +msgstr "" +"Das Konfigurationsverzeichnis für das Plugin konnte nicht erstellt werden." #: ../addons/src/addons.c:445 msgid "Show toolbar item to show a list of currently open documents" -msgstr "Symbol in der Werkzeugleiste für eine Liste mit den aktuell geöffneten Dokumenten" +msgstr "" +"Symbol in der Werkzeugleiste für eine Liste mit den aktuell geöffneten " +"Dokumenten" #: ../addons/src/addons.c:449 msgid "Sort documents by _name" @@ -203,7 +199,9 @@ #: ../addons/src/addons.c:461 msgid "Sort the documents in the order of the document tabs (reversed)" -msgstr "Sortiert die Dokumente nach Reihenfolge der geöffneten Reiter (umgekehrte Reihenfolge)." +msgstr "" +"Sortiert die Dokumente nach Reihenfolge der geöffneten Reiter (umgekehrte " +"Reihenfolge)." #: ../addons/src/addons.c:488 msgid "Show an 'Open URI' item in the editor menu" @@ -218,8 +216,12 @@ msgstr "Sämtliche Aufgaben aller (geöffneten) Dokumente anzeigen" #: ../addons/src/addons.c:504 -msgid "Whether to show the tasks of all open documents in the list or only those of the current document." -msgstr "Bestimmt, ob die Aufgaben aller aktuell geöffneten Dokumente angezeigt werden sollen oder nur die des derzeit aktiven Dokumentes." +msgid "" +"Whether to show the tasks of all open documents in the list or only those of " +"the current document." +msgstr "" +"Bestimmt, ob die Aufgaben aller aktuell geöffneten Dokumente angezeigt " +"werden sollen oder nur die des derzeit aktiven Dokumentes." #: ../addons/src/addons.c:511 msgid "Specify a semicolon separated list of search tokens." @@ -255,7 +257,18 @@ #: ../addons/src/addons.c:572 msgid "Enclose selection automatically (without having to press a keybinding)" -msgstr "Auswahl automatisch miteinbeziehen (ohne eine Tastenkombination drücken zu müssen)" +msgstr "" +"Auswahl automatisch miteinbeziehen (ohne eine Tastenkombination drücken zu " +"müssen)" + +#: ../autoclose/src/autoclose.c:50 +msgid "Auto-close" +msgstr "Automatisch Schließen" + +#: ../autoclose/src/autoclose.c:51 +msgid "Auto-close braces and brackets with lot of features" +msgstr "" +"Automatisches Schließen von Klammern bei einer Großzahl von Funktionen." #: ../codenav/src/codenavigation.c:52 msgid "Code navigation" @@ -268,14 +281,14 @@ "- switching between a .cpp file and the corresponding .h file\n" "- [opening a file by typing its name -> TODO]" msgstr "" -"Dieses Plugin hilft dabei, zwischen verschiedenen Quelltext-Dateien zu navigieren.\n" +"Dieses Plugin hilft dabei, zwischen verschiedenen Quelltext-Dateien zu " +"navigieren.\n" "Im Moment unterstützt es:\n" "- Umschalten zwischen einer .cpp-Datei und der dazu passenden .H-Datei\n" "- [Eine Datei über Ihren Namen öffnen -> TODO]" #. Add the menu item, sensitive only when a document is opened -#: ../codenav/src/goto_file.c:57 -#: ../codenav/src/goto_file.c:71 +#: ../codenav/src/goto_file.c:57 ../codenav/src/goto_file.c:71 msgid "Goto file" msgstr "Gehe zu Datei" @@ -287,8 +300,7 @@ # Diese Übersetzung existiert drei mal. #. Add the menu item and make it sensitive only when a document is opened #. Frame, which is the returned widget -#: ../codenav/src/switch_head_impl.c:85 -#: ../codenav/src/switch_head_impl.c:99 +#: ../codenav/src/switch_head_impl.c:85 ../codenav/src/switch_head_impl.c:99 #: ../codenav/src/switch_head_impl.c:461 msgid "Switch header/implementation" msgstr "Umschalten zwischen Deklaration und Implementierung" @@ -313,7 +325,9 @@ #: ../commander/src/commander-plugin.c:40 msgid "Provides a command panel for quick access to actions, files and more" -msgstr "Bietet eine Schnittstelle über eine Auswahlliste für den schnellen Zugriff auf Funktionen, Dateien und mehr." +msgstr "" +"Bietet eine Schnittstelle über eine Auswahlliste für den schnellen Zugriff " +"auf Funktionen, Dateien und mehr." #: ../commander/src/commander-plugin.c:686 msgid "Show Command Panel" @@ -327,20 +341,16 @@ msgid "Various debuggers integration." msgstr "Verschiedene Debugger-Integrationen" -#: ../debugger/src/plugin.c:131 -#: ../debugger/src/keys.c:76 -#: ../scope/data/scope.glade.h:125 -#: ../scope/src/scope.c:225 +#: ../debugger/src/plugin.c:133 ../debugger/src/keys.c:76 +#: ../scope/data/scope.glade.h:124 ../scope/src/scope.c:226 msgid "Debug" msgstr "Debug" -#: ../debugger/src/vtree.c:173 -#: ../debugger/src/envtree.c:417 +#: ../debugger/src/vtree.c:173 ../debugger/src/envtree.c:417 msgid "Name" msgstr "Name" -#: ../debugger/src/vtree.c:196 -#: ../debugger/src/envtree.c:422 +#: ../debugger/src/vtree.c:196 ../debugger/src/envtree.c:422 msgid "Value" msgstr "Wert" @@ -373,8 +383,7 @@ msgstr "Umgebungsvariablen" #. if name is empty - offer to delete variable -#: ../debugger/src/envtree.c:260 -#: ../debugger/src/envtree.c:364 +#: ../debugger/src/envtree.c:260 ../debugger/src/envtree.c:364 #: ../debugger/src/debug.c:254 msgid "Delete variable?" msgstr "Variable löschen?" @@ -410,12 +419,8 @@ msgstr "Konnte den gdb-Prozess nicht starten" #: ../debugger/src/dbm_gdb.c:782 -msgid "" -"~\"Loading target file.\\n" -"\"" -msgstr "" -"~\"Zieldatei laden.\\n" -"\"" +msgid "~\"Loading target file.\\n\"" +msgstr "~\"Zieldatei laden.\\n\"" #: ../debugger/src/dbm_gdb.c:782 msgid "Error loading file" @@ -424,8 +429,7 @@ #. setting asyncronous mode #. setting null-stop array printing #. enable pretty printing -#: ../debugger/src/dbm_gdb.c:786 -#: ../debugger/src/dbm_gdb.c:789 +#: ../debugger/src/dbm_gdb.c:786 ../debugger/src/dbm_gdb.c:789 #: ../debugger/src/dbm_gdb.c:792 msgid "Error configuring GDB" msgstr "Fehler bei der Konfiguration von GDB" @@ -452,16 +456,14 @@ msgid "Click an arrow to switch to a frame" msgstr "Auf einen Pfeil klicken, um zu einem Frame zu wechselb" -#: ../debugger/src/stree.c:363 -#: ../geanylatex/src/bibtexlabels.c:46 +#: ../debugger/src/stree.c:363 ../geanylatex/src/bibtexlabels.c:46 msgid "Address" msgstr "Adresse" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../debugger/src/stree.c:381 -#: ../devhelp/devhelp/dh-link.c:267 +#: ../debugger/src/stree.c:381 ../devhelp/devhelp/dh-link.c:267 msgid "Function" msgstr "Funktion" @@ -474,8 +476,7 @@ msgid "Target" msgstr "Ziel" -#: ../debugger/src/tabs.c:135 -#: ../scope/data/scope.glade.h:69 +#: ../debugger/src/tabs.c:135 ../scope/src/scope.c:524 msgid "Breakpoints" msgstr "Haltepunkte" @@ -503,41 +504,35 @@ msgid "Run / Continue" msgstr "Starten / Fortsetzen" -#: ../debugger/src/keys.c:50 -#: ../debugger/src/btnpanel.c:101 +#: ../debugger/src/keys.c:50 ../debugger/src/btnpanel.c:101 msgid "Stop" msgstr "Stop" -#: ../debugger/src/keys.c:51 -#: ../debugger/src/btnpanel.c:98 +#: ../debugger/src/keys.c:51 ../debugger/src/btnpanel.c:98 msgid "Restart" msgstr "Neustarten" # noch keine Idee --Dominic # Vielleicht besser :) --frlan -#: ../debugger/src/keys.c:52 -#: ../debugger/src/btnpanel.c:113 -#: ../scope/src/scope.c:67 +#: ../debugger/src/keys.c:52 ../debugger/src/btnpanel.c:113 +#: ../scope/src/scope.c:66 msgid "Step into" msgstr "Eintreten" -#: ../debugger/src/keys.c:53 -#: ../debugger/src/btnpanel.c:110 -#: ../scope/src/scope.c:68 +#: ../debugger/src/keys.c:53 ../debugger/src/btnpanel.c:110 +#: ../scope/src/scope.c:67 msgid "Step over" msgstr "Überspringen" # noch keine Idee --Dominic -#: ../debugger/src/keys.c:54 -#: ../debugger/src/btnpanel.c:122 -#: ../scope/src/scope.c:69 +#: ../debugger/src/keys.c:54 ../debugger/src/btnpanel.c:122 +#: ../scope/src/scope.c:68 msgid "Step out" msgstr "Aussteigen" # Noch keine Idee hierzu --Dominic -#: ../debugger/src/keys.c:55 -#: ../debugger/src/btnpanel.c:125 -#: ../scope/src/scope.c:65 +#: ../debugger/src/keys.c:55 ../debugger/src/btnpanel.c:125 +#: ../scope/src/scope.c:64 msgid "Run to cursor" msgstr "Bis zum Cursor ausführen" @@ -555,10 +550,10 @@ #: ../debugger/src/callbacks.c:249 msgid "To edit source files stop debugging session" -msgstr "Um die Quelldatei zu editieren, muss das Debugging unterbrochen werden." +msgstr "" +"Um die Quelldatei zu editieren, muss das Debugging unterbrochen werden." -#: ../debugger/src/btnpanel.c:90 -#: ../debugger/src/btnpanel.c:159 +#: ../debugger/src/btnpanel.c:90 ../debugger/src/btnpanel.c:159 msgid "Run" msgstr "Ausführen" @@ -578,6 +573,14 @@ msgid "Save debug session data to a project" msgstr "Debug-Session-Daten als Projekt speichern" +#: ../defineformat/src/defineformat.c:56 +msgid "Define formatter" +msgstr "#Define-Formatierer" + +#: ../defineformat/src/defineformat.c:57 +msgid "Automatically align backslash in multi-line defines" +msgstr "Platziert automatisch \\ in über mehrere Zeilen gehende Definitionen." + #. never search for more than this many chars #: ../devhelp/src/dhp.h:38 msgid "Documentation" @@ -593,10 +596,8 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../devhelp/src/dhp-object.c:390 -#: ../devhelp/src/dhp-object.c:503 -#: ../devhelp/devhelp/dh-window.c:727 -#: ../devhelp/devhelp/dh-window.c:1034 +#: ../devhelp/src/dhp-object.c:390 ../devhelp/src/dhp-object.c:503 +#: ../devhelp/devhelp/dh-window.c:727 ../devhelp/devhelp/dh-window.c:1034 #: ../devhelp/devhelp/dh-window.c:1863 msgid "Devhelp" msgstr "Devhelp" @@ -621,8 +622,7 @@ msgid "Zoom out" msgstr "Herauszoomen" -#: ../devhelp/src/dhp-object.c:497 -#: ../devhelp/devhelp/dh-window.c:1152 +#: ../devhelp/src/dhp-object.c:497 ../devhelp/devhelp/dh-window.c:1152 msgid "Search" msgstr "Suchen" @@ -636,8 +636,13 @@ msgstr "Devhelp Plugin" #: ../devhelp/src/dhp-plugin.c:43 -msgid "Adds support for looking up documentation in Devhelp, manual pages, and Google Code Search in the integrated viewer." -msgstr "Fügt Unterstützung zum Nachsehen der Dokumentation unter Zuhilfename von Devhelp, Manual-Seiten und Google-Code-Suche über eine integrierte Oberfläche hinzu." +msgid "" +"Adds support for looking up documentation in Devhelp, manual pages, and " +"Google Code Search in the integrated viewer." +msgstr "" +"Fügt Unterstützung zum Nachsehen der Dokumentation unter Zuhilfename von " +"Devhelp, Manual-Seiten und Google-Code-Suche über eine integrierte " +"Oberfläche hinzu." #: ../devhelp/src/dhp-plugin.c:119 #, c-format @@ -688,8 +693,7 @@ msgstr "Buch:" #. i18n: a documentation book -#: ../devhelp/devhelp/dh-link.c:255 -#: ../geanylatex/src/geanylatex.c:1760 +#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1760 msgid "Book" msgstr "Buch" @@ -725,10 +729,8 @@ msgid "Enum" msgstr "Aufzählung" -#: ../devhelp/devhelp/dh-parser.c:91 -#: ../devhelp/devhelp/dh-parser.c:185 -#: ../devhelp/devhelp/dh-parser.c:249 -#: ../devhelp/devhelp/dh-parser.c:259 +#: ../devhelp/devhelp/dh-parser.c:91 ../devhelp/devhelp/dh-parser.c:185 +#: ../devhelp/devhelp/dh-parser.c:249 ../devhelp/devhelp/dh-parser.c:259 #, c-format msgid "Expected '%s', got '%s' at line %d, column %d" msgstr "»%s« erwartet, »%s« erhalten in Zeile %d, Spalte %d" @@ -740,23 +742,34 @@ #: ../devhelp/devhelp/dh-parser.c:136 #, c-format -msgid "\"title\", \"name\" and \"link\" elements are required at line %d, column %d" -msgstr "Die Elemente »title«, »name« und »link« werden in Zeile %d, Spalte %d benötigt." +msgid "" +"\"title\", \"name\" and \"link\" elements are required at line %d, column %d" +msgstr "" +"Die Elemente »title«, »name« und »link« werden in Zeile %d, Spalte %d " +"benötigt." #: ../devhelp/devhelp/dh-parser.c:204 #, c-format -msgid "\"name\" and \"link\" elements are required inside on line %d, column %d" -msgstr "Die Elemente »name« und »link« werden innerhalb in Zeile %d, Spalte %d benötigt." +msgid "" +"\"name\" and \"link\" elements are required inside on line %d, column " +"%d" +msgstr "" +"Die Elemente »name« und »link« werden innerhalb in Zeile %d, Spalte " +"%d benötigt." #: ../devhelp/devhelp/dh-parser.c:284 #, c-format -msgid "\"name\" and \"link\" elements are required inside '%s' on line %d, column %d" -msgstr "Die Elemente »name« und »link« werden innerhalb »%s« in Zeile %d, Spalte %d benötigt." +msgid "" +"\"name\" and \"link\" elements are required inside '%s' on line %d, column %d" +msgstr "" +"Die Elemente »name« und »link« werden innerhalb »%s« in Zeile %d, Spalte %d " +"benötigt." #: ../devhelp/devhelp/dh-parser.c:297 #, c-format msgid "\"type\" element is required inside on line %d, column %d" -msgstr "Das Element »type« wird innerhalb in Zeile %d, Spalte %d benötigt." +msgstr "" +"Das Element »type« wird innerhalb in Zeile %d, Spalte %d benötigt." #: ../devhelp/devhelp/dh-parser.c:500 #, c-format @@ -820,14 +833,12 @@ msgid "A developers' help browser for GNOME" msgstr "Ein Hilfebrowser für Entwickler unter GNOME" -#: ../devhelp/devhelp/dh-window.c:759 -#: ../geanyvc/src/geanyvc.c:2010 +#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2066 msgid "_File" msgstr "_Datei" -#: ../devhelp/devhelp/dh-window.c:760 -#: ../geanymacro/src/geanymacro.c:1815 -#: ../geanymacro/src/geanymacro.c:2112 +#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1822 +#: ../geanymacro/src/geanymacro.c:2118 msgid "_Edit" msgstr "_Bearbeiten" @@ -856,13 +867,11 @@ msgid "_Print…" msgstr "_Drucken…" -#: ../devhelp/devhelp/dh-window.c:782 -#: ../devhelp/devhelp/eggfindbar.c:342 +#: ../devhelp/devhelp/dh-window.c:782 ../devhelp/devhelp/eggfindbar.c:342 msgid "Find Next" msgstr "Nächstes suchen" -#: ../devhelp/devhelp/dh-window.c:784 -#: ../devhelp/devhelp/eggfindbar.c:329 +#: ../devhelp/devhelp/dh-window.c:784 ../devhelp/devhelp/eggfindbar.c:329 msgid "Find Previous" msgstr "Vorheriges suchen" @@ -941,8 +950,7 @@ msgstr "Fehler beim Öffnen des angegebenen Links." # what the heck? :D -#: ../devhelp/devhelp/dh-window.c:1649 -#: ../devhelp/devhelp/dh-window.c:1891 +#: ../devhelp/devhelp/dh-window.c:1649 ../devhelp/devhelp/dh-window.c:1891 msgid "Empty Page" msgstr "Leere Seite" @@ -950,13 +958,11 @@ msgid "Find:" msgstr "Suchen:" -#: ../devhelp/devhelp/eggfindbar.c:333 -#: ../devhelp/devhelp/eggfindbar.c:336 +#: ../devhelp/devhelp/eggfindbar.c:333 ../devhelp/devhelp/eggfindbar.c:336 msgid "Find previous occurrence of the search string" msgstr "Vorheriges Auftreten des Suchmusters finden" -#: ../devhelp/devhelp/eggfindbar.c:346 -#: ../devhelp/devhelp/eggfindbar.c:349 +#: ../devhelp/devhelp/eggfindbar.c:346 ../devhelp/devhelp/eggfindbar.c:349 msgid "Find next occurrence of the search string" msgstr "Nächstes Auftreten des Suchmusters finden" @@ -964,14 +970,12 @@ msgid "C_ase Sensitive" msgstr "_Groß-/Kleinschreibung beachten" -#: ../devhelp/devhelp/eggfindbar.c:362 -#: ../devhelp/devhelp/eggfindbar.c:365 +#: ../devhelp/devhelp/eggfindbar.c:362 ../devhelp/devhelp/eggfindbar.c:365 msgid "Toggle case sensitive search" msgstr "»Beachten von Groß-/Kleinschreibung« umschalten" #. All plugins must set name, description, version and author. -#: ../geanydoc/src/geanydoc.c:50 -#: ../geanydoc/src/geanydoc.c:347 +#: ../geanydoc/src/geanydoc.c:50 ../geanydoc/src/geanydoc.c:347 msgid "Doc" msgstr "Doc" @@ -979,8 +983,7 @@ msgid "Call documentation viewer on current symbol." msgstr "Dokumentation für das aktuelle Wort anzeigen." -#: ../geanydoc/src/geanydoc.c:170 -#: ../geanyvc/src/geanyvc.c:416 +#: ../geanydoc/src/geanydoc.c:170 ../geanyvc/src/geanyvc.c:416 msgid "Could not parse the output of command" msgstr "Konnte die Ausgabe des Befehls nicht verarbeiten." @@ -1016,55 +1019,63 @@ msgid "Column mode, select to line / brace / anchor." msgstr "Spaltenmodus. Auswählen bis zur Zeile/passenden Klammer/Anker" -#: ../geanyextrasel/src/extrasel.c:482 +#: ../geanyextrasel/src/extrasel.c:502 msgid "E_xtra Selection" msgstr "E_xtra-Auswahl" -#: ../geanyextrasel/src/extrasel.c:489 +#: ../geanyextrasel/src/extrasel.c:509 msgid "_Column Mode" msgstr "_Spaltenmodus" -#: ../geanyextrasel/src/extrasel.c:494 +#: ../geanyextrasel/src/extrasel.c:514 msgid "Column mode" msgstr "Spaltenmodus" -#: ../geanyextrasel/src/extrasel.c:496 +#: ../geanyextrasel/src/extrasel.c:516 msgid "Select to _Line" msgstr "_Auswählen bis Zeile" -#: ../geanyextrasel/src/extrasel.c:500 +#: ../geanyextrasel/src/extrasel.c:520 msgid "Select to line" msgstr "Auswählen bis Zeile" -#: ../geanyextrasel/src/extrasel.c:502 +#: ../geanyextrasel/src/extrasel.c:522 msgid "Select to Matching _Brace" msgstr "Bis zur passenden _Klammer auswählen" -#: ../geanyextrasel/src/extrasel.c:506 +#: ../geanyextrasel/src/extrasel.c:526 msgid "Select to matching brace" msgstr "Bis zur passenden Klammer auswählen" -#: ../geanyextrasel/src/extrasel.c:510 +#: ../geanyextrasel/src/extrasel.c:528 +msgid "_Toggle Stream/Rectangular" +msgstr "Zwischen Fluss. und Rechteckauswahl umschalten" + +#: ../geanyextrasel/src/extrasel.c:532 +msgid "Convert selection" +msgstr "Auswahl umwandeln" + +#: ../geanyextrasel/src/extrasel.c:537 msgid "_Set Anchor" msgstr "_Anker setzen" -#: ../geanyextrasel/src/extrasel.c:514 +#: ../geanyextrasel/src/extrasel.c:541 msgid "Set anchor" msgstr "Anker setzen" -#: ../geanyextrasel/src/extrasel.c:516 +#: ../geanyextrasel/src/extrasel.c:543 msgid "Select to _Anchor" msgstr "Bis zum Anker _auswählen" -#: ../geanyextrasel/src/extrasel.c:520 +#: ../geanyextrasel/src/extrasel.c:547 msgid "Select to anchor" msgstr "Bis zum Anker auswählen" -#: ../geanyextrasel/src/extrasel.c:522 +#: ../geanyextrasel/src/extrasel.c:549 msgid "_Rectangle Select to Anchor" msgstr "_Rechteckige Auswahl bis zum Anker" -#: ../geanyextrasel/src/extrasel.c:527 +#: ../geanyextrasel/src/extrasel.c:554 msgid "Rectangle select to anchor" msgstr "Rechteckige Auswahl bis zum Anker" @@ -1252,7 +1263,8 @@ "# of the syntax of this file, please refer to the manual.\n" msgstr "" "# Eine Konfiguration für diese Datei existiert noch nicht. \n" -"# Um sie zu erstellen, einfach etwas in diese Datei schreiben und anschließend speichern.\n" +"# Um sie zu erstellen, einfach etwas in diese Datei schreiben und " +"anschließend speichern.\n" "# Eine Beschreibung der Syntax dafür gibt es im Handbuch.\n" #: ../geanygendoc/src/ggd-plugin.c:342 @@ -1260,8 +1272,7 @@ msgid "Failed to load file \"%s\": %s" msgstr "Konnte die Datei »%s« nicht laden: %s" -#: ../geanygendoc/src/ggd-plugin.c:415 -#: ../geanygendoc/src/ggd-plugin.c:426 +#: ../geanygendoc/src/ggd-plugin.c:415 ../geanygendoc/src/ggd-plugin.c:426 msgid "Insert Documentation Comment" msgstr "Dokumentationskommentar einfügen" @@ -1279,7 +1290,9 @@ #: ../geanygendoc/src/ggd-plugin.c:488 msgid "Generate documentation for all symbols in the current document" -msgstr "Erstellt die Dokumentation für alle Symbole des aktuell geöffneten Dokumentes." +msgstr "" +"Erstellt die Dokumentation für alle Symbole des aktuell geöffneten " +"Dokumentes." #: ../geanygendoc/src/ggd-plugin.c:498 msgid "_Reload Configuration Files" @@ -1321,8 +1334,20 @@ msgstr "Datei _speichern vor dem Generieren der Dokumentation" #: ../geanygendoc/src/ggd-plugin.c:627 -msgid "Whether the current document should be saved to disc before generating the documentation. This is a technical detail, but it is currently needed to have an up-to-date tag list. If you disable this option and ask for documentation generation on a modified document, the behavior may be surprising since the comment will be generated for the last saved state of this document and not the current one." -msgstr "Das aktuelle Dokument speichern, bevor die Dokumentation dafür generiert wird. Ein technisches Detail, aber notwendig um mit einer aktuellen Symbolliste arbeiten zu können. Das Deaktivieren dieser Option könnte zu überraschenden Ergebnissen bei der Erstellung der Dokumentation führen, da die jeweils zuletzt gespeicherte Version des aktuellen Dokumentes als Basis genutzt wird." +msgid "" +"Whether the current document should be saved to disc before generating the " +"documentation. This is a technical detail, but it is currently needed to " +"have an up-to-date tag list. If you disable this option and ask for " +"documentation generation on a modified document, the behavior may be " +"surprising since the comment will be generated for the last saved state of " +"this document and not the current one." +msgstr "" +"Das aktuelle Dokument speichern, bevor die Dokumentation dafür generiert " +"wird. Ein technisches Detail, aber notwendig um mit einer aktuellen " +"Symbolliste arbeiten zu können. Das Deaktivieren dieser Option könnte zu " +"überraschenden Ergebnissen bei der Erstellung der Dokumentation führen, da " +"die jeweils zuletzt gespeicherte Version des aktuellen Dokumentes als Basis " +"genutzt wird." #. indent #: ../geanygendoc/src/ggd-plugin.c:637 @@ -1330,8 +1355,12 @@ msgstr "Eingefügte Dokumentation _einrücken" #: ../geanygendoc/src/ggd-plugin.c:639 -msgid "Whether the inserted documentation should be indented to fit the indentation at the insertion position." -msgstr "Die eingefügte Dokumentation einrücken und somit in die aktuelle Position im Text eingliedern. " +msgid "" +"Whether the inserted documentation should be indented to fit the indentation " +"at the insertion position." +msgstr "" +"Die eingefügte Dokumentation einrücken und somit in die aktuelle Position im " +"Text eingliedern. " #. Documentation type #: ../geanygendoc/src/ggd-plugin.c:646 @@ -1340,8 +1369,14 @@ msgstr "Dokumentationstyp" #: ../geanygendoc/src/ggd-plugin.c:656 -msgid "Choose the documentation type to use with each file type. The special language \"All\" on top of the list is used to choose the default documentation type, used for all languages that haven't one set." -msgstr "Der Typ der Dokumentation, der bei den jeweiligen Dateitypen angewendet werden soll. \"Alle\" setzt die Standardkonfiguration, die auch für alle Sprachen genutzt wird, für die der Dokumentationstyp nicht gesetzt wurde. " +msgid "" +"Choose the documentation type to use with each file type. The special " +"language \"All\" on top of the list is used to choose the default " +"documentation type, used for all languages that haven't one set." +msgstr "" +"Der Typ der Dokumentation, der bei den jeweiligen Dateitypen angewendet " +"werden soll. \"Alle\" setzt die Standardkonfiguration, die auch für alle " +"Sprachen genutzt wird, für die der Dokumentationstyp nicht gesetzt wurde. " #. Environ editor #: ../geanygendoc/src/ggd-plugin.c:662 @@ -1349,11 +1384,14 @@ msgstr "Globale Umgebung" #: ../geanygendoc/src/ggd-plugin.c:664 -msgid "Global environment overrides and additions. This environment will be merged with the file-type-specific ones." -msgstr "Änderungen oder Ergänzungen für die globale Umgebung. Diese werden mit den Einstellungen für Dateitypen zusammengeführt." +msgid "" +"Global environment overrides and additions. This environment will be merged " +"with the file-type-specific ones." +msgstr "" +"Änderungen oder Ergänzungen für die globale Umgebung. Diese werden mit den " +"Einstellungen für Dateitypen zusammengeführt." -#: ../geanygendoc/src/ggd-utils.c:184 -#: ../geanygendoc/src/ggd-utils.c:195 +#: ../geanygendoc/src/ggd-utils.c:184 ../geanygendoc/src/ggd-utils.c:195 #, c-format msgid "File \"%s\" exists but is not a regular file" msgstr "Die Datei »%s« existiert, scheint aber keine reguläre Datei zu sein." @@ -1370,8 +1408,11 @@ #: ../geanygendoc/src/ggd.c:114 #, c-format -msgid "Argument parsing regular expression did not match (argument list was: \"%s\")" -msgstr "Der reguläre Ausdruck zum Erkennen der Argumente war nicht erfolgreich. Die ursprüngliche Argumentliste war »%s«." +msgid "" +"Argument parsing regular expression did not match (argument list was: \"%s\")" +msgstr "" +"Der reguläre Ausdruck zum Erkennen der Argumente war nicht erfolgreich. Die " +"ursprüngliche Argumentliste war »%s«." #: ../geanygendoc/src/ggd.c:248 #, c-format @@ -1391,7 +1432,8 @@ #: ../geanygendoc/src/ggd.c:487 #, c-format msgid "No setting applies to symbol \"%s\" of type \"%s\" at line %lu." -msgstr "Keine Konfiguration gefunden für das Symbol »%s« des Typs »%s« in Zeile %lu." +msgstr "" +"Keine Konfiguration gefunden für das Symbol »%s« des Typs »%s« in Zeile %lu." #: ../geanygendoc/src/ggd.c:533 #, c-format @@ -1407,8 +1449,12 @@ msgstr "Unbekannte Option" #: ../geanygendoc/src/ggd-options.c:335 -msgid "Invalid option or proxy: either the proxy's property or the option type is incompatible." -msgstr "Option oder Proxy ungültig: Entweder die Einstellungen für den Proxy oder der Typ der Option ist nicht kompatibel" +msgid "" +"Invalid option or proxy: either the proxy's property or the option type is " +"incompatible." +msgstr "" +"Option oder Proxy ungültig: Entweder die Einstellungen für den Proxy oder " +"der Typ der Option ist nicht kompatibel" #: ../geanygendoc/src/ggd-options.c:512 #, c-format @@ -1438,79 +1484,79 @@ #: ../geanygendoc/src/ggd-widget-doctype-selector.c:195 msgid "Default documentation type for languages that does not have one set" -msgstr "Dokumentationstyp für Dokumente, denen kein spezieller Typ zugewiesen wurde. " +msgstr "" +"Dokumentationstyp für Dokumente, denen kein spezieller Typ zugewiesen wurde. " -#: ../geanyinsertnum/src/insertnum.c:37 -#: ../geanyinsertnum/src/insertnum.c:329 -#: ../geanyinsertnum/src/insertnum.c:461 +#: ../geanyinsertnum/src/insertnum.c:44 ../geanyinsertnum/src/insertnum.c:337 +#: ../geanyinsertnum/src/insertnum.c:484 msgid "Insert Numbers" msgstr "Nummern einfügen" -#: ../geanyinsertnum/src/insertnum.c:37 +#: ../geanyinsertnum/src/insertnum.c:44 msgid "Insert/Fill columns with numbers." msgstr "Einfügen/Ausfüllen der Spalten mit Nummern" -#: ../geanyinsertnum/src/insertnum.c:140 +#: ../geanyinsertnum/src/insertnum.c:146 msgid "Counting..." msgstr "Zählung läuft..." -#: ../geanyinsertnum/src/insertnum.c:188 +#: ../geanyinsertnum/src/insertnum.c:194 msgid "Preparing..." msgstr "Vorbereitung läuft..." -#: ../geanyinsertnum/src/insertnum.c:194 +#: ../geanyinsertnum/src/insertnum.c:200 msgid "Inserting..." msgstr "Einfügen läuft..." -#: ../geanyinsertnum/src/insertnum.c:318 +#: ../geanyinsertnum/src/insertnum.c:333 msgid "For base 11 and above" msgstr "Für die Basis 11 oder höher" -#: ../geanyinsertnum/src/insertnum.c:341 +#: ../geanyinsertnum/src/insertnum.c:353 msgid "_Start:" msgstr "_Start:" -#: ../geanyinsertnum/src/insertnum.c:346 +#: ../geanyinsertnum/src/insertnum.c:358 msgid "S_tep:" msgstr "S_chrittweite:" -#: ../geanyinsertnum/src/insertnum.c:352 +#: ../geanyinsertnum/src/insertnum.c:364 msgid "_Base:" msgstr "_Basis" -#: ../geanyinsertnum/src/insertnum.c:363 +#: ../geanyinsertnum/src/insertnum.c:380 msgid "Letters:" msgstr "Buchstaben:" -#: ../geanyinsertnum/src/insertnum.c:366 +#: ../geanyinsertnum/src/insertnum.c:383 msgid "_Upper" msgstr "_Obere" -#: ../geanyinsertnum/src/insertnum.c:371 +#: ../geanyinsertnum/src/insertnum.c:388 msgid "_Lower" msgstr "_Untere" -#: ../geanyinsertnum/src/insertnum.c:376 +#: ../geanyinsertnum/src/insertnum.c:393 msgid "Base _prefix" msgstr "Basis_präfix:" -#: ../geanyinsertnum/src/insertnum.c:378 +#: ../geanyinsertnum/src/insertnum.c:395 msgid "0 for octal, 0x for hex, + for positive decimal" msgstr "0 für Oktal, 0x für Hexadezimal, + für positive Dezimalzahlen" -#: ../geanyinsertnum/src/insertnum.c:380 +#: ../geanyinsertnum/src/insertnum.c:397 msgid "Padding:" msgstr "Versatz:" -#: ../geanyinsertnum/src/insertnum.c:382 +#: ../geanyinsertnum/src/insertnum.c:399 msgid "Sp_ace" msgstr "Leer_zeichen" -#: ../geanyinsertnum/src/insertnum.c:385 +#: ../geanyinsertnum/src/insertnum.c:402 msgid "_Zero" msgstr "_Null" -#: ../geanyinsertnum/src/insertnum.c:454 +#: ../geanyinsertnum/src/insertnum.c:477 msgid "Insert _Numbers" msgstr "_Nummern einfügen" @@ -1556,7 +1602,8 @@ #: ../geanylatex/src/latexutils.c:89 #, c-format msgid "Could not determine where to insert package: %s" -msgstr "Konnte nicht genau feststellen, wohin das Paket »%s« eingefügt werden soll." +msgstr "" +"Konnte nicht genau feststellen, wohin das Paket »%s« eingefügt werden soll." #: ../geanylatex/src/bibtexlabels.c:27 msgid "Article (@Article)" @@ -1720,7 +1767,9 @@ #: ../geanylatex/src/bibtexlabels.c:105 msgid "Name(s) of the author(s), separated by 'and' if more than one" -msgstr "Name(n) der Autoren, getrennt mit einem »and«, sollten mehrere Autoren am Werk mitgearbeitet werden." +msgstr "" +"Name(n) der Autoren, getrennt mit einem »and«, sollten mehrere Autoren am " +"Werk mitgearbeitet werden." #: ../geanylatex/src/bibtexlabels.c:106 msgid "Title of the book, if only part of it is being cited" @@ -1759,12 +1808,17 @@ msgstr "Journal oder Magazin, in dem die Arbeit veröffentlicht wurde" #: ../geanylatex/src/bibtexlabels.c:115 -msgid "Hidden field used for specifying or overriding the alphabetical order of entries" -msgstr "Verstecktes Feld, welches zur Festlegung oder zum Überschreiben der alphabetischen Reihenfolge von Einträgen benutzt wird" +msgid "" +"Hidden field used for specifying or overriding the alphabetical order of " +"entries" +msgstr "" +"Verstecktes Feld, welches zur Festlegung oder zum Überschreiben der " +"alphabetischen Reihenfolge von Einträgen benutzt wird" #: ../geanylatex/src/bibtexlabels.c:116 msgid "Month of publication or creation if unpublished" -msgstr "Monat der Publikation bzw. der Erstellung bei unveröffentlichten Werken" +msgstr "" +"Monat der Publikation bzw. der Erstellung bei unveröffentlichten Werken" #: ../geanylatex/src/bibtexlabels.c:117 msgid "Miscellaneous extra information" @@ -1812,7 +1866,9 @@ #: ../geanylatex/src/bibtexlabels.c:128 msgid "Year of publication or creation if unpublished" -msgstr "Jahr der Publikation oder der Erstellung, wenn das Werk noch nicht veröffentlicht ist." +msgstr "" +"Jahr der Publikation oder der Erstellung, wenn das Werk noch nicht " +"veröffentlicht ist." #: ../geanylatex/src/geanylatex.c:41 msgid "GeanyLaTeX" @@ -1838,18 +1894,15 @@ msgid "Underlines selected text" msgstr "Auswahl unterstreichen" -#: ../geanylatex/src/geanylatex.c:120 -#: ../geanylatex/src/formatpatterns.c:45 +#: ../geanylatex/src/geanylatex.c:120 ../geanylatex/src/formatpatterns.c:45 msgid "Centered" msgstr "Zentriert" -#: ../geanylatex/src/geanylatex.c:121 -#: ../geanylatex/src/formatpatterns.c:46 +#: ../geanylatex/src/geanylatex.c:121 ../geanylatex/src/formatpatterns.c:46 msgid "Left side oriented" msgstr "Linksbündig" -#: ../geanylatex/src/geanylatex.c:122 -#: ../geanylatex/src/formatpatterns.c:47 +#: ../geanylatex/src/geanylatex.c:122 ../geanylatex/src/formatpatterns.c:47 msgid "Right side oriented" msgstr "Rechtsbündig" @@ -1871,7 +1924,9 @@ #: ../geanylatex/src/geanylatex.c:306 msgid "Lower selection when formating smallcaps (\\textsc{})" -msgstr "Auswahl im Kleinbuchstaben umwandeln zur Benutzung von kleinen Kapitälchen (\\textsc{})" +msgstr "" +"Auswahl im Kleinbuchstaben umwandeln zur Benutzung von kleinen Kapitälchen " +"(\\textsc{})" #: ../geanylatex/src/geanylatex.c:310 msgid "Don't care about this inside plugin" @@ -1966,14 +2021,14 @@ #. * Adds custom templates if there are any. If there are none just #. * adds default one #. TEMPLATE FILE -#: ../geanylatex/src/geanylatex.c:1731 -#: ../markdown/src/conf.c:668 +#: ../geanylatex/src/geanylatex.c:1731 ../markdown/src/conf.c:659 msgid "Template:" msgstr "Vorlage:" #: ../geanylatex/src/geanylatex.c:1735 msgid "Set the template which should be used for creating the new document" -msgstr "Vorlage, welche zum Erstellen des neuen Dokumentes genutzt werden soll." +msgstr "" +"Vorlage, welche zum Erstellen des neuen Dokumentes genutzt werden soll." #: ../geanylatex/src/geanylatex.c:1744 msgid "Default" @@ -2028,8 +2083,11 @@ msgstr "Autor:" #: ../geanylatex/src/geanylatex.c:1819 -msgid "Sets the value of the \\author command. In most cases this should be your name" -msgstr "Der Eintrag für den Befehl »\\author«. Meist sollte hier Ihr Name stehen." +msgid "" +"Sets the value of the \\author command. In most cases this should be your " +"name" +msgstr "" +"Der Eintrag für den Befehl »\\author«. Meist sollte hier Ihr Name stehen." #. Date #: ../geanylatex/src/geanylatex.c:1833 @@ -2037,8 +2095,14 @@ msgstr "Datum:" #: ../geanylatex/src/geanylatex.c:1836 -msgid "Sets the value of the \\date command inside header of your new created LaTeX-document. Keeping it at \\today is a good decision if you don't need any fixed date." -msgstr "Der Eintrag für den Befehl »\\date« im Kopf des neuen Dokumentes. Den Wert bei »\\today« zu belassen, sollte eine gute Wahl sein, sofern kein fixes Datum benötigt wird." +msgid "" +"Sets the value of the \\date command inside header of your new created LaTeX-" +"document. Keeping it at \\today is a good decision if you don't need any " +"fixed date." +msgstr "" +"Der Eintrag für den Befehl »\\date« im Kopf des neuen Dokumentes. Den Wert " +"bei »\\today« zu belassen, sollte eine gute Wahl sein, sofern kein fixes " +"Datum benötigt wird." #. Title of the new document #: ../geanylatex/src/geanylatex.c:1848 @@ -2056,7 +2120,8 @@ #: ../geanylatex/src/geanylatex.c:1863 msgid "Choose the paper format for the newly created document" -msgstr "Das Papierformat als Argument der Dokumentenklasse für das neue Dokument" +msgstr "" +"Das Papierformat als Argument der Dokumentenklasse für das neue Dokument" #. Paper direction #: ../geanylatex/src/geanylatex.c:1876 @@ -2065,7 +2130,9 @@ #: ../geanylatex/src/geanylatex.c:1879 msgid "Choose the paper orientation for the newly created document" -msgstr "Die Ausrichtung der Seite (Hoch- oder Querformat) als Argument der Dokumentenklasse für das neue Dokument" +msgstr "" +"Die Ausrichtung der Seite (Hoch- oder Querformat) als Argument der " +"Dokumentenklasse für das neue Dokument" #: ../geanylatex/src/geanylatex.c:1900 msgid "Use KOMA-script classes if possible" @@ -2074,16 +2141,23 @@ #: ../geanylatex/src/geanylatex.c:1902 msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" -"Keep in mind: To compile your document these classes have to be installed before." -msgstr "Wenn diese Option aktiviert ist, werden die KOMA-Skript-Klassen von Markus Kohm genutzt. Sie müssen natürlich dafür installiert sein." +"Keep in mind: To compile your document these classes have to be installed " +"before." +msgstr "" +"Wenn diese Option aktiviert ist, werden die KOMA-Skript-Klassen von Markus " +"Kohm genutzt. Sie müssen natürlich dafür installiert sein." #: ../geanylatex/src/geanylatex.c:1909 msgid "Use draft mode" msgstr "Entwurfsmodus benutzen" #: ../geanylatex/src/geanylatex.c:1911 -msgid "Set the draft flag inside new created documents to get documents with a number of debugging helpers" -msgstr "Setzt die Option »draft« für die Dokumentenklasse, um das neue Dokument mit einer Nummer von kleinen Korrekturhinweisen zu versehen." +msgid "" +"Set the draft flag inside new created documents to get documents with a " +"number of debugging helpers" +msgstr "" +"Setzt die Option »draft« für die Dokumentenklasse, um das neue Dokument mit " +"einer Nummer von kleinen Korrekturhinweisen zu versehen." #: ../geanylatex/src/geanylatex.c:1928 msgid "Run LaTeX-Wizard" @@ -2184,16 +2258,19 @@ "Alle Fehler bitte an einen der Entwickler melden." #: ../geanylatex/src/geanylatex.c:2026 -msgid "glatex_set_autocompletion_contextsize has been initialized with an invalid value. Default value taken. Please check your configuration file" -msgstr "glatex_set_autocompletion_contextsize wurde mit einem ungültigen Wert initialisiert. Anstelle dessen wird der Standardwert genutzt. Bitte die Konfigurationsdatei prüfen." +msgid "" +"glatex_set_autocompletion_contextsize has been initialized with an invalid " +"value. Default value taken. Please check your configuration file" +msgstr "" +"glatex_set_autocompletion_contextsize wurde mit einem ungültigen Wert " +"initialisiert. Anstelle dessen wird der Standardwert genutzt. Bitte die " +"Konfigurationsdatei prüfen." -#: ../geanylatex/src/geanylatex.c:2048 -#: ../geanylatex/src/geanylatex.c:2055 +#: ../geanylatex/src/geanylatex.c:2048 ../geanylatex/src/geanylatex.c:2055 msgid "page \\pageref{{{reference}}}" msgstr "Seite \\pageref{{{reference}}}" -#: ../geanylatex/src/geanylatex.c:2052 -#: ../geanylatex/src/geanylatex.c:2059 +#: ../geanylatex/src/geanylatex.c:2052 ../geanylatex/src/geanylatex.c:2059 msgid "\\ref{{{reference}}}, page \\pageref{{{reference}}}" msgstr "\\ref{{{reference}}}, Seite \\pageref{{{reference}}}" @@ -2204,13 +2281,11 @@ #. Filling up menubar menus #. LaTeX menu -#: ../geanylatex/src/geanylatex.c:2116 -#: ../geanylatex/src/geanylatex.c:2328 +#: ../geanylatex/src/geanylatex.c:2116 ../geanylatex/src/geanylatex.c:2328 msgid "LaTeX-_Wizard" msgstr "LaTeX-_Assistent" -#: ../geanylatex/src/geanylatex.c:2119 -#: ../geanylatex/src/geanylatex.c:2331 +#: ../geanylatex/src/geanylatex.c:2119 ../geanylatex/src/geanylatex.c:2331 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "Öffnet einen Assistenten, um einfach LaTeX-Dokumente zu erstellen." @@ -2252,10 +2327,10 @@ #: ../geanylatex/src/geanylatex.c:2161 msgid "A small dialog to insert \\usepackage{} into header of current file" -msgstr "Eine kleine Hilfe, um \\usepackage{} in den Kopf des Dokumentes einzufügen." +msgstr "" +"Eine kleine Hilfe, um \\usepackage{} in den Kopf des Dokumentes einzufügen." -#: ../geanylatex/src/geanylatex.c:2166 -#: ../scope/data/scope.glade.h:58 +#: ../geanylatex/src/geanylatex.c:2166 ../scope/data/scope.glade.h:58 msgid "_Format" msgstr "_Format" @@ -2298,7 +2373,8 @@ #: ../geanylatex/src/geanylatex.c:2267 msgid "Helps to insert a reference out of BibTeX files" -msgstr "Unterstützt beim Einfügen von BibTeX-Referenzen basierend auf bib-Dateien" +msgstr "" +"Unterstützt beim Einfügen von BibTeX-Referenzen basierend auf bib-Dateien" #: ../geanylatex/src/geanylatex.c:2272 msgid "_BibTeX entries" @@ -2456,16 +2532,16 @@ msgid "Creating dummy text with Geany" msgstr "Platzhaltertexte erstellen mit Geany" -#: ../geanylipsum/src/geanylipsum.c:86 +#: ../geanylipsum/src/geanylipsum.c:89 msgid "Lipsum-Generator" msgstr "Lorem-ipsum-Generator" -#: ../geanylipsum/src/geanylipsum.c:87 +#: ../geanylipsum/src/geanylipsum.c:90 msgid "Enter the length of Lipsum text here" msgstr "Bitte die Länge des Platzhaltertextes eingeben" #. Building menu entry -#: ../geanylipsum/src/geanylipsum.c:163 +#: ../geanylipsum/src/geanylipsum.c:164 msgid "_Lipsum" msgstr "_Lipsum" @@ -2477,8 +2553,7 @@ msgid "Insert Lipsum text" msgstr "Fügt Platzhaltertexte ein" -#: ../geanylua/glspi.h:100 -#: ../geanylua/gsdlg_lua.c:95 +#: ../geanylua/glspi.h:100 ../geanylua/gsdlg_lua.c:95 #: ../geanylua/glspi_kfile.c:54 #, c-format msgid "" @@ -2497,8 +2572,7 @@ "Fehler in Modul »%s« in Funktion %s():\n" "Typ »%s« oder »%s« für Argument #%d erwartet\n" -#: ../geanylua/glspi.h:128 -#: ../geanylua/gsdlg_lua.c:108 +#: ../geanylua/glspi.h:128 ../geanylua/gsdlg_lua.c:108 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2519,14 +2593,15 @@ #: ../geanylua/glspi_ver.h:9 msgid "Write and run Lua scripts for custom commands." -msgstr "Lua Skripte schreiben und als benutzerdefinierte Funktionen in Geany ausführen." +msgstr "" +"Lua Skripte schreiben und als benutzerdefinierte Funktionen in Geany " +"ausführen." #: ../geanylua/glspi_ver.h:19 msgid "Lua Script Plugin" msgstr "Lua-Skript-Plugin" -#: ../geanylua/glspi_run.c:90 -#: ../geanylua/glspi_run.c:97 +#: ../geanylua/glspi_run.c:90 ../geanylua/glspi_run.c:97 msgid "Lua script error:" msgstr "Fehler bei Lua-Skript:" @@ -2587,10 +2662,11 @@ "\"%s\"\n" "\n" "to add your own custom configuration dialog." -msgstr "Sie können das Script »%s« erstellen, um einen benutzerdefinierten Konfigurationsdialog hinzuzufügen." +msgstr "" +"Sie können das Script »%s« erstellen, um einen benutzerdefinierten " +"Konfigurationsdialog hinzuzufügen." -#: ../geanylua/gsdlg.c:103 -#: ../geanylua/glspi_dlg.c:420 +#: ../geanylua/gsdlg.c:103 ../geanylua/glspi_dlg.c:420 msgid "Open file" msgstr "Datei öffnen" @@ -2602,19 +2678,19 @@ msgid "Browse..." msgstr "Durchsuchen..." -#: ../geanylua/gsdlg.c:175 +#: ../geanylua/gsdlg.c:176 msgid "Select Color" msgstr "Farbe auswählen" -#: ../geanylua/gsdlg.c:205 +#: ../geanylua/gsdlg.c:207 msgid "Choose..." msgstr "Auswählen..." -#: ../geanylua/gsdlg.c:226 +#: ../geanylua/gsdlg.c:228 msgid "Select Font" msgstr "Schriftart auswählen" -#: ../geanylua/gsdlg.c:253 +#: ../geanylua/gsdlg.c:255 msgid "Select..." msgstr "Auswählen..." @@ -2645,8 +2721,7 @@ "Fehler in Modul »%s« in Funktion %s():\n" "Nicht genügend Argumente für den Befehl »%s«.\n" -#: ../geanylua/glspi_sci.c:652 -#: ../geanylua/glspi_app.c:398 +#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:396 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2686,7 +2761,7 @@ msgid "Save file" msgstr "Datei speichern" -#: ../geanylua/glspi_dlg.c:436 +#: ../geanylua/glspi_dlg.c:438 #, c-format msgid "" "Error in module \"%s\" at function pickfile():\n" @@ -2695,7 +2770,7 @@ "Fehler in Modul »%s« in Funktion pickfile():\n" "Konnte die zu filternde Zeichenkette nicht verarbeiten; Argument #3.\n" -#: ../geanylua/glspi_dlg.c:486 +#: ../geanylua/glspi_dlg.c:489 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2739,7 +2814,7 @@ "Bitte überprüfen Sie Ihre Installation." # c-format -#: ../geanylua/glspi_app.c:19 +#: ../geanylua/glspi_app.c:21 #, c-format msgid "" "%s %s: %s\n" @@ -2748,7 +2823,7 @@ "%s %s: %s\n" "Copyright (c) 2007-2010" -#: ../geanylua/glspi_app.c:149 +#: ../geanylua/glspi_app.c:151 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2757,7 +2832,7 @@ "Fehler in Modul »%s« in Funktion %s():\n" "Widget »%s« nicht gefunden für Argument #1.\n" -#: ../geanylua/glspi_app.c:158 +#: ../geanylua/glspi_app.c:160 #, c-format msgid "" "Error in module \"%s\" at function %s() argument #2:\n" @@ -2907,8 +2982,13 @@ msgstr "Cursor zu letztem sichtbaren Zeichen bewegen" #: ../geanymacro/src/geanymacro.c:93 -msgid "Move Cursor to 1st non-whitespace character of line, or 1st character of line if already at 1st non-whitespace character" -msgstr "Cursor zu erstem Zeichen der Zeile bewegen, das kein Whitespace ist, oder zum ersten Zeichen überhaupt, wenn schon beim ersten Nicht-Whitespace-Zeichen." +msgid "" +"Move Cursor to 1st non-whitespace character of line, or 1st character of " +"line if already at 1st non-whitespace character" +msgstr "" +"Cursor zu erstem Zeichen der Zeile bewegen, das kein Whitespace ist, oder " +"zum ersten Zeichen überhaupt, wenn schon beim ersten Nicht-Whitespace-" +"Zeichen." #: ../geanymacro/src/geanymacro.c:95 msgid "Move Cursor to beginning of next paragraph" @@ -2991,8 +3071,13 @@ msgstr "Auswahl bis zu letztem sichtbaren Zeichen erweitern" #: ../geanymacro/src/geanymacro.c:116 -msgid "Extend Selection to 1st non-whitespace character of line, or 1st character of line if already at 1st non-whitespace character" -msgstr "Auswahl bis zu erstem Zeichen der Zeile erweitern, das kein Whitespace ist, oder bis zum ersten Zeichen überhaupt, wenn schon beim ersten Nicht-Whitespace-Zeichen." +msgid "" +"Extend Selection to 1st non-whitespace character of line, or 1st character " +"of line if already at 1st non-whitespace character" +msgstr "" +"Auswahl bis zu erstem Zeichen der Zeile erweitern, das kein Whitespace ist, " +"oder bis zum ersten Zeichen überhaupt, wenn schon beim ersten Nicht-" +"Whitespace-Zeichen." #: ../geanymacro/src/geanymacro.c:118 msgid "Extend Selection to beginning of next paragraph" @@ -3043,8 +3128,13 @@ msgstr "Rechteckige Auswahl eine Seite nach unten erweitern" #: ../geanymacro/src/geanymacro.c:131 -msgid "Extend Rectangular Selection to 1st non-whitespace character of line, or 1st character of line if already at 1st non-whitespace character" -msgstr "Rechteckige Auswahl bis zu erstem Zeichen der Zeile erweitern, das kein Whitespace ist, oder bis zum ersten Zeichen überhaupt, wenn schon beim ersten Nicht-Whitespace-Zeichen." +msgid "" +"Extend Rectangular Selection to 1st non-whitespace character of line, or 1st " +"character of line if already at 1st non-whitespace character" +msgstr "" +"Rechteckige Auswahl bis zu erstem Zeichen der Zeile erweitern, das kein " +"Whitespace ist, oder bis zum ersten Zeichen überhaupt, wenn schon beim " +"ersten Nicht-Whitespace-Zeichen." #: ../geanymacro/src/geanymacro.c:134 msgid "Cancel Selection" @@ -3054,8 +3144,7 @@ msgid "Toggle Insert/Overwrite mode" msgstr "Einfügen/Überschreiben umschalten" -#: ../geanymacro/src/geanymacro.c:137 -#: ../pretty-printer/src/ConfigUI.c:239 +#: ../geanymacro/src/geanymacro.c:137 ../pretty-printer/src/ConfigUI.c:239 msgid "Tab" msgstr "Tabulator" @@ -3063,8 +3152,7 @@ msgid "Newline" msgstr "Zeilenumbruch" -#: ../geanymacro/src/geanymacro.c:140 -#: ../geanymacro/src/geanymacro.c:1625 +#: ../geanymacro/src/geanymacro.c:140 ../geanymacro/src/geanymacro.c:1625 #, c-format msgid "Insert/replace with \"\"" msgstr "Einfügen/ersetzen mit \"\"" @@ -3086,8 +3174,24 @@ msgstr "Duplikat der aktuellen Zeile unterhalb einfügen" #: ../geanymacro/src/geanymacro.c:147 -msgid "Insert duplicate of selected text after selection. If nothing selected, duplicate line" -msgstr "Duplikat des ausgewählten Textes nach der Auswahl einfügen. Wenn nichts ausgewählt ist, wird die Zeile dupliziert" +msgid "" +"Insert duplicate of selected text after selection. If nothing selected, " +"duplicate line" +msgstr "" +"Duplikat des ausgewählten Textes nach der Auswahl einfügen. Wenn nichts " +"ausgewählt ist, wird die Zeile dupliziert" + +#: ../geanymacro/src/geanymacro.c:150 +msgid "Search for next \"\"" +msgstr "Nach dem nächsten \"\" suchen" + +#: ../geanymacro/src/geanymacro.c:151 +msgid "Search for previous \"\"" +msgstr "Nach dem vorheriegen \"\" suchen" + +#: ../geanymacro/src/geanymacro.c:152 +msgid "Set start of search to beginning of selection" +msgstr "Am Anfang der Auswahl beginnen zu suchen" #: ../geanymacro/src/geanymacro.c:181 msgid "Macros" @@ -3133,83 +3237,152 @@ #: ../geanymacro/src/geanymacro.c:856 msgid "This plugin allows you to record and use your own macros. " -msgstr "Dieses Plugin ermöglicht das Aufnehmen und Verwenden von eigenen Makros. " +msgstr "" +"Dieses Plugin ermöglicht das Aufnehmen und Verwenden von eigenen Makros. " #: ../geanymacro/src/geanymacro.c:857 -msgid "These are sequences of actions that can then be repeated with a single key combination. " -msgstr "Sequenzen von Aktionen können mittels einer einzelnen Tastenkombination wiederholt werden. " +msgid "" +"These are sequences of actions that can then be repeated with a single key " +"combination. " +msgstr "" +"Sequenzen von Aktionen können mittels einer einzelnen Tastenkombination " +"wiederholt werden. " #: ../geanymacro/src/geanymacro.c:858 -msgid "So if you had dozens of lines where you wanted to delete the last 2 characters, you could simply start recording, press End, Backspace, Backspace, down line and then stop recording. " -msgstr "Wenn Sie z.B. viele Zeilen hätte, wo sie jeweils die letzten 2 Zeichen löschen wollten, so könnten Sie die Aufnahme starten, »Ende«, »Backspace«, »Backspace« drücken, eine Zeile runtergehen und dann die Aufnahme beenden. " +msgid "" +"So if you had dozens of lines where you wanted to delete the last 2 " +"characters, you could simply start recording, press End, Backspace, " +"Backspace, down line and then stop recording. " +msgstr "" +"Wenn Sie z.B. viele Zeilen hätte, wo sie jeweils die letzten 2 Zeichen " +"löschen wollten, so könnten Sie die Aufnahme starten, »Ende«, »Backspace«, " +"»Backspace« drücken, eine Zeile runtergehen und dann die Aufnahme beenden. " #: ../geanymacro/src/geanymacro.c:860 -msgid "Then simply trigger the macro and it would automatically edit the line and move to the next. " -msgstr "Dann lösen Sie einfach das Makro aus und es wird automatisch die Zeile bearbeiten und zu der nächsten Zeile runtergehen. " +msgid "" +"Then simply trigger the macro and it would automatically edit the line and " +"move to the next. " +msgstr "" +"Dann lösen Sie einfach das Makro aus und es wird automatisch die Zeile " +"bearbeiten und zu der nächsten Zeile runtergehen. " #: ../geanymacro/src/geanymacro.c:861 -msgid "Select Record Macro from the Tools menu and you will be prompted with a dialog box. " -msgstr "Wählen Sie »Makro aufzeichnen« aus dem Werkzeugmenü, dann wird ein Dialogfenster für Sie geöffnet. " +msgid "" +"Select Record Macro from the Tools menu and you will be prompted with a " +"dialog box. " +msgstr "" +"Wählen Sie »Makro aufzeichnen« aus dem Werkzeugmenü, dann wird ein " +"Dialogfenster für Sie geöffnet. " #: ../geanymacro/src/geanymacro.c:862 -msgid "You need to specify a key combination that isn't being used, and a name for the macro to help you identify it. " -msgstr "Sie müssen eine noch nicht verwendete Tastenkombination angeben und einen Namen für das Makro, an dem Sie es wiedererkennen können. " +msgid "" +"You need to specify a key combination that isn't being used, and a name for " +"the macro to help you identify it. " +msgstr "" +"Sie müssen eine noch nicht verwendete Tastenkombination angeben und einen " +"Namen für das Makro, an dem Sie es wiedererkennen können. " #: ../geanymacro/src/geanymacro.c:864 msgid "Then press Record. " msgstr "Dann drücken Sie »Aufnehmen«" #: ../geanymacro/src/geanymacro.c:865 -msgid "What you do in the editor is then recorded until you select Stop Recording Macro from the Tools menu. " -msgstr "Was Sie dann im Editor machen, wird alles aufgezeichnet, bis Sie die Aufnahme über das Werkzeugmenü beenden. " +msgid "" +"What you do in the editor is then recorded until you select Stop Recording " +"Macro from the Tools menu. " +msgstr "" +"Was Sie dann im Editor machen, wird alles aufgezeichnet, bis Sie die " +"Aufnahme über das Werkzeugmenü beenden. " #: ../geanymacro/src/geanymacro.c:867 msgid "Simply pressing the specified key combination will re-run the macro. " -msgstr "Wenn Sie jetzt die angegebene Tastenkombination drücken, wird das Makro erneut ausgeführt. " +msgstr "" +"Wenn Sie jetzt die angegebene Tastenkombination drücken, wird das Makro " +"erneut ausgeführt. " #: ../geanymacro/src/geanymacro.c:868 msgid "To edit the macros you have, select Edit Macro from the Tools menu. " -msgstr "Zum Bearbeiten der vorhandenen Makros finden Sie im Werkzeugmenü den Eintrag »Makros bearbeiten«. " +msgstr "" +"Zum Bearbeiten der vorhandenen Makros finden Sie im Werkzeugmenü den Eintrag " +"»Makros bearbeiten«. " #: ../geanymacro/src/geanymacro.c:869 msgid "You can select a macro and delete it, or re-record it. " msgstr "Sie können ein Makro auswählen und es löschen oder neu aufzeichnen. " #: ../geanymacro/src/geanymacro.c:870 -msgid "You can also click on a macro's name and change it, or the key combination and re-define that assuming that it's not already in use. " -msgstr "Sie können auch auf einen Makronamen klicken und ihn ändern, oder auf die Tastenkombination und diese neu definieren, so sie nicht schon vergeben ist. " +msgid "" +"You can also click on a macro's name and change it, or the key combination " +"and re-define that assuming that it's not already in use. " +msgstr "" +"Sie können auch auf einen Makronamen klicken und ihn ändern, oder auf die " +"Tastenkombination und diese neu definieren, so sie nicht schon vergeben ist. " #: ../geanymacro/src/geanymacro.c:872 -msgid "Selecting the edit option allows you to view all the individual elements that make up the macro. " -msgstr "Wenn Sie die Option »Bearbeiten« auswählen, können Sie alle einzelnen Elemente sehen, welche das Makro ausmachen. " +msgid "" +"Selecting the edit option allows you to view all the individual elements " +"that make up the macro. " +msgstr "" +"Wenn Sie die Option »Bearbeiten« auswählen, können Sie alle einzelnen " +"Elemente sehen, welche das Makro ausmachen. " #: ../geanymacro/src/geanymacro.c:874 msgid "" -"You can select a diferent command for each element, move them, add new elements, delete elements, or if it's replace/insert, you can edit the text that replaces the selected text, or is inserted.\n" +"You can select a diferent command for each element, move them, add new " +"elements, delete elements, or if it's replace/insert, you can edit the text " +"that replaces the selected text, or is inserted.\n" "\n" -msgstr "Sie können einen anderen Befehl für jedes Element auswählen, diese verschieben, neue Elemente hinzufügen, alte löschen oder über »Ersetzen/einfügen« den ausgewählten Text ersetzen bzw. neuen einfügen.\n" +msgstr "" +"Sie können einen anderen Befehl für jedes Element auswählen, diese " +"verschieben, neue Elemente hinzufügen, alte löschen oder über »Ersetzen/" +"einfügen« den ausgewählten Text ersetzen bzw. neuen einfügen.\n" #: ../geanymacro/src/geanymacro.c:878 msgid "" -"The only thing to bear in mind is that undo and redo actions are not recorded, and won't be replayed when the macro is re-run.\n" +"The only thing to bear in mind is that undo and redo actions are not " +"recorded, and won't be replayed when the macro is re-run.\n" "\n" -msgstr "Beachten Sie dabei, daß das Rückgängigmachen und Wiederholen von Aktionen nicht aufgezeichnet wird und entsprechend auch nicht abgespielt wird, wenn das Makro wieder ausgeführt wird.\n" +msgstr "" +"Beachten Sie dabei, daß das Rückgängigmachen und Wiederholen von Aktionen " +"nicht aufgezeichnet wird und entsprechend auch nicht abgespielt wird, wenn " +"das Makro wieder ausgeführt wird.\n" #: ../geanymacro/src/geanymacro.c:881 -msgid "You can alter the default behaviour of this plugin by selecting Plugin Manager under the Tools menu, selecting this plugin, and cliking Preferences. " -msgstr "Sie können das Standardverhalten des Plugins ändern, indem Sie die Pluginverwaltung im Werkzeugmenü auswählen, das Plugin auswählen und auf »Einstellungen« klicken. " +msgid "" +"You can alter the default behaviour of this plugin by selecting Plugin " +"Manager under the Tools menu, selecting this plugin, and cliking " +"Preferences. " +msgstr "" +"Sie können das Standardverhalten des Plugins ändern, indem Sie die " +"Pluginverwaltung im Werkzeugmenü auswählen, das Plugin auswählen und auf " +"»Einstellungen« klicken. " #: ../geanymacro/src/geanymacro.c:883 msgid "You can change:\n" msgstr "Sie können verändern:\n" #: ../geanymacro/src/geanymacro.c:884 -msgid "Save Macros when close Geany - If this is selected then Geany will save any recorded macros and reload them for use the next time you open Geany, if not they will be lost when Geany is closed.\n" -msgstr "Makros beim Beenden von Geany speichern – Wählen Sie dies aus, wenn Geany alle aufgezeichneten Makros speichern und beim nächsten Start von Geany laden soll. Ansonsten gehen alle Makros beim Beenden von Geany verloren.\n" +msgid "" +"Save Macros when close Geany - If this is selected then Geany will save any " +"recorded macros and reload them for use the next time you open Geany, if not " +"they will be lost when Geany is closed.\n" +msgstr "" +"Makros beim Beenden von Geany speichern – Wählen Sie dies aus, wenn Geany " +"alle aufgezeichneten Makros speichern und beim nächsten Start von Geany " +"laden soll. Ansonsten gehen alle Makros beim Beenden von Geany verloren.\n" #: ../geanymacro/src/geanymacro.c:887 -msgid "Ask before replaceing existing Macros - If this is selected then if you try recording a macro over an existing one it will check before over-writing it, giving you the option of trying a different name or key trigger combination, otherwise it will simply erase any existing macros with the same name, or the same key trigger combination." -msgstr "Vor dem Ersetzen von Makros fragen – Vor dem Überschreiben von bereits vorhandenen Makros wird die Möglichkeit gegeben, einen anderen Namen oder eine andere Tastenkombination anzugeben. Ansonsten werden vorhandene Makros mit gleichem Namen oder Tastenkombination einfach gelöscht." +msgid "" +"Ask before replaceing existing Macros - If this is selected then if you try " +"recording a macro over an existing one it will check before over-writing it, " +"giving you the option of trying a different name or key trigger combination, " +"otherwise it will simply erase any existing macros with the same name, or " +"the same key trigger combination." +msgstr "" +"Vor dem Ersetzen von Makros fragen – Vor dem Überschreiben von bereits " +"vorhandenen Makros wird die Möglichkeit gegeben, einen anderen Namen oder " +"eine andere Tastenkombination anzugeben. Ansonsten werden vorhandene Makros " +"mit gleichem Namen oder Tastenkombination einfach gelöscht." #. create dialog box #: ../geanymacro/src/geanymacro.c:1057 @@ -3266,16 +3439,13 @@ msgstr "Suchoptionen:" #. create buttons -#: ../geanymacro/src/geanymacro.c:1393 -#: ../geanymacro/src/geanymacro.c:1536 -#: ../geanymacro/src/geanymacro.c:1819 -#: ../geanymacro/src/geanymacro.c:2116 +#: ../geanymacro/src/geanymacro.c:1393 ../geanymacro/src/geanymacro.c:1536 +#: ../geanymacro/src/geanymacro.c:1826 ../geanymacro/src/geanymacro.c:2122 msgid "_Ok" msgstr "_OK" -#: ../geanymacro/src/geanymacro.c:1394 -#: ../geanymacro/src/geanymacro.c:1537 -#: ../geanymacro/src/geanymacro.c:1820 +#: ../geanymacro/src/geanymacro.c:1394 ../geanymacro/src/geanymacro.c:1537 +#: ../geanymacro/src/geanymacro.c:1827 msgid "_Cancel" msgstr "_Abbrechen" @@ -3292,8 +3462,7 @@ msgid "Search for contents of clipboard" msgstr "Suchen nach Inhalten aus der Zwischenablage" -#: ../geanymacro/src/geanymacro.c:1424 -#: ../gproject/src/gproject-sidebar.c:92 +#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:101 msgid "Search for:" msgstr "Suchen nach:" @@ -3327,60 +3496,58 @@ msgid "Text:" msgstr "Text:" -#: ../geanymacro/src/geanymacro.c:1571 -#: ../geanymacro/src/geanymacro.c:1755 +#: ../geanymacro/src/geanymacro.c:1570 ../geanymacro/src/geanymacro.c:1758 #, c-format msgid "Insert/replace with \"%s\"" msgstr "Einfügen/ersetzen mit »%s«" #. create dialog box -#: ../geanymacro/src/geanymacro.c:1731 +#: ../geanymacro/src/geanymacro.c:1735 #, c-format msgid "Edit: %s" msgstr "Bearbeiten: %s" #. add column -#: ../geanymacro/src/geanymacro.c:1794 +#: ../geanymacro/src/geanymacro.c:1801 msgid "Event" msgstr "Ereignis" #. add buttons -#: ../geanymacro/src/geanymacro.c:1809 +#: ../geanymacro/src/geanymacro.c:1816 msgid "Move _Up" msgstr "Nach _oben" -#: ../geanymacro/src/geanymacro.c:1811 +#: ../geanymacro/src/geanymacro.c:1818 msgid "Move Do_wn" msgstr "Nach _unten" -#: ../geanymacro/src/geanymacro.c:1813 +#: ../geanymacro/src/geanymacro.c:1820 msgid "New _Above" msgstr "Neu _darüber" -#: ../geanymacro/src/geanymacro.c:1814 +#: ../geanymacro/src/geanymacro.c:1821 msgid "New _Below" msgstr "Neu d_arunter" -#: ../geanymacro/src/geanymacro.c:1817 -#: ../geanymacro/src/geanymacro.c:2114 +#: ../geanymacro/src/geanymacro.c:1824 ../geanymacro/src/geanymacro.c:2120 msgid "_Delete" msgstr "_Löschen" #. create dialog box -#: ../geanymacro/src/geanymacro.c:2059 +#: ../geanymacro/src/geanymacro.c:2065 msgid "Edit Macros" msgstr "Makros bearbeiten" -#: ../geanymacro/src/geanymacro.c:2089 +#: ../geanymacro/src/geanymacro.c:2095 msgid "Macro Name" msgstr "Makroname" -#: ../geanymacro/src/geanymacro.c:2095 +#: ../geanymacro/src/geanymacro.c:2101 msgid "Key Trigger" msgstr "Auslöser" #. add buttons -#: ../geanymacro/src/geanymacro.c:2110 +#: ../geanymacro/src/geanymacro.c:2116 msgid "_Re-Record" msgstr "_Neu aufnehmen" @@ -3401,18 +3568,18 @@ msgstr "Makros _bearbeiten" #. *< \brief It's the information message about geany mini script -#: ../geanyminiscript/src/gms_gui.c:130 +#: ../geanyminiscript/src/gms_gui.c:129 msgid "" "GMS : Geany Mini-Script filter Plugin\n" -"This plugin is a tool to apply a script filter on :\n" +"This plugin is a tool to apply a script filter on:\n" " o the text selection,\n" " o the current document,\n" " o all documents of the current session.\n" "\n" -"The filter type can be : \n" -" o Unix shell script, \n" -" o perl script, \n" -" o python script, \n" +"The filter type can be:\n" +" o Unix shell script,\n" +" o perl script,\n" +" o python script,\n" " o sed commands,\n" " o awk script.\n" "\n" @@ -3426,80 +3593,101 @@ "Software Foundation; either version 2 of the License,\n" "or (at your option) any later version." msgstr "" +"GMS : Geany Mini-Script Plugin\n" +"Dieses Plugin ist ein Werkzeug, um verschiedene, skriptbasierte Filer auf: \n" +" o die Textwauswahl,\n" +"\to das aktuelle Dokument, \n" +"\to die Dokumente der aktuelle Sitzung\n" +" anzuwenden.\n" +"Dazu können die Filter in: \n" +" o Unix shell Skript, \n" +" o Perl-Scrikt, \n" +" o Python-Skript, \n" +" o sed-Kommandos,\n" +" o awk-Skripts.\n" +"geschireben werden.\n" +"\n" +"AUTOR\n" +" Erstellt von Pascal BURLOT (December,2008)\n" +"\n" +"Lizenz:\n" +"Dieses Programm ist freie Software und kann unter den Bedingungen der GNU " +"General Public Licence in Version 2 oder höher Verändert und " +"Weiterverrbeitet werden." -#: ../geanyminiscript/src/gms_gui.c:254 +#: ../geanyminiscript/src/gms_gui.c:253 msgid "Load Mini-Script File" msgstr "Mini-Skript laden" -#: ../geanyminiscript/src/gms_gui.c:311 +#: ../geanyminiscript/src/gms_gui.c:310 msgid "Save Mini-Script File" msgstr "Mini-Skript speichern" -#: ../geanyminiscript/src/gms_gui.c:420 +#: ../geanyminiscript/src/gms_gui.c:419 msgid "Mini-Script Filter" msgstr "Mini-Skript-Filter" -#: ../geanyminiscript/src/gms_gui.c:448 +#: ../geanyminiscript/src/gms_gui.c:445 msgid "Clear the mini-script window" msgstr "Leert das Skript-Fenster" -#: ../geanyminiscript/src/gms_gui.c:453 +#: ../geanyminiscript/src/gms_gui.c:450 msgid "Load a mini-script into this window" msgstr "Lädt eine Datei in das Skript-Fenster" -#: ../geanyminiscript/src/gms_gui.c:458 +#: ../geanyminiscript/src/gms_gui.c:455 msgid "Save the mini-script into a file" msgstr "Speichert das Skript ab" -#: ../geanyminiscript/src/gms_gui.c:463 +#: ../geanyminiscript/src/gms_gui.c:460 msgid "Display a information about the mini-script plugin" msgstr "Zeigt Informationen über das Plugin" -#: ../geanyminiscript/src/gms_gui.c:471 +#: ../geanyminiscript/src/gms_gui.c:468 msgid "select the mini-script type" msgstr "Wählen Sie den Skript-Typ aus" #. Hbox : Radio bouttons for choosing the input: #. * selection/current document/all documents of the current session -#: ../geanyminiscript/src/gms_gui.c:502 +#: ../geanyminiscript/src/gms_gui.c:499 msgid "filter input" msgstr "Eingabedaten für den Filter" -#: ../geanyminiscript/src/gms_gui.c:504 +#: ../geanyminiscript/src/gms_gui.c:501 msgid "select the input of mini-script filter" msgstr "Wählen Sie die Eingabedaten des Filters aus" -#: ../geanyminiscript/src/gms_gui.c:510 +#: ../geanyminiscript/src/gms_gui.c:507 msgid "selection" msgstr "Auswahl" -#: ../geanyminiscript/src/gms_gui.c:511 +#: ../geanyminiscript/src/gms_gui.c:508 msgid "document" msgstr "Dokument" -#: ../geanyminiscript/src/gms_gui.c:512 +#: ../geanyminiscript/src/gms_gui.c:509 msgid "session" msgstr "Sitzung" #. Hbox : Radio bouttons for choosing the output: #. * current document/ or new document -#: ../geanyminiscript/src/gms_gui.c:521 +#: ../geanyminiscript/src/gms_gui.c:518 msgid "filter output" msgstr "Filterausgabe" -#: ../geanyminiscript/src/gms_gui.c:523 +#: ../geanyminiscript/src/gms_gui.c:520 msgid "select the output of mini-script filter" msgstr "Wählen Sie die Ausgabe des Filters aus" -#: ../geanyminiscript/src/gms_gui.c:529 +#: ../geanyminiscript/src/gms_gui.c:526 msgid "Current Doc." msgstr "Aktuelles Dokument" -#: ../geanyminiscript/src/gms_gui.c:530 +#: ../geanyminiscript/src/gms_gui.c:527 msgid "New Doc." msgstr "Neues Dokument" -#: ../geanyminiscript/src/gms_gui.c:751 +#: ../geanyminiscript/src/gms_gui.c:748 msgid "script configuration" msgstr "Skript-Konfiguration" @@ -3508,8 +3696,11 @@ msgstr "Mini-Skript" #: ../geanyminiscript/src/gms.c:59 -msgid "A tool to apply a script filter on a text selection or current document(s)" -msgstr "Ein Werkzeug, mit dem ein Skript-Filter auf eine Textauswahl oder aktuelle Dokumente angewandt werden kann" +msgid "" +"A tool to apply a script filter on a text selection or current document(s)" +msgstr "" +"Ein Werkzeug, mit dem ein Skript-Filter auf eine Textauswahl oder aktuelle " +"Dokumente angewandt werden kann" #: ../geanyminiscript/src/gms.c:60 msgid "Pascal BURLOT, a Geany user" @@ -3527,7 +3718,9 @@ #: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:927 #, c-format msgid "Unable to apply all markers to '%s' as all being used." -msgstr "Kann nicht alle Markierungen auf »%s« anwenden, da schon alle in Verwendung sind." +msgstr "" +"Kann nicht alle Markierungen auf »%s« anwenden, da schon alle in Verwendung " +"sind." #: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:929 #: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:973 @@ -3538,10 +3731,13 @@ #: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:971 #, c-format msgid "" -"'%s' has been edited since it was last saved by geany. Marker positions may be unreliable and will not be loaded.\n" +"'%s' has been edited since it was last saved by geany. Marker positions may " +"be unreliable and will not be loaded.\n" "Press Ignore to try an load markers anyway." msgstr "" -"»%s« wurde verändert, seit es zum letzten Mal mit Geany gespeichert wurde. Die Positionen der Markierungen könnten verschoben und irreführend sein und werden nicht geladen.\n" +"»%s« wurde verändert, seit es zum letzten Mal mit Geany gespeichert wurde. " +"Die Positionen der Markierungen könnten verschoben und irreführend sein und " +"werden nicht geladen.\n" "Drücken Sie »ignorieren«, um die Markierungen dennoch zu laden. " #: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:974 @@ -3591,20 +3787,40 @@ #: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1274 msgid "" -"This Plugin implements Numbered Bookmarks in Geany, as well as remembering the state of folds, and positions of standard non-numbered bookmarks when a file is saved.\n" +"This Plugin implements Numbered Bookmarks in Geany, as well as remembering " +"the state of folds, and positions of standard non-numbered bookmarks when a " +"file is saved.\n" "\n" -"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to the line number. If you press Ctrl+Shift+a number on a line that already has that bookmark number then it removes the bookmark, otherwise it will move the bookmark there if it was set on a different line, or create it if it had not already been set. Only the most recently set bookmark on a line will be shown, but you can have more than one bookmark per line. To move to a previously set bookmark, press Ctrl+a number from 0 to 9." -msgstr "" -"Dieses Plugin implementiert nummerierte Lesezeichen in Geany sowie das Merken der Code-Faltungen und der Positionen der gewöhnlichen, nicht-nummerierten Lesezeichen, wenn eine Datei gespeichert wird.\n" +"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark " +"press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to " +"the line number. If you press Ctrl+Shift+a number on a line that already has " +"that bookmark number then it removes the bookmark, otherwise it will move " +"the bookmark there if it was set on a different line, or create it if it had " +"not already been set. Only the most recently set bookmark on a line will be " +"shown, but you can have more than one bookmark per line. To move to a " +"previously set bookmark, press Ctrl+a number from 0 to 9." +msgstr "" +"Dieses Plugin implementiert nummerierte Lesezeichen in Geany sowie das " +"Merken der Code-Faltungen und der Positionen der gewöhnlichen, nicht-" +"nummerierten Lesezeichen, wenn eine Datei gespeichert wird.\n" "\n" -"Es erlaubt bis zu 10 nummerierte Lesezeichen. Um ein nummeriertes Lesezeichen zu erstellen, geben Sie bitte Strg+Umsch+eine Nummer von 0 bis 9 ein. Sie werden eine Markierung neben der Zeilennummer sehen. Wenn Sie dies bei einer Zeile versuchen, die aber schon diese Lesezeichennummer hat, so wird diese Nummer entfernt. Wenn die Nummer schon auf einer anderen Zeile gesetzt war, so wird die Nummer verschoben. Wenn die Nummer noch nicht vergeben war, wird ein Lesezeichen gesetzt. Nur das zuletzt gesetzte Lesezeichen wird gezeigt, aber Sie können mehrere Lesezeichen pro Zeile gesetzt haben. Um sich zu einem schon gesetzten Lesezeichen zu bewegen, geben Sie Strg+eine Nummer von 0 bis 9 ein." +"Es erlaubt bis zu 10 nummerierte Lesezeichen. Um ein nummeriertes " +"Lesezeichen zu erstellen, geben Sie bitte Strg+Umsch+eine Nummer von 0 bis 9 " +"ein. Sie werden eine Markierung neben der Zeilennummer sehen. Wenn Sie dies " +"bei einer Zeile versuchen, die aber schon diese Lesezeichennummer hat, so " +"wird diese Nummer entfernt. Wenn die Nummer schon auf einer anderen Zeile " +"gesetzt war, so wird die Nummer verschoben. Wenn die Nummer noch nicht " +"vergeben war, wird ein Lesezeichen gesetzt. Nur das zuletzt gesetzte " +"Lesezeichen wird gezeigt, aber Sie können mehrere Lesezeichen pro Zeile " +"gesetzt haben. Um sich zu einem schon gesetzten Lesezeichen zu bewegen, " +"geben Sie Strg+eine Nummer von 0 bis 9 ein." #: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1395 msgid "Unable to apply markers as all being used." -msgstr "Kann nicht alle Markierungen anwenden, da schon alle in Verwendung sind." +msgstr "" +"Kann nicht alle Markierungen anwenden, da schon alle in Verwendung sind." -#: ../geanypg/src/decrypt_cb.c:33 -#: ../geanypg/src/encrypt_cb.c:32 +#: ../geanypg/src/decrypt_cb.c:33 ../geanypg/src/encrypt_cb.c:32 #: ../geanypg/src/sign_cb.c:33 msgid "couldn't create tempfile" msgstr "konnte keine temporäre Datei erstellen" @@ -3614,13 +3830,15 @@ msgid "" "The key with user ID \"%s\" has validity \"%s\".\n" "\n" -"WARNING: It is NOT certain that the key belongs to the person named in the user ID.\n" +"WARNING: It is NOT certain that the key belongs to the person named in the " +"user ID.\n" "\n" "Are you *really* sure you want to use this key anyway?" msgstr "" "Der Schlüssel mit ID »%s« hat die Gültigkeit »%s«.\n" "\n" -"WARNUNG: Es ist nicht sichergestellt, dass der Schlüssel auch zu der in der ID genannten Person wirklich gehört.\n" +"WARNUNG: Es ist nicht sichergestellt, dass der Schlüssel auch zu der in der " +"ID genannten Person wirklich gehört.\n" "\n" "Sind Sie WIRKLICH sicher, dass Sie diesen Schlüssel dennoch verwenden wollen?" @@ -3644,8 +3862,7 @@ msgid "Using libgpgme version:" msgstr "Verwendete libgpgme-Version:" -#: ../geanypg/src/geanypg.c:60 -#: ../geanypg/src/geanypg.c:61 +#: ../geanypg/src/geanypg.c:60 ../geanypg/src/geanypg.c:61 msgid "Error from" msgstr "Fehler von" @@ -3686,46 +3903,49 @@ msgstr "Signierenden Schlüssel auswählen" #. shouldn't get here -#: ../geanypg/src/pinentry.c:107 +#: ../geanypg/src/pinentry.c:111 msgid "Could not use pinentry." msgstr "Konnte pinentry nicht nutzen" -#: ../geanypg/src/pinentry.c:119 +#: ../geanypg/src/pinentry.c:123 msgid "Unexpected output from pinentry." msgstr "Pinentry hat eine unerwartete Antwort zurückgegeben." #. read the rest of the first line after OK -#: ../geanypg/src/pinentry.c:127 +#: ../geanypg/src/pinentry.c:131 msgid "Passphrase entry" msgstr "Passphraseneintrag" -#: ../geanypg/src/pinentry.c:131 +#: ../geanypg/src/pinentry.c:135 msgid "Passphrase" msgstr "Passphrase" -#: ../geanypg/src/pinentry.c:136 +#: ../geanypg/src/pinentry.c:140 msgid "Enter passphrase for" msgstr "Eingeben der Passphrase für" -#: ../geanypg/src/pinentry.c:167 +#: ../geanypg/src/pinentry.c:171 msgid "pinentry gave error" msgstr "pinentry hat einen Fehler gemeldet" -#: ../geanypg/src/pinentry.c:170 +#: ../geanypg/src/pinentry.c:174 msgid "Unexpected error from pinentry." msgstr "Unerwarteter Fehler von pinentry" -#: ../geanypg/src/pinentry.c:195 -msgid "Error, Passphrase input without using gpg-agent is not supported on Windows yet." -msgstr "Fehler: Passphraseneingabe ohne die Verwendung von gpg-agent wird nicht unterstützt unter Windows." +#: ../geanypg/src/pinentry.c:199 +msgid "" +"Error, Passphrase input without using gpg-agent is not supported on Windows " +"yet." +msgstr "" +"Fehler: Passphraseneingabe ohne die Verwendung von gpg-agent wird nicht " +"unterstützt unter Windows." #: ../geanypg/src/verify_aux.c:53 msgid "a key with fingerprint" msgstr "ein Schlüssel mit Fingerabdruck" -#: ../geanypg/src/verify_aux.c:66 -#: ../spellcheck/src/gui.c:522 -#: ../spellcheck/src/gui.c:533 +#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:527 +#: ../spellcheck/src/gui.c:538 msgid "unknown" msgstr "Unbekannt" @@ -3749,8 +3969,7 @@ msgid "ultimate" msgstr "ultimativ" -#: ../geanypg/src/verify_aux.c:72 -#: ../geanypg/src/verify_aux.c:74 +#: ../geanypg/src/verify_aux.c:72 ../geanypg/src/verify_aux.c:74 msgid "[bad validity value]" msgstr "[schlechter Validierungswert]" @@ -3826,62 +4045,49 @@ "Andere Kennzeichungen ..: %s%s\n" "Anmekungen .............: %s\n" -#: ../geanypg/src/verify_aux.c:119 -#: ../geanypg/src/verify_aux.c:124 +#: ../geanypg/src/verify_aux.c:119 ../geanypg/src/verify_aux.c:124 msgid "Unknown\n" msgstr "Unbekannt\n" -#: ../geanypg/src/verify_aux.c:129 -#: ../geanypg/src/verify_aux.c:136 -#: ../geanypg/src/verify_aux.c:147 -#: ../geanypg/src/verify_aux.c:154 +#: ../geanypg/src/verify_aux.c:129 ../geanypg/src/verify_aux.c:136 +#: ../geanypg/src/verify_aux.c:147 ../geanypg/src/verify_aux.c:154 msgid "[None]" msgstr "[Kein]" -#: ../geanypg/src/verify_aux.c:134 -#: ../geanypg/src/verify_aux.c:135 -#: ../geanypg/src/verify_aux.c:152 -#: ../geanypg/src/verify_aux.c:153 +#: ../geanypg/src/verify_aux.c:134 ../geanypg/src/verify_aux.c:135 +#: ../geanypg/src/verify_aux.c:152 ../geanypg/src/verify_aux.c:153 msgid "Unknown" msgstr "Unbekannt" -#: ../geanypg/src/verify_aux.c:137 -#: ../geanypg/src/verify_aux.c:155 +#: ../geanypg/src/verify_aux.c:137 ../geanypg/src/verify_aux.c:155 msgid "n/a" msgstr "nicht verfügbar" -#: ../geanypg/src/verify_aux.c:137 -#: ../geanypg/src/verify_aux.c:155 +#: ../geanypg/src/verify_aux.c:137 ../geanypg/src/verify_aux.c:155 msgid "bad" msgstr "schlecht" -#: ../geanypg/src/verify_aux.c:137 -#: ../geanypg/src/verify_aux.c:155 +#: ../geanypg/src/verify_aux.c:137 ../geanypg/src/verify_aux.c:155 msgid "okay" msgstr "okay" -#: ../geanypg/src/verify_aux.c:137 -#: ../geanypg/src/verify_aux.c:155 +#: ../geanypg/src/verify_aux.c:137 ../geanypg/src/verify_aux.c:155 msgid "RFU" msgstr "RFU" -#: ../geanypg/src/verify_aux.c:138 -#: ../geanypg/src/verify_aux.c:156 +#: ../geanypg/src/verify_aux.c:138 ../geanypg/src/verify_aux.c:156 msgid " wrong-key-usage" msgstr "Falsche Schlüsselnutzung" -#: ../geanypg/src/verify_aux.c:139 -#: ../geanypg/src/verify_aux.c:156 +#: ../geanypg/src/verify_aux.c:139 ../geanypg/src/verify_aux.c:156 msgid " chain-model" msgstr " Ketten-Modell. " -#: ../geanypg/src/verify_aux.c:140 -#: ../geanypg/src/verify_aux.c:157 +#: ../geanypg/src/verify_aux.c:140 ../geanypg/src/verify_aux.c:157 msgid "yes" msgstr "ja" -#: ../geanypg/src/verify_aux.c:140 -#: ../geanypg/src/verify_aux.c:157 +#: ../geanypg/src/verify_aux.c:140 ../geanypg/src/verify_aux.c:157 msgid "no" msgstr "nein" @@ -3905,9 +4111,8 @@ msgid "Open a signature file" msgstr "Eine Signaturendatei öffnen" -#: ../geanyprj/src/geanyprj.c:38 -#: ../geanyprj/src/sidebar.c:456 -#: ../gproject/src/gproject-sidebar.c:822 +#: ../geanyprj/src/geanyprj.c:38 ../geanyprj/src/sidebar.c:456 +#: ../gproject/src/gproject-sidebar.c:870 msgid "Project" msgstr "Projekt" @@ -3927,8 +4132,7 @@ msgid "Project Preferences" msgstr "Projekteigenschaften" -#: ../geanyprj/src/menu.c:101 -#: ../geanyprj/src/menu.c:377 +#: ../geanyprj/src/menu.c:101 ../geanyprj/src/menu.c:377 #: ../geanyprj/src/sidebar.c:172 msgid "New Project" msgstr "Neues Projekt" @@ -3937,8 +4141,7 @@ msgid "C_reate" msgstr "_Erstellen" -#: ../geanyprj/src/menu.c:123 -#: ../scope/data/scope.glade.h:116 +#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:114 msgid "Name:" msgstr "Name:" @@ -3955,8 +4158,15 @@ msgstr "Basisverzeichnis:" #: ../geanyprj/src/menu.c:160 -msgid "Base directory of all files that make up the project. This can be a new path, or an existing directory tree. You can use paths relative to the project filename." -msgstr "Basisverzeichnis aller Dateien, die zu einem Projekt gehören. Es kann sowohl ein bereits existierender als auch ein neu zu erstellendes Verzeichnis sein. Weiter kann der Pfad sowohl in relativer als auch absoluter Form eingegeben werden." +msgid "" +"Base directory of all files that make up the project. This can be a new " +"path, or an existing directory tree. You can use paths relative to the " +"project filename." +msgstr "" +"Basisverzeichnis aller Dateien, die zu einem Projekt gehören. Es kann sowohl " +"ein bereits existierender als auch ein neu zu erstellendes Verzeichnis sein. " +"Weiter kann der Pfad sowohl in relativer als auch absoluter Form eingegeben " +"werden." #: ../geanyprj/src/menu.c:163 msgid "Choose Project Base Path" @@ -3967,8 +4177,14 @@ msgstr "Dateiliste beim Laden erzeugen" #: ../geanyprj/src/menu.c:172 -msgid "Automatically add files that match project type on project load automatically. You can't manually add/remove files if you checked this option, since your modification will be lost on on next project load" -msgstr "Fügt Dateien, die dem Projekt-Typ entsprechen, automatisch beim Laden dem Projekte hinzu. Manuelles Hinzufügen oder Löschen von Dateien ist dann nicht möglich, Änderungen würden beim nächsten Laden überschrieben werden." +msgid "" +"Automatically add files that match project type on project load " +"automatically. You can't manually add/remove files if you checked this " +"option, since your modification will be lost on on next project load" +msgstr "" +"Fügt Dateien, die dem Projekt-Typ entsprechen, automatisch beim Laden dem " +"Projekte hinzu. Manuelles Hinzufügen oder Löschen von Dateien ist dann nicht " +"möglich, Änderungen würden beim nächsten Laden überschrieben werden." #: ../geanyprj/src/menu.c:180 msgid "Type:" @@ -3983,23 +4199,19 @@ msgid "_Project" msgstr "_Projekt" -#: ../geanyprj/src/menu.c:386 -#: ../geanyprj/src/sidebar.c:181 +#: ../geanyprj/src/menu.c:386 ../geanyprj/src/sidebar.c:181 msgid "Delete Project" msgstr "Projekt löschen" -#: ../geanyprj/src/menu.c:397 -#: ../geanyprj/src/sidebar.c:194 +#: ../geanyprj/src/menu.c:397 ../geanyprj/src/sidebar.c:194 msgid "Add File" msgstr "Datei hinzufügen" -#: ../geanyprj/src/menu.c:408 -#: ../geanyprj/src/sidebar.c:216 +#: ../geanyprj/src/menu.c:408 ../geanyprj/src/sidebar.c:216 msgid "Preferences" msgstr "Einstellungen" -#: ../geanyprj/src/menu.c:419 -#: ../geanyprj/src/sidebar.c:229 +#: ../geanyprj/src/menu.c:419 ../geanyprj/src/sidebar.c:229 msgid "Find in Project" msgstr "Im Projekt suchen" @@ -4007,8 +4219,7 @@ msgid "Remove File" msgstr "Datei entfernen" -#: ../geanyprj/src/sidebar.c:240 -#: ../gproject/src/gproject-sidebar.c:803 +#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:849 msgid "H_ide Sidebar" msgstr "Seitenleiste _verstecken" @@ -4017,13 +4228,59 @@ msgid "Project \"%s\" opened." msgstr "Projekt »%s« geöffnet." +#: ../geanypy/src/geanypy-plugin.c:34 +msgid "GeanyPy" +msgstr "GeanyPy" + +#: ../geanypy/src/geanypy-plugin.c:35 +msgid "Python plugins support" +msgstr "Python für Plugins" + +#: ../geanypy/src/geanypy-plugin.c:77 +#, c-format +msgid "Unable to pre-load Python library: %s." +msgstr "Python-Bibliothek konnte nicht geladen werden: %s" + +#: ../geanypy/src/geanypy-plugin.c:157 +msgid "Failed to import manager module" +msgstr "Konnte manager-Modul nicht importieren" + +#: ../geanypy/src/geanypy-plugin.c:166 +msgid "Failed to retrieve PluginManager from manager module" +msgstr "Konnte den PluginManager aus dem manager-Modul nicht laden" + +#: ../geanypy/src/geanypy-plugin.c:182 +msgid "System plugin directory not found." +msgstr "Systemweites Plugin-Verzeichnis konnte nicht gefunden werden" + +#: ../geanypy/src/geanypy-plugin.c:211 +msgid "Unable to instantiate new PluginManager" +msgstr "Konnte keine neue Instanz der Plugin-Verwaltung anlegen." + +#: ../geanypy/src/geanypy-plugin.c:227 +msgid "Unable to get show_all() method on plugin manager" +msgstr "Konnte die Methode show_all() der Plugin-Verwaltung nicht finden." + +#: ../geanypy/src/geanypy-plugin.c:255 +#, c-format +msgid "Unable to create Python plugins directory: %s: %s" +msgstr "Konnte das Python-Plugin-Verzeichnis nicht anlegen: %s: %s" + +#: ../geanypy/src/geanypy-plugin.c:266 +msgid "Python Plugin Manager" +msgstr "Python Plugin-Verwaltung" + #: ../geanysendmail/src/geanysendmail.c:43 msgid "GeanySendMail" msgstr "GeanySendMail" #: ../geanysendmail/src/geanysendmail.c:44 -msgid "A little plugin to send the current file as attachment by user's favorite mailer" -msgstr "Ein Plugin zum Senden einer Datei als Anhang unter Verwendung eines E-Mail-Programms." +msgid "" +"A little plugin to send the current file as attachment by user's favorite " +"mailer" +msgstr "" +"Ein Plugin zum Senden einer Datei als Anhang unter Verwendung eines E-Mail-" +"Programms." # Ich sehe doppelt. #: ../geanysendmail/src/geanysendmail.c:98 @@ -4035,40 +4292,48 @@ msgid "Enter the recipient's e-mail address:" msgstr "E-Mail-Adresse des Empfängers:" -#: ../geanysendmail/src/geanysendmail.c:136 +#: ../geanysendmail/src/geanysendmail.c:138 msgid "Filename placeholder not found. The executed command might have failed." -msgstr "Konnte den Platzhalter für den Dateinamen nicht finden. Der angegebene Befehl könnte nicht korrekt ausgeführt worden sein." +msgstr "" +"Konnte den Platzhalter für den Dateinamen nicht finden. Der angegebene " +"Befehl könnte nicht korrekt ausgeführt worden sein." -#: ../geanysendmail/src/geanysendmail.c:142 -msgid "Recipient address placeholder not found. The executed command might have failed." -msgstr "Konnte den Platzhalter für den E-Mail-Empfänger nicht finden. Der angegebene Befehl könnte nicht korrekt ausgeführt worden sein." +#: ../geanysendmail/src/geanysendmail.c:144 +msgid "" +"Recipient address placeholder not found. The executed command might have " +"failed." +msgstr "" +"Konnte den Platzhalter für den E-Mail-Empfänger nicht finden. Der angegebene " +"Befehl könnte nicht korrekt ausgeführt worden sein." -#: ../geanysendmail/src/geanysendmail.c:157 +#: ../geanysendmail/src/geanysendmail.c:159 msgid "Could not execute mailer. Please check your configuration." -msgstr "Konnte das E-Mail-Programm nicht aufrufen. Bitte überprüfen Sie Ihre Einstellungen." +msgstr "" +"Konnte das E-Mail-Programm nicht aufrufen. Bitte überprüfen Sie Ihre " +"Einstellungen." -#: ../geanysendmail/src/geanysendmail.c:166 +#: ../geanysendmail/src/geanysendmail.c:168 msgid "Please define a mail client first." msgstr "Bitte ein E-Mail-Programm angeben!" -#: ../geanysendmail/src/geanysendmail.c:171 +#: ../geanysendmail/src/geanysendmail.c:173 msgid "File has to be saved before sending." msgstr "Die Datei muss vor dem Senden gespeichert werden." -#: ../geanysendmail/src/geanysendmail.c:187 +#: ../geanysendmail/src/geanysendmail.c:191 msgid "Mail" msgstr "E-Mail" -#: ../geanysendmail/src/geanysendmail.c:218 +#: ../geanysendmail/src/geanysendmail.c:222 msgid "Send by mail" msgstr "Per E-Mail senden" #. add a label and a text entry to the dialog -#: ../geanysendmail/src/geanysendmail.c:308 +#: ../geanysendmail/src/geanysendmail.c:312 msgid "Path and options for the mail client:" msgstr "Pfad und Optionen für das E-Mail-Programm:" -#: ../geanysendmail/src/geanysendmail.c:316 +#: ../geanysendmail/src/geanysendmail.c:320 msgid "" "Note: \n" "\t%f will be replaced by your file.\n" @@ -4086,30 +4351,37 @@ "\tsylpheed --attach \"%f\" --compose \"%r\"\n" "\tmutt -s \"Sending %b'\" -a \"%f\" \"%r\"" -#: ../geanysendmail/src/geanysendmail.c:326 +#: ../geanysendmail/src/geanysendmail.c:330 msgid "Show toolbar icon" msgstr "Werkzeugleistensymbol anzeigen" -#: ../geanysendmail/src/geanysendmail.c:328 +#: ../geanysendmail/src/geanysendmail.c:332 msgid "Shows a icon in the toolbar to send file more easy." -msgstr "Zeigt ein Symbol in der Werkzeugleiste an, sodass eine Datei einfacher versendet werden kann." +msgstr "" +"Zeigt ein Symbol in der Werkzeugleiste an, sodass eine Datei einfacher " +"versendet werden kann." -#: ../geanysendmail/src/geanysendmail.c:334 +#: ../geanysendmail/src/geanysendmail.c:338 msgid "Use dialog for entering email address of recipients" -msgstr "Dialog zum Eingeben der E-Mail-Adresse des Empfängers der zu sendenden Datei anzeigen" +msgstr "" +"Dialog zum Eingeben der E-Mail-Adresse des Empfängers der zu sendenden Datei " +"anzeigen" -#: ../geanysendmail/src/geanysendmail.c:356 +#: ../geanysendmail/src/geanysendmail.c:360 msgid "Send file by mail" msgstr "Per Mail senden" #. Build up menu entry -#: ../geanysendmail/src/geanysendmail.c:379 +#: ../geanysendmail/src/geanysendmail.c:383 msgid "_Mail document" msgstr "_Dokument versenden" -#: ../geanysendmail/src/geanysendmail.c:382 -msgid "Sends the opened file as unzipped attachment by any mailer from your $PATH" -msgstr "Sendet ein geöffnetes Dokument als unkomprimierten Anhang unter Verwendung eines E-Mail-Programms." +#: ../geanysendmail/src/geanysendmail.c:386 +msgid "" +"Sends the opened file as unzipped attachment by any mailer from your $PATH" +msgstr "" +"Sendet ein geöffnetes Dokument als unkomprimierten Anhang unter Verwendung " +"eines E-Mail-Programms." #: ../geanyvc/src/geanyvc.c:53 msgid "GeanyVC" @@ -4124,337 +4396,377 @@ msgid "geanyvc: s_spawn_sync error: %s" msgstr "geanyvc: s_spawn_sync error: %s" -#: ../geanyvc/src/geanyvc.c:609 -#: ../geanyvc/src/geanyvc.c:620 +#: ../geanyvc/src/geanyvc.c:561 +#, c-format +msgid "File %s: action %s executed via %s." +msgstr "Datei %s: Aktion %s wurde über %s ausgeführt." + +#: ../geanyvc/src/geanyvc.c:614 ../geanyvc/src/geanyvc.c:625 #, c-format msgid "geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'" msgstr "geanyvc: vcdiff_file_activated: Kann »%s« nicht in »%s« umbenennen." -#: ../geanyvc/src/geanyvc.c:646 -#: ../geanyvc/src/geanyvc.c:696 +#: ../geanyvc/src/geanyvc.c:651 ../geanyvc/src/geanyvc.c:701 msgid "No changes were made." msgstr "Es wurden keine Änderungen vorgenommen." -#: ../geanyvc/src/geanyvc.c:723 +#: ../geanyvc/src/geanyvc.c:728 msgid "No history available" msgstr "Keine Historie verfügbar" -#: ../geanyvc/src/geanyvc.c:916 -#: ../geanyvc/src/geanyvc.c:924 +#: ../geanyvc/src/geanyvc.c:921 ../geanyvc/src/geanyvc.c:929 #, c-format msgid "Do you really want to revert: %s?" msgstr "Möchten Sie wirklich »%s« zurücksetzen?" -#: ../geanyvc/src/geanyvc.c:932 +#: ../geanyvc/src/geanyvc.c:937 #, c-format msgid "Do you really want to add: %s?" msgstr "Möchten Sie wirklich »%s« hinzufügen?" -#: ../geanyvc/src/geanyvc.c:939 +#: ../geanyvc/src/geanyvc.c:944 #, c-format msgid "Do you really want to remove: %s?" msgstr "Möchten Sie wirklich »%s« entfernen?" -#: ../geanyvc/src/geanyvc.c:962 +#: ../geanyvc/src/geanyvc.c:967 msgid "Do you really want to update?" msgstr "Möchten Sie wirklich »%s« aktualisieren?" -#: ../geanyvc/src/geanyvc.c:1225 +#: ../geanyvc/src/geanyvc.c:1094 +msgid "" +"The resulting differences cannot be displayed because the changes are too " +"big to display here and would slow down the UI significantly.\n" +"\n" +"To view the differences, cancel this dialog and open the differences in " +"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)." +msgstr "" +"Die Veränderungen können hier nicht angezeigt werden, da sie zu viele sind. " +"Andernfalls könnte es passieren, dass die Anzeige unbenutzbar wird.\n" +"Um sich dennoch die Änderungen anzeigen zu lessen, benutzen Sie einfach die " +"Diff-Funktion aus dem GeanyVC-Unterpunktes innerhalb des Werkzeuge-Menüs." + +#: ../geanyvc/src/geanyvc.c:1243 msgid "Commit Y/N" msgstr "Übertragen" -#: ../geanyvc/src/geanyvc.c:1235 +#: ../geanyvc/src/geanyvc.c:1253 msgid "Status" msgstr "Status" -#: ../geanyvc/src/geanyvc.c:1242 +#: ../geanyvc/src/geanyvc.c:1260 msgid "Path" msgstr "Pfad" -#: ../geanyvc/src/geanyvc.c:1330 +#: ../geanyvc/src/geanyvc.c:1324 +#, c-format +msgid "Line: %d Column: %d" +msgstr "Zeile: %d Spalte: %d" + +#: ../geanyvc/src/geanyvc.c:1370 msgid "Commit" msgstr "Übertragen" -#: ../geanyvc/src/geanyvc.c:1372 +#: ../geanyvc/src/geanyvc.c:1412 msgid "_De-/select all files" msgstr "Alle _Dateien aus- bzw. abwählen" -#: ../geanyvc/src/geanyvc.c:1413 +#: ../geanyvc/src/geanyvc.c:1456 msgid "Commit message:" msgstr "Commitnachricht:" -#: ../geanyvc/src/geanyvc.c:1426 +#: ../geanyvc/src/geanyvc.c:1475 msgid "C_ommit" msgstr "Über_tragen" -#: ../geanyvc/src/geanyvc.c:1500 +#: ../geanyvc/src/geanyvc.c:1556 msgid "Nothing to commit." msgstr "Nichts zum Übertragen." -#: ../geanyvc/src/geanyvc.c:1546 +#: ../geanyvc/src/geanyvc.c:1602 #, c-format msgid "Error initializing spell checking: %s" msgstr "Fehler beim Initialisieren der Rechtschreibprüfung: %s" -#: ../geanyvc/src/geanyvc.c:1558 +#: ../geanyvc/src/geanyvc.c:1614 #, c-format -msgid "Error while setting up language for spellchecking. Please check configuration. Error message was: %s" -msgstr "Fehler beim Auswählen der Sprache für die Rechtschreibprüfung. Bitte überprüfen Sie Ihre Konfiguration. Fehlermeldung: %s" +msgid "" +"Error while setting up language for spellchecking. Please check " +"configuration. Error message was: %s" +msgstr "" +"Fehler beim Auswählen der Sprache für die Rechtschreibprüfung. Bitte " +"überprüfen Sie Ihre Konfiguration. Fehlermeldung: %s" -#: ../geanyvc/src/geanyvc.c:1834 +#: ../geanyvc/src/geanyvc.c:1890 msgid "Set Changed-flag for document tabs created by the plugin" msgstr "Vom Plugin erstellte Dokumente als geändert markieren" -#: ../geanyvc/src/geanyvc.c:1837 -msgid "If this option is activated, every new by the VC-plugin created document tab will be marked as changed. Even this option is useful in some cases, it could cause a big number of annoying \"Do you want to save\"-dialogs." -msgstr "Wenn diese Option aktiviert ist, werden alle Dokumente, die durch das Plugin erzeugt werden, als geändert markiert, so dass z.B. beim Schließen der Datei der Speichern-Dialog geöffnet wird. Auch wenn diese Option von Zeit zu Zeit sehr nützlich sein kann, kann sie ab und an einfach nur stören." +#: ../geanyvc/src/geanyvc.c:1893 +msgid "" +"If this option is activated, every new by the VC-plugin created document tab " +"will be marked as changed. Even this option is useful in some cases, it " +"could cause a big number of annoying \"Do you want to save\"-dialogs." +msgstr "" +"Wenn diese Option aktiviert ist, werden alle Dokumente, die durch das Plugin " +"erzeugt werden, als geändert markiert, so dass z.B. beim Schließen der Datei " +"der Speichern-Dialog geöffnet wird. Auch wenn diese Option von Zeit zu Zeit " +"sehr nützlich sein kann, kann sie ab und an einfach nur stören." -#: ../geanyvc/src/geanyvc.c:1845 +#: ../geanyvc/src/geanyvc.c:1901 msgid "Confirm adding new files to a VCS" msgstr "Hinzufügen von Dateien zur Versionsverwaltung immer bestätigen" -#: ../geanyvc/src/geanyvc.c:1848 +#: ../geanyvc/src/geanyvc.c:1904 msgid "Shows a confirmation dialog on adding a new (created) file to VCS." -msgstr "Zeigt einen Bestätigungsdialog beim Hinzufügen von Dateien zu einem Versionsverwaltungssystem." +msgstr "" +"Zeigt einen Bestätigungsdialog beim Hinzufügen von Dateien zu einem " +"Versionsverwaltungssystem." -#: ../geanyvc/src/geanyvc.c:1854 +#: ../geanyvc/src/geanyvc.c:1910 msgid "Maximize commit dialog" msgstr "Commit-Dialog maximieren" -#: ../geanyvc/src/geanyvc.c:1855 +#: ../geanyvc/src/geanyvc.c:1911 msgid "Show commit dialog maximize." msgstr "Commit-Dialog beim Anzeigen maximieren" -#: ../geanyvc/src/geanyvc.c:1861 +#: ../geanyvc/src/geanyvc.c:1917 msgid "Use external diff viewer" msgstr "Externes Diff-Programm" -#: ../geanyvc/src/geanyvc.c:1863 +#: ../geanyvc/src/geanyvc.c:1919 msgid "Use external diff viewer for file diff." msgstr "Externes Diff-Programm zum Vergleich von zwei Dateien" -#: ../geanyvc/src/geanyvc.c:1869 +#: ../geanyvc/src/geanyvc.c:1925 msgid "Show VC entries at editor menu" msgstr "Funktionen über das Editormenü verfügbar machen" -#: ../geanyvc/src/geanyvc.c:1871 +#: ../geanyvc/src/geanyvc.c:1927 msgid "Show entries for VC functions inside editor menu" msgstr "Einträge für das Plugin im Editormenü anzeigen" -#: ../geanyvc/src/geanyvc.c:1876 +#: ../geanyvc/src/geanyvc.c:1932 msgid "Attach menu to menubar" msgstr "Menü an Menüleiste anhängen" -#: ../geanyvc/src/geanyvc.c:1878 -msgid "Whether menu for this plugin are getting placed either inside tools menu or directly inside Geany's menubar.Will take in account after next start of GeanyVC" -msgstr "Das Menü für dieses Plugin kann entweder im Werkzeugmenü oder direkt in der Menüleiste von Geany angezeigt werden. Dies wird erst nach einen Neustart von GeanyVC funktionieren" +#: ../geanyvc/src/geanyvc.c:1934 +msgid "" +"Whether menu for this plugin are getting placed either inside tools menu or " +"directly inside Geany's menubar.Will take in account after next start of " +"GeanyVC" +msgstr "" +"Das Menü für dieses Plugin kann entweder im Werkzeugmenü oder direkt in der " +"Menüleiste von Geany angezeigt werden. Dies wird erst nach einen Neustart " +"von GeanyVC funktionieren" -#: ../geanyvc/src/geanyvc.c:1886 +#: ../geanyvc/src/geanyvc.c:1942 msgid "Enable CVS" msgstr "CVS aktivieren" -#: ../geanyvc/src/geanyvc.c:1891 +#: ../geanyvc/src/geanyvc.c:1947 msgid "Enable GIT" msgstr "GIT aktivieren" -#: ../geanyvc/src/geanyvc.c:1896 +#: ../geanyvc/src/geanyvc.c:1952 msgid "Enable SVN" msgstr "SVN aktivieren" -#: ../geanyvc/src/geanyvc.c:1901 +#: ../geanyvc/src/geanyvc.c:1957 msgid "Enable SVK" msgstr "SVK aktivieren" -#: ../geanyvc/src/geanyvc.c:1906 +#: ../geanyvc/src/geanyvc.c:1962 msgid "Enable Bazaar" msgstr "Bazaar aktivieren" -#: ../geanyvc/src/geanyvc.c:1911 +#: ../geanyvc/src/geanyvc.c:1967 msgid "Enable Mercurial" msgstr "Mercurial aktivieren" -#: ../geanyvc/src/geanyvc.c:1917 +#: ../geanyvc/src/geanyvc.c:1973 msgid "Spellcheck language" msgstr "Sprache:" -#: ../geanyvc/src/geanyvc.c:2008 +#: ../geanyvc/src/geanyvc.c:2064 msgid "_VC file Actions" msgstr "_VC Dateioperationen" #. Diff of current file #. Diff of the current dir #. Complete diff of base directory -#: ../geanyvc/src/geanyvc.c:2014 -#: ../geanyvc/src/geanyvc.c:2091 -#: ../geanyvc/src/geanyvc.c:2131 +#: ../geanyvc/src/geanyvc.c:2070 ../geanyvc/src/geanyvc.c:2147 +#: ../geanyvc/src/geanyvc.c:2187 msgid "_Diff" msgstr "_Unterschiede anzeigen (diff)" -#: ../geanyvc/src/geanyvc.c:2017 +#: ../geanyvc/src/geanyvc.c:2073 msgid "Make a diff from the current active file" msgstr "Erstellt ein Diff für die aktuelle Datei." #. Revert current file #. Revert current dir #. Revert everything -#: ../geanyvc/src/geanyvc.c:2022 -#: ../geanyvc/src/geanyvc.c:2100 -#: ../geanyvc/src/geanyvc.c:2139 +#: ../geanyvc/src/geanyvc.c:2078 ../geanyvc/src/geanyvc.c:2156 +#: ../geanyvc/src/geanyvc.c:2195 msgid "_Revert" msgstr "_Zurücksetzen" -#: ../geanyvc/src/geanyvc.c:2025 +#: ../geanyvc/src/geanyvc.c:2081 msgid "Restore pristine working copy file (undo local edits)." -msgstr "Stellt den ursprünglichen Zustand der Datei wieder her (verwirft lokale Änderungen)." +msgstr "" +"Stellt den ursprünglichen Zustand der Datei wieder her (verwirft lokale " +"Änderungen)." #. Blame for current file -#: ../geanyvc/src/geanyvc.c:2034 +#: ../geanyvc/src/geanyvc.c:2090 msgid "_Blame" msgstr "Ä_nderungsverfolgung (blame)" -#: ../geanyvc/src/geanyvc.c:2037 +#: ../geanyvc/src/geanyvc.c:2093 msgid "Shows the changes made at one file per revision and author." msgstr "Zeigt alle Änderungen einer Datei nach Autor und Revision." #. History/log of current file #. History/log of the current dir #. Complete History/Log of base directory -#: ../geanyvc/src/geanyvc.c:2044 -#: ../geanyvc/src/geanyvc.c:2110 -#: ../geanyvc/src/geanyvc.c:2151 +#: ../geanyvc/src/geanyvc.c:2100 ../geanyvc/src/geanyvc.c:2166 +#: ../geanyvc/src/geanyvc.c:2207 msgid "_History (log)" msgstr "_Versionsgeschichte (log)" -#: ../geanyvc/src/geanyvc.c:2047 +#: ../geanyvc/src/geanyvc.c:2103 msgid "Shows the log of the current file" msgstr "Zeigt die Versionsgeschichte der aktuellen Datei an." #. base version of the current file -#: ../geanyvc/src/geanyvc.c:2052 +#: ../geanyvc/src/geanyvc.c:2108 msgid "_Original" msgstr "_Original" -#: ../geanyvc/src/geanyvc.c:2055 +#: ../geanyvc/src/geanyvc.c:2111 msgid "Shows the original of the current file" msgstr "Zeigt die unveränderte Datei an" #. add current file -#: ../geanyvc/src/geanyvc.c:2063 +#: ../geanyvc/src/geanyvc.c:2119 msgid "_Add to Version Control" msgstr "Zur _Versionskontrolle hinzufügen" -#: ../geanyvc/src/geanyvc.c:2065 +#: ../geanyvc/src/geanyvc.c:2121 msgid "Add file to repository." msgstr "Fügt eine Datei zur Versionskontrolle hin_zu." #. remove current file -#: ../geanyvc/src/geanyvc.c:2071 +#: ../geanyvc/src/geanyvc.c:2127 msgid "_Remove from Version Control" msgstr "Aus Versionskontrolle _entfernen" -#: ../geanyvc/src/geanyvc.c:2073 +#: ../geanyvc/src/geanyvc.c:2129 msgid "Remove file from repository." msgstr "Entfernt eine Datei aus Versionskontrolle und Repository." -#: ../geanyvc/src/geanyvc.c:2088 +#: ../geanyvc/src/geanyvc.c:2144 msgid "_Directory" msgstr "_Verzeichnis" -#: ../geanyvc/src/geanyvc.c:2094 +#: ../geanyvc/src/geanyvc.c:2150 msgid "Make a diff from the directory of the current active file" msgstr "Erstellt ein Diff für das Verzeichnis der aktuellen Datei." -#: ../geanyvc/src/geanyvc.c:2103 +#: ../geanyvc/src/geanyvc.c:2159 msgid "Restore original files in the current folder (undo local edits)." -msgstr "Stellt den ursprünglichen Zustand der Datei wieder her (verwirft lokale Änderungen)." +msgstr "" +"Stellt den ursprünglichen Zustand der Datei wieder her (verwirft lokale " +"Änderungen)." -#: ../geanyvc/src/geanyvc.c:2113 +#: ../geanyvc/src/geanyvc.c:2169 msgid "Shows the log of the current directory" msgstr "Zeigt die Versionsgeschichte für das aktuelle Verzeichnis." -#: ../geanyvc/src/geanyvc.c:2127 +#: ../geanyvc/src/geanyvc.c:2183 msgid "_Base Directory" msgstr "_Basisordner" -#: ../geanyvc/src/geanyvc.c:2133 +#: ../geanyvc/src/geanyvc.c:2189 msgid "Make a diff from the top VC directory" msgstr "Erstellt ein Diff für die gesamte Arbeitskopie" -#: ../geanyvc/src/geanyvc.c:2141 +#: ../geanyvc/src/geanyvc.c:2197 msgid "Revert any local edits." msgstr "Alle lokalen Änderungen zurücksetzen" -#: ../geanyvc/src/geanyvc.c:2154 +#: ../geanyvc/src/geanyvc.c:2210 msgid "Shows the log of the top VC directory" msgstr "Zeigt die Versionsgeschichte für die gesamte Arbeitskopie" -#: ../geanyvc/src/geanyvc.c:2180 +#: ../geanyvc/src/geanyvc.c:2236 msgid "VC _Commit" msgstr "VC Über_tragen" -#: ../geanyvc/src/geanyvc.c:2215 +#: ../geanyvc/src/geanyvc.c:2271 msgid "Show diff of file" msgstr "Diff von der aktuellen Datei" -#: ../geanyvc/src/geanyvc.c:2217 +#: ../geanyvc/src/geanyvc.c:2273 msgid "Show diff of directory" msgstr "Zeigt Veränderung des Verzeichnisses an (diff)" -#: ../geanyvc/src/geanyvc.c:2219 +#: ../geanyvc/src/geanyvc.c:2275 msgid "Show diff of basedir" msgstr "Diff vom Grundverzeichnis" -#: ../geanyvc/src/geanyvc.c:2222 +#: ../geanyvc/src/geanyvc.c:2278 msgid "Commit changes" msgstr "Änderungen übertragen" -#: ../geanyvc/src/geanyvc.c:2224 +#: ../geanyvc/src/geanyvc.c:2280 msgid "Show status" msgstr "Status der Arbeitskopie anzeigen" -#: ../geanyvc/src/geanyvc.c:2226 +#: ../geanyvc/src/geanyvc.c:2282 msgid "Revert single file" msgstr "Datei zurücksetzen" -#: ../geanyvc/src/geanyvc.c:2228 +#: ../geanyvc/src/geanyvc.c:2284 msgid "Revert directory" msgstr "Verzeichnis zurücksetzen" -#: ../geanyvc/src/geanyvc.c:2230 +#: ../geanyvc/src/geanyvc.c:2286 msgid "Revert base directory" msgstr "Alle Änderungen verwerfen" -#: ../geanyvc/src/geanyvc.c:2232 +#: ../geanyvc/src/geanyvc.c:2288 msgid "Update file" msgstr "Datei aktualisieren" -#: ../geanyvc/src/geanyvc.c:2260 +#: ../geanyvc/src/geanyvc.c:2316 msgid "_VC" msgstr "_VC" -#: ../geanyvc/src/geanyvc.c:2266 +#: ../geanyvc/src/geanyvc.c:2322 msgid "_Version Control" msgstr "_Versionskontrolle" #. Status of basedir -#: ../geanyvc/src/geanyvc.c:2288 +#: ../geanyvc/src/geanyvc.c:2344 msgid "_Status" msgstr "_Status" -#: ../geanyvc/src/geanyvc.c:2290 +#: ../geanyvc/src/geanyvc.c:2346 msgid "Show status." msgstr "Zeigt den Status der Arbeitskopie." -#: ../geanyvc/src/geanyvc.c:2297 +#: ../geanyvc/src/geanyvc.c:2353 msgid "Update from remote repository." msgstr "Aus dem Repositorium aktualisieren" #. Commit all changes -#: ../geanyvc/src/geanyvc.c:2302 +#: ../geanyvc/src/geanyvc.c:2358 msgid "_Commit" msgstr "Über_tragen" -#: ../geanyvc/src/geanyvc.c:2304 +#: ../geanyvc/src/geanyvc.c:2360 msgid "Commit changes." msgstr "Änderungen übertragen." @@ -4483,7 +4795,9 @@ msgid "" "Your paste can be found here:\n" "%s" -msgstr "Der gesendete Inhalt kann jetzt hier betrachtet werden: %s" +msgstr "" +"Der gesendete Inhalt kann jetzt hier betrachtet werden: %s" #: ../geniuspaste/src/geniuspaste.c:403 #, c-format @@ -4491,12 +4805,15 @@ "Unable to paste the code. Check your connection and retry.\n" "Error code: %d\n" msgstr "" -"Kann den Code nicht ablegen. Überprüfen Sie Ihre Verbindung und versuchen Sie es erneut.\n" +"Kann den Code nicht ablegen. Überprüfen Sie Ihre Verbindung und versuchen " +"Sie es erneut.\n" "Fehlercode: %d\n" #: ../geniuspaste/src/geniuspaste.c:416 msgid "There are no opened documents. Open one and retry.\n" -msgstr "Momentan sind keine Dokumente geöffnet. Öffnen Sie eines und versuchen Sie es erneut.\n" +msgstr "" +"Momentan sind keine Dokumente geöffnet. Öffnen Sie eines und versuchen Sie " +"es erneut.\n" #: ../geniuspaste/src/geniuspaste.c:429 msgid "The author name field is empty!" @@ -4518,8 +4835,7 @@ msgid "_Paste it!" msgstr "Zu _Pastebin senden" -#: ../gproject/src/gproject-main.c:36 -#: ../gproject/src/gproject-project.c:455 +#: ../gproject/src/gproject-main.c:36 ../gproject/src/gproject-project.c:455 msgid "GProject" msgstr "GProject" @@ -4560,111 +4876,132 @@ msgstr "Quelltextmuster:" #: ../gproject/src/gproject-project.c:412 -msgid "Space separated list of patterns that are used to identify source files." -msgstr "Leerzeichengetrennte Liste mit Mustern, die genutzt werden, um Quelldateien zu identifizieren." +msgid "" +"Space separated list of patterns that are used to identify source files." +msgstr "" +"Leerzeichengetrennte Liste mit Mustern, die genutzt werden, um Quelldateien " +"zu identifizieren." #: ../gproject/src/gproject-project.c:417 msgid "Header patterns:" msgstr "Header-Muster:" #: ../gproject/src/gproject-project.c:423 -msgid "Space separated list of patterns that are used to identify headers. Used mainly for header/source swapping." -msgstr "Leerzeichengetrennte Liste mit Mustern, die genutzt werden, um Header zu identifizieren. Wird hauptsächlich für das Umschalten zwischen Quellen und Header verwendet." +msgid "" +"Space separated list of patterns that are used to identify headers. Used " +"mainly for header/source swapping." +msgstr "" +"Leerzeichengetrennte Liste mit Mustern, die genutzt werden, um Header zu " +"identifizieren. Wird hauptsächlich für das Umschalten zwischen Quellen und " +"Header verwendet." #: ../gproject/src/gproject-project.c:429 msgid "Ignored dirs patterns:" msgstr "Muster für zu ignorierende Verzeichnisse:" #: ../gproject/src/gproject-project.c:435 -msgid "Space separated list of patterns that are used to identify directories that are not scanned for source files." -msgstr "Leerzeichengetrennte Liste mit Mustern, die genutzt werden, um Verzeichnisse zu erkennen, die nicht nach Quelldateien durchsucht werden sollen. " +msgid "" +"Space separated list of patterns that are used to identify directories that " +"are not scanned for source files." +msgstr "" +"Leerzeichengetrennte Liste mit Mustern, die genutzt werden, um Verzeichnisse " +"zu erkennen, die nicht nach Quelldateien durchsucht werden sollen. " #: ../gproject/src/gproject-project.c:443 msgid "Generate tags for all project files" msgstr "Tags für alle Projektdateien erstellen" #: ../gproject/src/gproject-project.c:445 -msgid "Generate tag list for all project files instead of only for the currently opened files. Too slow for big projects (>1000 files) and should be disabled in this case." -msgstr "Erstellt Tags für alle Projektdateien, anstatt nur für die jeweils geöffneten Dateien. Sehr langsam bei großen Projekten (>1000 Dateien) und sollte in solch einem Fall deaktiviert werden." +msgid "" +"Generate tag list for all project files instead of only for the currently " +"opened files. Too slow for big projects (>1000 files) and should be disabled " +"in this case." +msgstr "" +"Erstellt Tags für alle Projektdateien, anstatt nur für die jeweils " +"geöffneten Dateien. Sehr langsam bei großen Projekten (>1000 Dateien) und " +"sollte in solch einem Fall deaktiviert werden." #: ../gproject/src/gproject-project.c:451 -msgid "Note: set the patterns of files belonging to the project under the Project tab." -msgstr "Anmerkung: Die Muster der Dateien, die zu einem Projekt gehören, können im Projekttab gesetzt werden." +msgid "" +"Note: set the patterns of files belonging to the project under the Project " +"tab." +msgstr "" +"Anmerkung: Die Muster der Dateien, die zu einem Projekt gehören, können im " +"Projekttab gesetzt werden." -#: ../gproject/src/gproject-sidebar.c:81 -#: ../gproject/src/gproject-sidebar.c:792 +#: ../gproject/src/gproject-sidebar.c:90 +#: ../gproject/src/gproject-sidebar.c:838 msgid "Find File" msgstr "Datei suchen" -#: ../gproject/src/gproject-sidebar.c:108 +#: ../gproject/src/gproject-sidebar.c:117 msgid "Search inside:" msgstr "Suchen in:" -#: ../gproject/src/gproject-sidebar.c:120 +#: ../gproject/src/gproject-sidebar.c:129 msgid "C_ase sensitive" msgstr "_Groß-/Kleinschreibung beachten" -#: ../gproject/src/gproject-sidebar.c:123 +#: ../gproject/src/gproject-sidebar.c:132 msgid "Search in full path" msgstr "Im vollen Pfad suchen" -#: ../gproject/src/gproject-sidebar.c:702 +#: ../gproject/src/gproject-sidebar.c:745 msgid "Reload all" msgstr "Alle neuladen" -#: ../gproject/src/gproject-sidebar.c:711 -#: ../treebrowser/src/treebrowser.c:1282 +#: ../gproject/src/gproject-sidebar.c:754 +#: ../treebrowser/src/treebrowser.c:1283 msgid "Expand all" msgstr "Alle ausklappen" -#: ../gproject/src/gproject-sidebar.c:717 -#: ../treebrowser/src/treebrowser.c:1286 +#: ../gproject/src/gproject-sidebar.c:761 +#: ../treebrowser/src/treebrowser.c:1287 msgid "Collapse all" msgstr "Alle einklappen" -#: ../gproject/src/gproject-sidebar.c:726 +#: ../gproject/src/gproject-sidebar.c:771 msgid "Follow active editor" msgstr "Aktiven Editor folgen" -#: ../gproject/src/gproject-sidebar.c:774 +#: ../gproject/src/gproject-sidebar.c:820 msgid "Expand All" msgstr "Alle ausklappen" -#: ../gproject/src/gproject-sidebar.c:783 -#: ../treebrowser/src/treebrowser.c:1234 +#: ../gproject/src/gproject-sidebar.c:829 msgid "Find in Files" msgstr "In Dateien finden" #. POSITION OF VIEW -#: ../markdown/src/conf.c:572 +#: ../markdown/src/conf.c:567 msgid "Position:" msgstr "Position:" -#: ../markdown/src/conf.c:578 +#: ../markdown/src/conf.c:573 msgid "Sidebar" msgstr "Seitenleiste" -#: ../markdown/src/conf.c:586 +#: ../markdown/src/conf.c:581 msgid "Message Window" msgstr "Meldungsfenster" -#: ../markdown/src/conf.c:600 +#: ../markdown/src/conf.c:595 msgid "Font:" msgstr "Schriftart:" -#: ../markdown/src/conf.c:618 +#: ../markdown/src/conf.c:612 msgid "Code Font:" msgstr "Editor-Schriftart" -#: ../markdown/src/conf.c:636 +#: ../markdown/src/conf.c:629 msgid "BG Color:" msgstr "Hintergrundfarbe:" -#: ../markdown/src/conf.c:653 +#: ../markdown/src/conf.c:645 msgid "FG Color:" msgstr "Vordergrundfarbe" -#: ../markdown/src/conf.c:672 +#: ../markdown/src/conf.c:663 msgid "Select Template File" msgstr "Vorlagendatei auswählen" @@ -4680,6 +5017,165 @@ msgid "The current document does not have a Markdown filetype." msgstr "Das aktuelle Dokument ist nicht vom Markdown-Dateityp." +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:35 +msgid "Pair Tag Highlighter" +msgstr "PairTagHighlighter" + +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:36 +msgid "Finds and highlights matching opening/closing HTML tag" +msgstr "Findet und hebt passende öffende und schließende HTML-Tags" + +#: ../pohelper/data/menus.ui.h:1 +msgid "_Translation Helper" +msgstr "_Übersetzungs-Helfer" + +#: ../pohelper/data/menus.ui.h:2 +msgid "_Previous String" +msgstr "_Vorheriger String" + +#: ../pohelper/data/menus.ui.h:3 ../pohelper/src/gph-plugin.c:1034 +msgid "Go to previous string" +msgstr "Zum vorherigen String gehen" + +#: ../pohelper/data/menus.ui.h:4 +msgid "_Next String" +msgstr "_Nächster String" + +#: ../pohelper/data/menus.ui.h:5 ../pohelper/src/gph-plugin.c:1037 +msgid "Go to next string" +msgstr "Zur nächsten String gehen" + +#: ../pohelper/data/menus.ui.h:6 +msgid "Pre_vious Untranslated" +msgstr "_Vorheringe nicht übersetze Zeichenkette" + +#: ../pohelper/data/menus.ui.h:7 ../pohelper/src/gph-plugin.c:1040 +msgid "Go to previous untranslated string" +msgstr "Geht zu der vorherigen, noch nicht übersetzen Zeichenkette." + +#: ../pohelper/data/menus.ui.h:8 +msgid "Next _Untranslated" +msgstr "Nächste nicht übersetzte Zeichenkette" + +#: ../pohelper/data/menus.ui.h:9 ../pohelper/src/gph-plugin.c:1043 +msgid "Go to next untranslated string" +msgstr "Geht zu der nächsten, noch nicht übersetzten Zeichenkette." + +#: ../pohelper/data/menus.ui.h:10 +msgid "Previous Fu_zzy" +msgstr "Vorhergehende unklare Übersetzung" + +#: ../pohelper/data/menus.ui.h:11 ../pohelper/src/gph-plugin.c:1046 +msgid "Go to previous fuzzily translated string" +msgstr "Springt zur vorhergehenden, unklaren (fuzzy) Übersetzung" + +#: ../pohelper/data/menus.ui.h:12 +msgid "Next _Fuzzy" +msgstr "Nächste _unklare Übersetzung" + +#: ../pohelper/data/menus.ui.h:13 ../pohelper/src/gph-plugin.c:1049 +msgid "Go to next fuzzily translated string" +msgstr "Gehe zur nächsten unklaren Übersetzung" + +#: ../pohelper/data/menus.ui.h:14 +msgid "Previous Untranslated or Fuzz_y" +msgstr "Vorherige u_nübersetzt oder -klar." + +#: ../pohelper/data/menus.ui.h:15 ../pohelper/src/gph-plugin.c:1052 +msgid "Go to previous untranslated or fuzzy string" +msgstr "Gehe zum vorherigen unklaren oder unübersetzen String" + +#: ../pohelper/data/menus.ui.h:16 +msgid "Next Untranslated _or Fuzzy" +msgstr "Nächste unübersetzte oder -klare Übersetzung" + +#: ../pohelper/data/menus.ui.h:17 ../pohelper/src/gph-plugin.c:1056 +msgid "Go to next untranslated or fuzzy string" +msgstr "Springt zum nächsten unklaren (fuzzy) oder unübersetzen String" + +#: ../pohelper/data/menus.ui.h:18 ../pohelper/src/gph-plugin.c:1067 +msgid "Toggle current translation fuzziness" +msgstr "Status der Übersetzungung umschalten (Fuzzy)" + +#: ../pohelper/data/menus.ui.h:19 +msgid "_Toggle Fuzziness" +msgstr "_Status tauschen" + +#: ../pohelper/data/menus.ui.h:20 +msgid "Paste _Message as Translation" +msgstr "Originalstring als Übersetzung verwenden" + +#: ../pohelper/data/menus.ui.h:21 +msgid "Paste the original untranslated string to the translation" +msgstr "" +"Benutzt die unübersetze Ausgabe, um diese auch in der übersetzen Form " +"anzuzeigen." + +#: ../pohelper/data/menus.ui.h:22 ../pohelper/src/gph-plugin.c:1064 +msgid "Reflow the current translation string" +msgstr "Aktuelle Übersetzungen neu umbrechen" + +#: ../pohelper/data/menus.ui.h:23 +msgid "_Reflow Translation" +msgstr "_Übersetzungen neu umbrechen" + +#: ../pohelper/data/menus.ui.h:24 +msgid "" +"Whether to update the translation headers (author, revision date, ...) upon " +"file save" +msgstr "" +"Legt fest, ob die Metadaten der Übersetzungsdatei (Autor, Datum ... ) beim " +"Speichern aktualisiert werden sollen." + +#: ../pohelper/data/menus.ui.h:25 +msgid "Update _Headers Upon Save" +msgstr "Metadaten beim Speichern aktualisieren" + +#: ../pohelper/src/gph-plugin.c:41 +msgid "Translation Helper" +msgstr "Übersetzungshelfer" + +#: ../pohelper/src/gph-plugin.c:42 +msgid "Improves support for GetText translation files." +msgstr "Verbessert die Unterstützung für GetText-Übersetzungsdateien" + +#: ../pohelper/src/gph-plugin.c:1060 +msgid "Paste original untranslated string to translation" +msgstr "Orignalen String als Übersetzung nutzen" + +#: ../pohelper/src/gph-plugin.c:1102 +#, c-format +msgid "Failed to load configuration file: %s" +msgstr "Konnte Konfiguration nicht laden: %s" + +#: ../pohelper/src/gph-plugin.c:1127 +#, c-format +msgid "Failed to create configuration directory \"%s\": %s" +msgstr "Konnte das Konfigurationsverzeichnis »%s« nicht anelgen: %s" + +#: ../pohelper/src/gph-plugin.c:1130 +#, c-format +msgid "Failed to save configuration file: %s" +msgstr "Konnte Konfiguration nicht speichern: %s" + +#: ../pohelper/src/gph-plugin.c:1185 +#, c-format +msgid "" +"Failed to load UI definition, please check your installation. The error was: " +"%s" +msgstr "" +"Das grafische Elemente des Plugins konnte nicht korrekt geladen werden.\n" +"Bitte überprüfen Sie Ihre Installation. Der Fehler war: %s" + +#: ../pohelper/src/gph-plugin.c:1225 +#, c-format +msgid "" +"Cannot find widget \"%s\" in the UI definition, please check your " +"installation." +msgstr "" +"Konnte das Widget »%s« in der Defintion der graphischen Oberfläche nicht " +"finden. Bitte prüfen Sie die Installation" + #: ../pretty-printer/src/PluginEntry.c:37 msgid "XML PrettyPrinter" msgstr "XML PrettyPrinter" @@ -4703,11 +5199,13 @@ #: ../pretty-printer/src/PluginEntry.c:159 msgid "" -"Unable to process PrettyPrinting on the specified XML because some features are not supported.\n" +"Unable to process PrettyPrinting on the specified XML because some features " +"are not supported.\n" "\n" "See Help > Debug messages for more details..." msgstr "" -"Konnte PrettyPrinter nicht auf das angegebene XML anwenden, da einige Funktionen davon nicht unterstützt werden.\n" +"Konnte PrettyPrinter nicht auf das angegebene XML anwenden, da einige " +"Funktionen davon nicht unterstützt werden.\n" "\n" "Siehe Hilfe->Debug-Meldungen für mehr Details. " @@ -4715,20 +5213,17 @@ msgid "Comments" msgstr "Kommentare" -#: ../pretty-printer/src/ConfigUI.c:73 -#: ../pretty-printer/src/ConfigUI.c:74 +#: ../pretty-printer/src/ConfigUI.c:73 ../pretty-printer/src/ConfigUI.c:74 #: ../pretty-printer/src/ConfigUI.c:75 msgid "Put on one line" msgstr "In eine Zeile zusammenführen" -#: ../pretty-printer/src/ConfigUI.c:73 -#: ../pretty-printer/src/ConfigUI.c:74 +#: ../pretty-printer/src/ConfigUI.c:73 ../pretty-printer/src/ConfigUI.c:74 #: ../pretty-printer/src/ConfigUI.c:75 msgid "Inline if possible" msgstr "Inline wenn möglich" -#: ../pretty-printer/src/ConfigUI.c:73 -#: ../pretty-printer/src/ConfigUI.c:74 +#: ../pretty-printer/src/ConfigUI.c:73 ../pretty-printer/src/ConfigUI.c:74 #: ../pretty-printer/src/ConfigUI.c:75 msgid "Alignment" msgstr "Ausrichtung" @@ -4776,7 +5271,7 @@ #: ../scope/data/scope.glade.h:2 msgid "_Setup Program" -msgstr "" +msgstr "_Setup" #: ../scope/data/scope.glade.h:3 msgid "Recent _Programs" @@ -4825,7 +5320,6 @@ msgstr "_GDB-Kommando" #: ../scope/data/scope.glade.h:13 - msgid "_More" msgstr "_Weitere" @@ -4843,7 +5337,7 @@ #: ../scope/data/scope.glade.h:17 msgid "_Feed" -msgstr "" +msgstr "Feed" #: ../scope/data/scope.glade.h:18 msgid "_Window" @@ -4851,23 +5345,23 @@ #: ../scope/data/scope.glade.h:19 msgid "_Auto Show" -msgstr "" +msgstr "_Automatisches Zeigen" #: ../scope/data/scope.glade.h:20 msgid "Auto _Hide" -msgstr "" +msgstr "Automatisches _Verstecken" #: ../scope/data/scope.glade.h:21 msgid "Show on _Error" -msgstr "" +msgstr "Bei _Fehler anzeigen" #: ../scope/data/scope.glade.h:22 msgid "_Unsorted" -msgstr "" +msgstr "_Unsortiert" #: ../scope/data/scope.glade.h:23 msgid "_View Source" -msgstr "" +msgstr "_Quellen anzeigen" #: ../scope/data/scope.glade.h:24 msgid "S_ynchronize" @@ -4883,10 +5377,9 @@ #: ../scope/data/scope.glade.h:27 msgid "S_elect on" -msgstr "" +msgstr "Auswahl _bei" #: ../scope/data/scope.glade.h:28 - msgid "_Running" msgstr "_läuft" @@ -4896,7 +5389,7 @@ #: ../scope/data/scope.glade.h:30 msgid "_Exited" -msgstr "" +msgstr "_Beendet" #: ../scope/data/scope.glade.h:31 msgid "_Follow" @@ -4919,44 +5412,40 @@ msgstr "Haltepunkt _hinzufügen" #: ../scope/data/scope.glade.h:36 -#, fuzzy msgid "Add _Watch" -msgstr "Beobachten" +msgstr "Beobachtungspunkt hinzufügen" #: ../scope/data/scope.glade.h:37 msgid "Apply on _Run" -msgstr "" +msgstr "Beim Ausführen _anwenden" #: ../scope/data/scope.glade.h:38 msgid "_Show @entry" -msgstr "" +msgstr "@Entry a_nzeigen" #: ../scope/data/scope.glade.h:39 -#, fuzzy msgid "Show _Address" -msgstr "Adresse" +msgstr "Adresse anze_igen" #: ../scope/data/scope.glade.h:40 msgid "_Modify" -msgstr "" +msgstr "_Bearbeiten" #: ../scope/data/scope.glade.h:41 -#, fuzzy msgid "_Watch" -msgstr "Beobachten" +msgstr "_Beobachten" #: ../scope/data/scope.glade.h:42 msgid "_Inspect" -msgstr "" +msgstr "_Erkunden" #: ../scope/data/scope.glade.h:43 msgid "_8-bit mode" msgstr "8-bit-Modus" #: ../scope/data/scope.glade.h:44 -#, fuzzy msgid "_Default" -msgstr "Vorgabe" +msgstr "_Vorgabe" #: ../scope/data/scope.glade.h:45 msgid "_7 bit" @@ -5007,17 +5496,16 @@ msgstr "_Anwenden" #: ../scope/data/scope.glade.h:57 -#, fuzzy msgid "_Expand" -msgstr "Alle ausklappen" +msgstr "_Ausklappen" #: ../scope/data/scope.glade.h:59 msgid "_Natural" -msgstr "" +msgstr "_Natürlich" #: ../scope/data/scope.glade.h:60 msgid "_Decimal" -msgstr "" +msgstr "_Dezimale" #: ../scope/data/scope.glade.h:61 msgid "_Hex" @@ -5032,287 +5520,340 @@ msgstr "_Binär" #: ../scope/data/scope.glade.h:64 -msgid "_Evaluate/Modify" -msgstr "" +msgid "_Raw" +msgstr "_Raw" #: ../scope/data/scope.glade.h:65 -msgid "_Watch Expression" -msgstr "" +msgid "_Evaluate/Modify" +msgstr "_Evaluieren/Modifizieren" #: ../scope/data/scope.glade.h:66 -msgid "_Inspect Variable" -msgstr "" +msgid "_Watch Expression" +msgstr "_Ausdruck ansehen" #: ../scope/data/scope.glade.h:67 -msgid "Program Terminal" -msgstr "" +msgid "_Inspect Variable" +msgstr "_Veriable untersuchen" #: ../scope/data/scope.glade.h:68 msgid "Threads" msgstr "Zweige" -#: ../scope/data/scope.glade.h:70 -#, fuzzy +#: ../scope/data/scope.glade.h:69 msgid "Stack" -msgstr "Ausführungsstapel" +msgstr "Ausführungsstapel (Stack)" -#: ../scope/data/scope.glade.h:71 +#: ../scope/data/scope.glade.h:70 msgid "Locals" msgstr "Lokal" -#: ../scope/data/scope.glade.h:72 -#, fuzzy +#: ../scope/data/scope.glade.h:71 msgid "Watches" -msgstr "Beobachten" +msgstr "Beobachtungspunkte" -#: ../scope/data/scope.glade.h:73 +#: ../scope/data/scope.glade.h:72 msgid "Memory" msgstr "Speicher" -#: ../scope/data/scope.glade.h:74 -#, fuzzy -msgid "Debug Console" -msgstr "Konsole:" - -#: ../scope/data/scope.glade.h:75 -#, fuzzy +#: ../scope/data/scope.glade.h:73 msgid "Enter gdb command:" -msgstr "Befehl einfügen" +msgstr "Befehl für gdb:" -#: ../scope/data/scope.glade.h:76 -#, fuzzy +#: ../scope/data/scope.glade.h:74 msgid "Convert _UTF-8 to locale" -msgstr "In _Tabelle umwandeln" +msgstr "Von _UTF-8 nach Lokale umwandeln" -#: ../scope/data/scope.glade.h:77 +#: ../scope/data/scope.glade.h:75 msgid "_Thread" msgstr "Thread" -#: ../scope/data/scope.glade.h:78 +#: ../scope/data/scope.glade.h:76 msgid "_Group" msgstr "_Gruppe" -#: ../scope/data/scope.glade.h:79 +#: ../scope/data/scope.glade.h:77 msgid "_Frame" msgstr "_Rahmen" -#: ../scope/data/scope.glade.h:80 -#, fuzzy +#: ../scope/data/scope.glade.h:78 msgid "Setup Program" -msgstr "Kein Programm" +msgstr "Programmeinstellungen" -#: ../scope/data/scope.glade.h:81 +#: ../scope/data/scope.glade.h:79 msgid "_Executable:" msgstr "Ausführbares _Programm:" -#: ../scope/data/scope.glade.h:82 +#: ../scope/data/scope.glade.h:80 #, fuzzy msgid "_Arguments:" msgstr "Argumente" -#: ../scope/data/scope.glade.h:83 +#: ../scope/data/scope.glade.h:81 msgid "En_vironment:" msgstr "U_mgebung:" -#: ../scope/data/scope.glade.h:84 +#: ../scope/data/scope.glade.h:82 msgid "_Working dir:" msgstr "_Arbeitsverzeichnis:" -#: ../scope/data/scope.glade.h:85 +#: ../scope/data/scope.glade.h:83 msgid "_Load script:" msgstr "Skript laden:" -#: ../scope/data/scope.glade.h:86 +#: ../scope/data/scope.glade.h:84 msgid "Auto _run program/exit gdb" msgstr "" -#: ../scope/data/scope.glade.h:87 +#: ../scope/data/scope.glade.h:85 msgid "_Non-stop mode" msgstr "" -#: ../scope/data/scope.glade.h:88 -msgid "_Temporary breakpoint at:" +#: ../scope/data/scope.glade.h:86 +msgid "_Temporary breakpoint on load at:" msgstr "" -#: ../scope/data/scope.glade.h:89 -msgid "_Delete all breakpoints, watches and inspects" +#: ../scope/data/scope.glade.h:87 +msgid "_Delete all breakpoints, watches, inspects and registers" msgstr "" -#: ../scope/data/scope.glade.h:90 -#: ../scope/src/prefs.c:337 +#: ../scope/data/scope.glade.h:88 ../scope/src/scope.c:522 msgid "Program" msgstr "Programm" -#: ../scope/data/scope.glade.h:91 +#: ../scope/data/scope.glade.h:89 #, fuzzy msgid "Open on" msgstr "URI öffnen" -#: ../scope/data/scope.glade.h:92 +#: ../scope/data/scope.glade.h:90 msgid "g_db load" msgstr "" -#: ../scope/data/scope.glade.h:93 +#: ../scope/data/scope.glade.h:91 msgid "p_rogram start" msgstr "" -#: ../scope/data/scope.glade.h:94 +#: ../scope/data/scope.glade.h:92 #, fuzzy msgid "Update all _views" msgstr "Aufgabenliste aktualisieren" -#: ../scope/data/scope.glade.h:95 +#: ../scope/data/scope.glade.h:93 msgid "Panel" msgstr "" -#: ../scope/data/scope.glade.h:96 +#: ../scope/data/scope.glade.h:94 msgid "Default 8-bit text mode:" msgstr "Standard 8-bit Text-Modus:" -#: ../scope/data/scope.glade.h:97 -msgid "" -"_7-bit \\n" -"nn" -msgstr "" -"_7-bit \\n" -"nn" +#: ../scope/data/scope.glade.h:95 +msgid "_7-bit \\nnn" +msgstr "_7-bit \\nnn" -#: ../scope/data/scope.glade.h:98 +#: ../scope/data/scope.glade.h:96 #, fuzzy msgid "Display" msgstr "In Seitenleiste zeigen" -#: ../scope/data/scope.glade.h:99 +#: ../scope/data/scope.glade.h:97 #, fuzzy msgid "_member" msgstr "Nummer" -#: ../scope/data/scope.glade.h:100 +#: ../scope/data/scope.glade.h:98 #, fuzzy msgid "and" msgstr "schlecht" -#: ../scope/data/scope.glade.h:101 +#: ../scope/data/scope.glade.h:99 #, fuzzy msgid "_argument" msgstr "Argumente" -#: ../scope/data/scope.glade.h:102 +#: ../scope/data/scope.glade.h:100 #, fuzzy msgid "names" msgstr "Umbenennen" -#: ../scope/data/scope.glade.h:103 +#: ../scope/data/scope.glade.h:101 msgid "Values" msgstr "" -#: ../scope/data/scope.glade.h:104 +#: ../scope/data/scope.glade.h:102 #, fuzzy msgid "E_xpand on apply" msgstr "Alle ausklappen" -#: ../scope/data/scope.glade.h:105 +#: ../scope/data/scope.glade.h:103 msgid "S_how" msgstr "" -#: ../scope/data/scope.glade.h:106 +#: ../scope/data/scope.glade.h:104 msgid "children" msgstr "" -#: ../scope/data/scope.glade.h:107 +#: ../scope/data/scope.glade.h:105 msgid "Inspect" msgstr "" -#: ../scope/data/scope.glade.h:108 +#: ../scope/data/scope.glade.h:106 msgid "Show =li_brary messages" msgstr "" -#: ../scope/data/scope.glade.h:109 +#: ../scope/data/scope.glade.h:107 #, fuzzy msgid "Show _tooltips" msgstr "Tooltips anzeigen." -#: ../scope/data/scope.glade.h:110 +#: ../scope/data/scope.glade.h:108 msgid "Others" msgstr "" -#: ../scope/data/scope.glade.h:111 +#: ../scope/data/scope.glade.h:109 #, fuzzy msgid "Options" msgstr "Suchoptionen:" -#: ../scope/data/scope.glade.h:112 +#: ../scope/data/scope.glade.h:110 #, fuzzy msgid "_Import" msgstr "Bericht" -#: ../scope/data/scope.glade.h:113 +#: ../scope/data/scope.glade.h:111 #, fuzzy msgid "Enter assignment expression:" msgstr "Konnte Ausdruck nicht prüfen" -#: ../scope/data/scope.glade.h:114 +#: ../scope/data/scope.glade.h:112 #, fuzzy msgid "Inspect" msgstr "Webinspektor" -#: ../scope/data/scope.glade.h:115 +#: ../scope/data/scope.glade.h:113 #, fuzzy msgid "Object:" msgstr "Objektinformationen" -#: ../scope/data/scope.glade.h:117 +#: ../scope/data/scope.glade.h:115 msgid "-" msgstr "-" -#: ../scope/data/scope.glade.h:118 +#: ../scope/data/scope.glade.h:116 #, fuzzy msgid "Frame:" msgstr "Name:" -#: ../scope/data/scope.glade.h:119 +#: ../scope/data/scope.glade.h:117 msgid "@" msgstr "@" -#: ../scope/data/scope.glade.h:120 +#: ../scope/data/scope.glade.h:118 msgid "_Apply on run" msgstr "" -#: ../scope/data/scope.glade.h:121 +#: ../scope/data/scope.glade.h:119 #, fuzzy msgid "Expand" msgstr "Alle ausklappen" -#: ../scope/data/scope.glade.h:122 +#: ../scope/data/scope.glade.h:120 #, fuzzy msgid "Start:" msgstr "_Start:" -#: ../scope/data/scope.glade.h:123 +#: ../scope/data/scope.glade.h:121 msgid "Count:" msgstr "Anzahl:" -#: ../scope/data/scope.glade.h:124 +#: ../scope/data/scope.glade.h:122 #, fuzzy msgid "_Expand on apply" msgstr "Alle ausklappen" -#: ../scope/src/break.c:947 -#, c-format +#: ../scope/data/scope.glade.h:123 ../scope/src/scope.c:522 +msgid "Program Terminal" +msgstr "" + +#: ../scope/data/scope.glade.h:125 +msgid "Registers" +msgstr "" + +#: ../scope/src/break.c:97 +#, fuzzy +msgid "breakpoint" +msgstr "Haltepunkte" + +#: ../scope/src/break.c:98 +#, fuzzy +msgid "hardware breakpoint" +msgstr "Haltepunkt" + +#: ../scope/src/break.c:99 +#, fuzzy +msgid "tracepoint" +msgstr "Haltepunkte" + +#: ../scope/src/break.c:100 +msgid "fast tracepoint" +msgstr "" + +#: ../scope/src/break.c:101 +msgid "write watchpoint" +msgstr "Beobachtungspunkt schrieben" + +#: ../scope/src/break.c:104 +msgid "access watchpoint" +msgstr "Auf Beobachtungspunkt zugreifen" + +#: ../scope/src/break.c:106 +msgid "read watchpoint" +msgstr "Beobachtungspunkt auslesen" + +#: ../scope/src/break.c:108 +msgid "catchpoint" +msgstr "" + +#: ../scope/src/break.c:135 ../scope/src/break.c:139 +msgid "CLI" +msgstr "CLI" + +#: ../scope/src/break.c:136 +msgid "unsupported MI" +msgstr "" + +#: ../scope/src/break.c:141 +msgid "on load" +msgstr "" + +#: ../scope/src/break.c:142 +msgid "Run to Cursor" +msgstr "Bis zum Cursor ausführen" + +#: ../scope/src/break.c:1013 +# c-format msgid "" "There are two or more breakpoints at %s:%d.\n" +"\n" "Use the breakpoint list to remove the exact one." msgstr "" "Es existieren zwei oder mehr Haltepunkte bei %s:%d.\n" "Benutzen Sie die Liste der Haltepunkte um den exakten zu entfernen." -#: ../scope/src/break.c:1200 -#, fuzzy +#: ../scope/src/break.c:1252 +#, c-format +msgid ", %s" +msgstr ", %s" + +#: ../scope/src/break.c:1278 +#, c-format +msgid "func %s" +msgstr "func %s" + +#: ../scope/src/break.c:1309 msgid "Add Breakpoint" msgstr "Haltepunkt hinzufügen" -#: ../scope/src/break.c:1215 -#, fuzzy +#: ../scope/src/break.c:1324 msgid "Add Watchpoint" msgstr "Beobachtungspunkt hinzufügen" @@ -5325,15 +5866,13 @@ msgid "Enter char # (0..255):" msgstr "" -#: ../scope/src/conterm.c:466 -#: ../scope/src/scope.c:502 +#: ../scope/src/conterm.c:509 ../scope/src/scope.c:550 +#: ../scope/src/scope.c:551 #, fuzzy, c-format msgid "Scope: %s." msgstr "»%s« schließen" -#: ../scope/src/debug.c:115 -#: ../scope/src/debug.c:120 -#: ../scope/src/utils.c:37 +#: ../scope/src/debug.c:115 ../scope/src/debug.c:120 ../scope/src/utils.c:37 #, fuzzy, c-format msgid "%s: %s." msgstr "%s:%u:%u: %s" @@ -5341,73 +5880,70 @@ #: ../scope/src/debug.c:363 #, c-format msgid "GDB died unexpectedly with status %d." -msgstr "" +msgstr "GDB wurde unerwartet beendet. Status: %d" #: ../scope/src/debug.c:365 -#, fuzzy msgid "Program terminated." -msgstr "abgebrochen" +msgstr "Programm abgebrochen" -#: ../scope/src/debug.c:468 +#: ../scope/src/debug.c:469 msgid "No breakpoints. Hanging." msgstr "Keine Haltepunkte - Hängend" -#: ../scope/src/debug.c:596 -#: ../scope/src/thread.c:97 -#, fuzzy, c-format +#: ../scope/src/debug.c:598 ../scope/src/thread.c:92 +# c-format msgid "%s." -msgstr "%s:" +msgstr "%s." -#: ../scope/src/inspect.c:77 -#, fuzzy +#: ../scope/src/inspect.c:66 msgid "..." -msgstr "Mehr ..." +msgstr "..." -#: ../scope/src/inspect.c:324 -#, fuzzy +#: ../scope/src/inspect.c:339 msgid "invalid data" -msgstr "Ungültige Markierung" +msgstr "ungültige Daten" -#: ../scope/src/inspect.c:356 +#: ../scope/src/inspect.c:371 msgid "no children in range" msgstr "" -#: ../scope/src/inspect.c:440 +#: ../scope/src/inspect.c:454 #, fuzzy msgid "out of scope" msgstr "Beobachtungspunkt #%s außerhalb des sichtbaren Bereichs." -#: ../scope/src/inspect.c:587 +#: ../scope/src/inspect.c:627 msgid "Duplicate inspect variable name." msgstr "" -#: ../scope/src/memory.c:299 +#: ../scope/src/memory.c:292 msgid "Read Memory" msgstr "" -#: ../scope/src/memory.c:408 -msgid "Scope: pointer size > 8, Data disabled." +#: ../scope/src/memory.c:396 +#, c-format +msgid "Scope: pointer size > %d, Data disabled." msgstr "" -#: ../scope/src/menu.c:380 +#: ../scope/src/menu.c:375 msgid "Modify" msgstr "Benachrichten" -#: ../scope/src/menu.c:490 +#: ../scope/src/menu.c:481 msgid "Evaluate/modify" msgstr "" -#: ../scope/src/menu.c:491 +#: ../scope/src/menu.c:482 #, fuzzy msgid "Watch expression" msgstr "Konnte Ausdruck nicht prüfen" -#: ../scope/src/menu.c:492 +#: ../scope/src/menu.c:483 #, fuzzy msgid "Inspect variable" msgstr "Variable löschen?" -#: ../scope/src/parse.c:416 +#: ../scope/src/parse.c:437 msgid "Undefined GDB error." msgstr "Nicht definierter GDB-Fehler." @@ -5421,38 +5957,27 @@ msgid "Select File" msgstr "Datei auswählen" -#: ../scope/src/prefs.c:338 -#, fuzzy -msgid "Breaks" -msgstr "Haltepunkte" - -#: ../scope/src/prefs.c:339 -#, fuzzy -msgid "Console" -msgstr "Konsole:" - -#: ../scope/src/prefs.c:347 -#: ../scope/src/utils.c:570 +#: ../scope/src/prefs.c:294 ../scope/src/utils.c:438 #, c-format msgid "Scope: %s: %s." msgstr "" -#: ../scope/src/prefs.c:352 +#: ../scope/src/prefs.c:299 #, fuzzy msgid "Scope: created configuration file." msgstr "Neuladen der Konfigurationsdateien erzwingen." -#: ../scope/src/program.c:231 +#: ../scope/src/program.c:251 #, c-format msgid "Loaded debug settings for %s." msgstr "" -#: ../scope/src/program.c:239 +#: ../scope/src/program.c:259 #, fuzzy, c-format msgid "Could not load debug settings file %s: %s." msgstr "Konnte die Datei »%s« nicht laden: %s" -#: ../scope/src/program.c:359 +#: ../scope/src/program.c:379 #, fuzzy, c-format msgid "" "%s: %s.\n" @@ -5460,15 +5985,15 @@ "Continue?" msgstr "Fortsetzen" -#: ../scope/src/program.c:394 -msgid "Delete all breakpoints, watches and inspects?" +#: ../scope/src/program.c:415 +msgid "Delete all breakpoints, watches et cetera?" msgstr "" -#: ../scope/src/program.c:501 +#: ../scope/src/program.c:523 msgid "as _Name=value" msgstr "" -#: ../scope/src/program.c:502 +#: ../scope/src/program.c:524 msgid "as _Name = value" msgstr "" @@ -5478,173 +6003,189 @@ msgstr "Debugger" #: ../scope/src/scope.c:35 -msgid "Simple GDB front-end." +msgid "Relatively simple GDB front-end." msgstr "" -#: ../scope/src/scope.c:63 +#: ../scope/src/scope.c:62 #, fuzzy msgid "Setup program" msgstr "Kein Programm" -#: ../scope/src/scope.c:64 +#: ../scope/src/scope.c:63 #, fuzzy msgid "Run/continue" msgstr "Starten / Fortsetzen" # Noch keine Idee hierzu --Dominic -#: ../scope/src/scope.c:66 +#: ../scope/src/scope.c:65 #, fuzzy msgid "Run to source" msgstr "Bis zum Cursor ausführen" -#: ../scope/src/scope.c:70 +#: ../scope/src/scope.c:69 #, fuzzy msgid "Terminate" msgstr "abgebrochen" -#: ../scope/src/scope.c:71 +#: ../scope/src/scope.c:70 #, fuzzy msgid "Toggle breakpoint" msgstr "Haltepunkt" -#: ../scope/src/scope.c:73 -#: ../scope/src/scope.c:76 +#: ../scope/src/scope.c:72 ../scope/src/scope.c:75 #, fuzzy msgid "GDB command" msgstr "Befehl einfügen" -#: ../scope/src/scope.c:74 +#: ../scope/src/scope.c:73 #, fuzzy msgid "Show terminal" msgstr "In Terminal ausführen" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Busy" msgstr "" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Ready" msgstr "Fertig" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Hang" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Assem" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Load" msgstr "Laden" -#: ../scope/src/scope.c:394 +#: ../scope/src/scope.c:421 msgid "Build action activated. Terminate debugging?" msgstr "" -#: ../scope/src/thread.c:58 +#: ../scope/src/scope.c:524 +#, fuzzy +msgid "Breaks" +msgstr "Haltepunkte" + +#: ../scope/src/scope.c:526 +#, fuzzy +msgid "Console" +msgstr "Konsole:" + +#: ../scope/src/scope.c:526 +#, fuzzy +msgid "Debug Console" +msgstr "Konsole:" + +#: ../scope/src/thread.c:48 #, c-format msgid "Thread group %s started." msgstr "" -#: ../scope/src/thread.c:76 +#: ../scope/src/thread.c:63 #, fuzzy msgid "Thread group " msgstr "Thread %i" -#: ../scope/src/thread.c:88 +#: ../scope/src/thread.c:83 msgid " exited" msgstr "" -#: ../scope/src/thread.c:91 +#: ../scope/src/thread.c:86 #, c-format msgid " with exit code %s" msgstr "" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 #, fuzzy msgid "Send Signal" msgstr "Per E-Mail senden" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 msgid "Enter signal #:" msgstr "" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Terminate Process" msgstr "Prozess töten" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Enter exit code:" msgstr "" -#: ../scope/src/thread.c:937 +#: ../scope/src/thread.c:891 #, fuzzy msgid "Running" msgstr "läuft" -#: ../scope/src/thread.c:938 +#: ../scope/src/thread.c:892 #, fuzzy msgid "Stopped" msgstr "unterbrochen" -#: ../scope/src/utils.c:44 -#, c-format -msgid "%s: error %lu." -msgstr "" +#: ../scope/src/utils.c:45 +#, fuzzy, c-format +msgid "%s: %s" +msgstr "%s:%u:%u: %s" -#: ../scope/src/utils.c:358 +#: ../scope/src/utils.c:225 #, c-format msgid "Scope: error reading [%s]." msgstr "" -#: ../scope/src/views.c:505 +#: ../scope/src/views.c:526 msgid "…" msgstr "" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Send" msgstr "" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Busy" msgstr "" -#: ../scope/src/views.c:535 +#: ../scope/src/views.c:558 #, fuzzy msgid "GDB Command" msgstr "Befehl 0:" -#: ../spellcheck/src/speller.c:94 +#: ../spellcheck/src/speller.c:180 msgid "Try: " msgstr "Vorschlag: " -#: ../spellcheck/src/speller.c:173 +#: ../spellcheck/src/speller.c:252 msgid "Checking" msgstr "Prüfe" -#: ../spellcheck/src/speller.c:186 +#: ../spellcheck/src/speller.c:265 #, c-format msgid "Checking file \"%s\" (lines %d to %d using %s):" msgstr "Prüfe Datei »%s« (Zeilen %d bis %d mit »%s«):" -#: ../spellcheck/src/speller.c:196 +#: ../spellcheck/src/speller.c:275 #, c-format msgid "Checking file \"%s\" (using %s):" msgstr "Prüfe Datei »%s« (mit »%s«):" -#: ../spellcheck/src/speller.c:223 +#: ../spellcheck/src/speller.c:302 msgid "The checked text is spelled correctly." msgstr "Der geprüfte Text ist fehlerfrei." -#: ../spellcheck/src/speller.c:233 +#: ../spellcheck/src/speller.c:312 #, c-format msgid "The Enchant library couldn't be initialized (%s)." msgstr "Die Enchant-Bibliothek konnte nicht initialisiert werden (%s)." -#: ../spellcheck/src/speller.c:234 +#: ../spellcheck/src/speller.c:313 msgid "unknown error (maybe the chosen language is not available)" -msgstr "unbekannter Fehler (möglicherweise ist die ausgewählte Sprache nicht verfügbar)." +msgstr "" +"unbekannter Fehler (möglicherweise ist die ausgewählte Sprache nicht " +"verfügbar)." #: ../spellcheck/src/scplugin.c:47 msgid "Spell Check" @@ -5660,7 +6201,7 @@ #: ../spellcheck/src/scplugin.c:205 msgid "Toggle Check While Typing" -msgstr "»Rechtschreibung beim Tippen überprüfen« ein-/ausschalten" +msgstr "Rechtschreibung beim Tippen überprüfen ein-/ausschalten" #. initialise the dialog #: ../spellcheck/src/scplugin.c:216 @@ -5692,8 +6233,12 @@ msgstr "_Verzeichnis mit Übersetzungsdateien:" #: ../spellcheck/src/scplugin.c:295 -msgid "Read additional dictionary files from this directory. For now, this only works with myspell dictionaries." -msgstr "Liest zusätzliche Wörterbücher aus diesem Verzeichnis. (Funktioniert zur Zeit nur mit myspell-Wörterbüchern)." +msgid "" +"Read additional dictionary files from this directory. For now, this only " +"works with myspell dictionaries." +msgstr "" +"Liest zusätzliche Wörterbücher aus diesem Verzeichnis. (Funktioniert zur " +"Zeit nur mit myspell-Wörterbüchern)." #: ../spellcheck/src/gui.c:76 msgid "Spell checking while typing is now enabled" @@ -5733,17 +6278,19 @@ msgid "Ignore All" msgstr "Alle ignorieren" -#: ../spellcheck/src/gui.c:521 +#: ../spellcheck/src/gui.c:526 #, c-format msgid "Default (%s)" msgstr "Vorgabe (%s)" -#: ../spellcheck/src/gui.c:532 +#: ../spellcheck/src/gui.c:537 #, c-format msgid "Toggle spell check while typing (current language: %s)" -msgstr "»Rechtschreibung beim Tippen überprüfen« ein-/ausschalten (Aktuelle Sprache: %s)" +msgstr "" +"»Rechtschreibung beim Tippen überprüfen« ein-/ausschalten (Aktuelle Sprache: " +"%s)" -#: ../spellcheck/src/gui.c:587 +#: ../spellcheck/src/gui.c:592 msgid "Spelling Suggestions" msgstr "Rechtschreibvorschläge" @@ -5755,13 +6302,11 @@ msgid "Shift a selection left and right" msgstr "Verschiebt eine Auswahl nach links oder rechts." -#: ../shiftcolumn/src/shiftcolumn.c:380 -#: ../shiftcolumn/src/shiftcolumn.c:400 +#: ../shiftcolumn/src/shiftcolumn.c:380 ../shiftcolumn/src/shiftcolumn.c:400 msgid "Shift Left" msgstr "Auswahl nach links verschieben" -#: ../shiftcolumn/src/shiftcolumn.c:387 -#: ../shiftcolumn/src/shiftcolumn.c:402 +#: ../shiftcolumn/src/shiftcolumn.c:387 ../shiftcolumn/src/shiftcolumn.c:402 msgid "Shift Right" msgstr "Auswahl nach rechts verschieben" @@ -5776,56 +6321,58 @@ #. OK. Something went not as expected. #. * We did have a selection but cannot parse it into rows. #. * Aborting -#: ../tableconvert/src/tableconvert.c:236 +#: ../tableconvert/src/tableconvert.c:237 msgid "Something went wrong on parsing selection. Aborting" msgstr "Etwas ist beim Untersuchen der Auswahl schiefgelaufen. Abbruch." -#: ../tableconvert/src/tableconvert.c:268 +#: ../tableconvert/src/tableconvert.c:269 msgid "Convert selection to table" msgstr "Auswahl in Tabelle umwandeln" #. Build up menu entry -#: ../tableconvert/src/tableconvert.c:281 +#: ../tableconvert/src/tableconvert.c:282 msgid "_Convert to table" msgstr "In _Tabelle umwandeln" -#: ../tableconvert/src/tableconvert.c:284 +#: ../tableconvert/src/tableconvert.c:285 msgid "Converts current marked list to a table." msgstr "Wandelt die aktuell markierte Liste in eine Tabelle" -#: ../treebrowser/src/treebrowser.c:122 +#: ../treebrowser/src/treebrowser.c:124 msgid "TreeBrowser" msgstr "Baumnavigator" -#: ../treebrowser/src/treebrowser.c:123 -msgid "This plugin adds a tree browser to Geany, allowing the user to browse files using a tree view of the directory being browsed." -msgstr "Ein Plugin zum Navigieren durch den Verzeichnisbaum auf dem Dateisystem." +#: ../treebrowser/src/treebrowser.c:125 +msgid "" +"This plugin adds a tree browser to Geany, allowing the user to browse files " +"using a tree view of the directory being browsed." +msgstr "" +"Ein Plugin zum Navigieren durch den Verzeichnisbaum auf dem Dateisystem." -#: ../treebrowser/src/treebrowser.c:432 +#: ../treebrowser/src/treebrowser.c:434 #, c-format msgid "%s: no such directory." msgstr "Das Verzeichnis »%s« existiert nicht" -#: ../treebrowser/src/treebrowser.c:535 -#: ../treebrowser/src/treebrowser.c:570 -#: ../treebrowser/src/treebrowser.c:672 +#: ../treebrowser/src/treebrowser.c:537 ../treebrowser/src/treebrowser.c:572 +#: ../treebrowser/src/treebrowser.c:670 msgid "(Empty)" msgstr "(leer)" -#: ../treebrowser/src/treebrowser.c:974 +#: ../treebrowser/src/treebrowser.c:973 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Konnte das eingestellte externe Werkzeug »%s« nicht ausführen (%s)." -#: ../treebrowser/src/treebrowser.c:1045 +#: ../treebrowser/src/treebrowser.c:1044 msgid "NewDirectory" msgstr "Neues Verzeichnis" -#: ../treebrowser/src/treebrowser.c:1047 +#: ../treebrowser/src/treebrowser.c:1046 msgid "NewFile" msgstr "Neue Datei" -#: ../treebrowser/src/treebrowser.c:1052 +#: ../treebrowser/src/treebrowser.c:1051 #, c-format msgid "" "Target file '%s' exists\n" @@ -5834,216 +6381,238 @@ "Zieldatei »%s« existiert bereits.\n" "Möchten Sie diese wirklich mit einer leeren Datei ersetzen?" -#: ../treebrowser/src/treebrowser.c:1096 +#: ../treebrowser/src/treebrowser.c:1097 #, c-format msgid "Do you really want to delete '%s' ?" msgstr "Soll »%s« wirklich gelöscht werden?" -#: ../treebrowser/src/treebrowser.c:1208 -#: ../treebrowser/src/treebrowser.c:1695 +#: ../treebrowser/src/treebrowser.c:1209 ../treebrowser/src/treebrowser.c:1740 msgid "Go up" msgstr "Aufwärts" -#: ../treebrowser/src/treebrowser.c:1212 -#: ../treebrowser/src/treebrowser.c:1710 +#: ../treebrowser/src/treebrowser.c:1213 ../treebrowser/src/treebrowser.c:1755 msgid "Set path from document" msgstr "Pfad des Dokumentes übernehmen" -#: ../treebrowser/src/treebrowser.c:1216 -msgid "Open externally" +#: ../treebrowser/src/treebrowser.c:1217 +#, fuzzy +msgid "_Open externally" msgstr "Extern öffnen" -#: ../treebrowser/src/treebrowser.c:1221 +#: ../treebrowser/src/treebrowser.c:1222 msgid "Open Terminal" msgstr "In Terminal ausführen" -#: ../treebrowser/src/treebrowser.c:1225 +#: ../treebrowser/src/treebrowser.c:1226 msgid "Set as root" msgstr "Als Wurzel festlegen" -#: ../treebrowser/src/treebrowser.c:1230 -#: ../treebrowser/src/treebrowser.c:1700 -#: ../treebrowser/src/treebrowser.c:2063 +#: ../treebrowser/src/treebrowser.c:1231 ../treebrowser/src/treebrowser.c:1745 +#: ../treebrowser/src/treebrowser.c:2125 msgid "Refresh" msgstr "Auffrischen" -#: ../treebrowser/src/treebrowser.c:1242 +#: ../treebrowser/src/treebrowser.c:1235 +#, fuzzy +msgid "_Find in Files" +msgstr "In Dateien finden" + +#: ../treebrowser/src/treebrowser.c:1243 msgid "Create new directory" msgstr "Neues Verzeichnis anlegen" -#: ../treebrowser/src/treebrowser.c:1246 +#: ../treebrowser/src/treebrowser.c:1247 msgid "Create new file" msgstr "Neue Datei erstellen" -#: ../treebrowser/src/treebrowser.c:1250 +#: ../treebrowser/src/treebrowser.c:1251 msgid "Rename" msgstr "Umbenennen" -#: ../treebrowser/src/treebrowser.c:1255 +#: ../treebrowser/src/treebrowser.c:1256 msgid "Delete" msgstr "Löschen" -#: ../treebrowser/src/treebrowser.c:1263 +#: ../treebrowser/src/treebrowser.c:1264 #, c-format msgid "Close: %s" msgstr "»%s« schließen" -#: ../treebrowser/src/treebrowser.c:1268 +#: ../treebrowser/src/treebrowser.c:1269 #, c-format msgid "Close Child Documents " msgstr "Kinderdokumente schließen" -#: ../treebrowser/src/treebrowser.c:1273 -msgid "Copy full path to clipboard" +#: ../treebrowser/src/treebrowser.c:1274 +#, fuzzy +msgid "_Copy full path to clipboard" msgstr "Den vollständigen Pfad in die Zwischenablage kopieren" -#: ../treebrowser/src/treebrowser.c:1293 -#: ../treebrowser/src/treebrowser.c:1977 +#: ../treebrowser/src/treebrowser.c:1294 ../treebrowser/src/treebrowser.c:2034 msgid "Show bookmarks" msgstr "Lesezeichen anzeigen" -#: ../treebrowser/src/treebrowser.c:1298 -#: ../treebrowser/src/treebrowser.c:1931 +#: ../treebrowser/src/treebrowser.c:1299 ../treebrowser/src/treebrowser.c:1983 msgid "Show hidden files" msgstr "Versteckte Dateien anzeigen" -#: ../treebrowser/src/treebrowser.c:1303 +#: ../treebrowser/src/treebrowser.c:1304 msgid "Show toolbars" msgstr "Werkzeugleisten anzeigen" -#: ../treebrowser/src/treebrowser.c:1578 +#: ../treebrowser/src/treebrowser.c:1623 #, c-format msgid "Target file '%s' exists, do you really want to replace it?" msgstr "Zieldatei »%s« existiert bereits. Möchten Sie diese wirklich ersetzen?" -#: ../treebrowser/src/treebrowser.c:1705 +#: ../treebrowser/src/treebrowser.c:1750 msgid "Home" msgstr "Ausgabe" -#: ../treebrowser/src/treebrowser.c:1715 +#: ../treebrowser/src/treebrowser.c:1760 msgid "Track path" msgstr "Pfad aufzeichnen" -#: ../treebrowser/src/treebrowser.c:1720 +#: ../treebrowser/src/treebrowser.c:1765 msgid "Hide bars" msgstr "Leisten verbergen" -#: ../treebrowser/src/treebrowser.c:1730 -msgid "Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' reverse try for example this '!;*.c;*.h;*.cpp'" +#: ../treebrowser/src/treebrowser.c:1775 +msgid "" +"Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' " +"reverse try for example this '!;*.c;*.h;*.cpp'" msgstr "Filter (*.c;*.h;*.cpp). Die Nutzung von ! invertiert das Ergebnis." -#: ../treebrowser/src/treebrowser.c:1738 +#: ../treebrowser/src/treebrowser.c:1783 msgid "Addressbar for example '/projects/my-project'" msgstr "Adressleiste. Zum Beispiel »/projects/my-project«" -#: ../treebrowser/src/treebrowser.c:1763 +#: ../treebrowser/src/treebrowser.c:1808 msgid "Tree Browser" msgstr "Baumnavigator" -#: ../treebrowser/src/treebrowser.c:1895 +#: ../treebrowser/src/treebrowser.c:1947 msgid "External open command" msgstr "Externer Öffnen-Befehl" -#: ../treebrowser/src/treebrowser.c:1900 +#: ../treebrowser/src/treebrowser.c:1952 #, c-format msgid "" -"The command to execute when using \"Open with\". You can use %f and %d wildcards.\n" +"The command to execute when using \"Open with\". You can use %f and %d " +"wildcards.\n" "%f will be replaced with the filename including full path\n" -"%d will be replaced with the path name of the selected file without the filename" +"%d will be replaced with the path name of the selected file without the " +"filename" msgstr "" -"Der Befehl, der ausgeführt wird, wenn »Öffnen mit« ausgewählt wird. Es können %f und %d als Platzhalter verwendet werden.\n" +"Der Befehl, der ausgeführt wird, wenn »Öffnen mit« ausgewählt wird. Es " +"können %f und %d als Platzhalter verwendet werden.\n" "%f wird mit dem Dateinamen ersetzt, der den kompletten Pfad beinhaltet.\n" "%d wird mit dem Pfad des Verzeichnisses der aktuellen Datei ersetzt." -#: ../treebrowser/src/treebrowser.c:1908 +#: ../treebrowser/src/treebrowser.c:1960 msgid "Toolbar" msgstr "Werkzeugleiste:" -#: ../treebrowser/src/treebrowser.c:1910 +#: ../treebrowser/src/treebrowser.c:1962 msgid "Hidden" msgstr "Versteckt" -#: ../treebrowser/src/treebrowser.c:1911 +#: ../treebrowser/src/treebrowser.c:1963 msgid "Top" msgstr "Oben" -#: ../treebrowser/src/treebrowser.c:1912 +#: ../treebrowser/src/treebrowser.c:1964 msgid "Bottom" msgstr "Unten" -#: ../treebrowser/src/treebrowser.c:1917 +#: ../treebrowser/src/treebrowser.c:1969 msgid "If position is changed, the option require plugin restart." msgstr "Bei einer Veränderung der Position muss das Plugin neu geladen werden." -#: ../treebrowser/src/treebrowser.c:1921 +#: ../treebrowser/src/treebrowser.c:1973 msgid "Show icons" msgstr "Symbole anzeigen:" -#: ../treebrowser/src/treebrowser.c:1923 +#: ../treebrowser/src/treebrowser.c:1975 msgid "None" msgstr "Keines" -#: ../treebrowser/src/treebrowser.c:1924 +#: ../treebrowser/src/treebrowser.c:1976 msgid "Base" msgstr "Basis" -#: ../treebrowser/src/treebrowser.c:1925 +#: ../treebrowser/src/treebrowser.c:1977 msgid "Content-type" msgstr "Inhaltsart" -#: ../treebrowser/src/treebrowser.c:1936 +#: ../treebrowser/src/treebrowser.c:1988 msgid "On Windows, this just hide files that are prefixed with '.' (dot)" -msgstr "Unter Windows versteckt dies nur Dateien, die mit einem ».« (Punkt) beginnen. " +msgstr "" +"Unter Windows versteckt dies nur Dateien, die mit einem ».« (Punkt) " +"beginnen. " -#: ../treebrowser/src/treebrowser.c:1938 +#: ../treebrowser/src/treebrowser.c:1990 msgid "Hide object files" msgstr "Objektdateien verbergen" -#: ../treebrowser/src/treebrowser.c:1943 -msgid "Don't show generated object files in the file browser, this includes *.o, *.obj. *.so, *.dll, *.a, *.lib" -msgstr "Keine generierten Objektdateien anzeigen. Dies bezieht *.o, *.obj. *.so, *.dll, *.a, *.lib mit ein." +#: ../treebrowser/src/treebrowser.c:1995 +msgid "" +"Don't show generated object files in the file browser, this includes *.o, *." +"obj. *.so, *.dll, *.a, *.lib" +msgstr "" +"Keine generierten Objektdateien anzeigen. Dies bezieht *.o, *.obj. *.so, *." +"dll, *.a, *.lib mit ein." -#: ../treebrowser/src/treebrowser.c:1945 +#: ../treebrowser/src/treebrowser.c:1997 msgid "Reverse filter" msgstr "Filter zurücksetzen" -#: ../treebrowser/src/treebrowser.c:1950 +#: ../treebrowser/src/treebrowser.c:2002 msgid "Follow current document" msgstr "Dem aktuellen Dokument folgen" -#: ../treebrowser/src/treebrowser.c:1955 +#: ../treebrowser/src/treebrowser.c:2007 msgid "Single click, open document and focus it" msgstr "Einzelklick öffnet Dokument und fokussiert es" -#: ../treebrowser/src/treebrowser.c:1960 +#: ../treebrowser/src/treebrowser.c:2012 msgid "Double click open directory" msgstr "Doppelklick öffnet ein Verzeichnis" -#: ../treebrowser/src/treebrowser.c:1965 +#: ../treebrowser/src/treebrowser.c:2017 msgid "On delete file, close it if is opened" msgstr "Datei schließen, wenn sie gelöscht wird" -#: ../treebrowser/src/treebrowser.c:1970 +#: ../treebrowser/src/treebrowser.c:2022 +msgid "Focus editor on file open" +msgstr "" + +#: ../treebrowser/src/treebrowser.c:2027 msgid "Show tree lines" msgstr "Leere Zeilen anzeigen" -#: ../treebrowser/src/treebrowser.c:2053 +#: ../treebrowser/src/treebrowser.c:2039 +#, fuzzy +msgid "Open new files" +msgstr "Datei öffnen" + +#: ../treebrowser/src/treebrowser.c:2115 msgid "Focus File List" msgstr "Dateiliste fokussieren" -#: ../treebrowser/src/treebrowser.c:2055 +#: ../treebrowser/src/treebrowser.c:2117 msgid "Focus Path Entry" msgstr "Pfadeintrag fokussieren" -#: ../treebrowser/src/treebrowser.c:2057 +#: ../treebrowser/src/treebrowser.c:2119 msgid "Rename Object" msgstr "Objekt umbenennen" -#: ../treebrowser/src/treebrowser.c:2059 +#: ../treebrowser/src/treebrowser.c:2121 msgid "Create New File" msgstr "Neue Datei erstellen" -#: ../treebrowser/src/treebrowser.c:2061 +#: ../treebrowser/src/treebrowser.c:2123 msgid "Create New Directory" msgstr "Neues Verzeichnis erstellen" @@ -6052,7 +6621,8 @@ msgstr "Updatechecker" #: ../updatechecker/src/updatechecker.c:42 -msgid "A plugin which is checking whether there are updates for Geany available." +msgid "" +"A plugin which is checking whether there are updates for Geany available." msgstr "Ein Plugin zum Überprüfen, ob es Updates für Geany gibt." #: ../updatechecker/src/updatechecker.c:190 @@ -6110,45 +6680,44 @@ msgid "utility" msgstr "Werkzeug" -#: ../webhelper/src/gwh-settings.c:775 +#: ../webhelper/src/gwh-settings.c:782 #, c-format msgid "%s:" msgstr "%s:" -#: ../webhelper/src/gwh-browser.c:528 +#: ../webhelper/src/gwh-browser.c:534 msgid "_Zoom" msgstr "_Vergrößerung" -#: ../webhelper/src/gwh-browser.c:550 +#: ../webhelper/src/gwh-browser.c:556 msgid "Full-_content zoom" msgstr "Dokument _einpassen" -#: ../webhelper/src/gwh-browser.c:561 +#: ../webhelper/src/gwh-browser.c:567 msgid "Flip panes orientation" msgstr "Seitenausrichtung umschalten" -#: ../webhelper/src/gwh-browser.c:808 +#: ../webhelper/src/gwh-browser.c:814 msgid "Back" msgstr "Zurück" -#: ../webhelper/src/gwh-browser.c:812 +#: ../webhelper/src/gwh-browser.c:818 msgid "Forward" msgstr "Weiter" -#: ../webhelper/src/gwh-browser.c:816 +#: ../webhelper/src/gwh-browser.c:822 msgid "Cancel loading" msgstr "Laden abbrechen" -#: ../webhelper/src/gwh-browser.c:820 +#: ../webhelper/src/gwh-browser.c:826 msgid "Reload current page" msgstr "Aktuelle Seite neu laden" -#: ../webhelper/src/gwh-browser.c:833 -#: ../webhelper/src/gwh-browser.c:879 +#: ../webhelper/src/gwh-browser.c:839 ../webhelper/src/gwh-browser.c:885 msgid "Web inspector" msgstr "Webinspektor" -#: ../webhelper/src/gwh-browser.c:834 +#: ../webhelper/src/gwh-browser.c:840 msgid "Toggle web inspector" msgstr "Webinspektor umschalten" @@ -6157,8 +6726,14 @@ msgstr "Web-Helfer" #: ../webhelper/src/gwh-plugin.c:51 -msgid "Display a preview web page that gets updated upon document saving and provide web analysis and debugging tools (aka Web Inspector), all using WebKit." -msgstr "Zeigt eine Vorschau für eine Webseite an, die jedes Mal beim Speichern neu geladen wird. Es bietet dabei analytische Unterstützung sowie ein Debuggingwerkzeug (Webinspektor) und basiert dabei auf Webkit. " +msgid "" +"Display a preview web page that gets updated upon document saving and " +"provide web analysis and debugging tools (aka Web Inspector), all using " +"WebKit." +msgstr "" +"Zeigt eine Vorschau für eine Webseite an, die jedes Mal beim Speichern neu " +"geladen wird. Es bietet dabei analytische Unterstützung sowie ein " +"Debuggingwerkzeug (Webinspektor) und basiert dabei auf Webkit. " #: ../webhelper/src/gwh-plugin.c:141 msgid "Web view" @@ -6178,7 +6753,9 @@ #: ../webhelper/src/gwh-plugin.c:306 msgid "Whether the browser reloads itself upon document saving" -msgstr "Gibt an, ob der verwendete Browser sich automatisch aktualisiert, wenn eine Datei gespeichert wird" +msgstr "" +"Gibt an, ob der verwendete Browser sich automatisch aktualisiert, wenn eine " +"Datei gespeichert wird" #: ../webhelper/src/gwh-plugin.c:311 msgid "Browser last URI" @@ -6226,14 +6803,18 @@ #: ../webhelper/src/gwh-plugin.c:344 msgid "Whether the inspector is in a separate window or docked in the browser" -msgstr "Definiert, ob der Inspektor in einem eigenen Fenster oder mit dem Browser verbunden angezeigt werden soll." +msgstr "" +"Definiert, ob der Inspektor in einem eigenen Fenster oder mit dem Browser " +"verbunden angezeigt werden soll." #: ../webhelper/src/gwh-plugin.c:349 msgid "Secondary windows skip task bar" msgstr "Weitere Fenster nicht in der Taskleiste zeigen" #: ../webhelper/src/gwh-plugin.c:350 -msgid "Whether to tell the window manager not to show the secondary windows in the task bar" +msgid "" +"Whether to tell the window manager not to show the secondary windows in the " +"task bar" msgstr "Bestimmt, ob weitere Fenster in der Taskleiste zu sehen sein sollen. " #: ../webhelper/src/gwh-plugin.c:355 @@ -6242,7 +6823,8 @@ #: ../webhelper/src/gwh-plugin.c:356 msgid "Whether secondary windows are transient children of their parent" -msgstr "Legt fest, ob weitere Fenster transiente Kinder des Hauptfensters sind." +msgstr "" +"Legt fest, ob weitere Fenster transiente Kinder des Hauptfensters sind." #: ../webhelper/src/gwh-plugin.c:361 msgid "Secondary windows type" diff -Nru geany-plugins-1.23+dfsg/po/es.po geany-plugins-1.24+dfsg/po/es.po --- geany-plugins-1.23+dfsg/po/es.po 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/po/es.po 2014-04-12 14:28:39.000000000 +0000 @@ -1,23 +1,24 @@ # translation of es.po to # Spanish translation for geany-plugins -# Copyright (C) 2009 - 2011 THE PACKAGE'S COPYRIGHT HOLDER +# Copyright (C) 2009 - 2014 Lucas Vieites # This file is distributed under the same license as the geany-plugins package. # Andrew Janke , 2009 -# Lucas Vieites , 2009 - 2013 +# Lucas Vieites , 2009 - 2014. # msgid "" msgstr "" -"Project-Id-Version: Geany-plugins 1.23\n" +"Project-Id-Version: Geany-plugins 1.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-25 05:19+0000\n" -"PO-Revision-Date: 2013-02-26 12:07+0100\n" +"POT-Creation-Date: 2014-03-31 03:19+0000\n" +"PO-Revision-Date: 2014-04-07 21:25+0200\n" "Last-Translator: Lucas Vieites \n" -"Language-Team: \n" +"Language-Team: Spanish; Castilian <>\n" +"Language: es\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: Gtranslator 2.91.6\n" #: ../addons/src/ao_bookmarklist.c:182 msgid "(Empty Line)" @@ -36,12 +37,12 @@ msgid "Contents" msgstr "Contenido" -#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:615 +#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:625 msgid "Bookmarks" msgstr "Marcadores" #. complete update -#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2295 +#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2351 msgid "_Update" msgstr "_Actualizar" @@ -78,15 +79,15 @@ msgid "Context:" msgstr "Contexto:" -#: ../addons/src/ao_xmltagging.c:56 +#: ../addons/src/ao_xmltagging.c:54 msgid "XML tagging" msgstr "Etiquetado XML" -#: ../addons/src/ao_xmltagging.c:67 +#: ../addons/src/ao_xmltagging.c:65 msgid "Tag name to be inserted:" msgstr "Nombre de etiqueta para insertar:" -#: ../addons/src/ao_xmltagging.c:71 +#: ../addons/src/ao_xmltagging.c:69 #, c-format msgid "" "%s will be replaced with your current selection. Please keep care on your " @@ -155,11 +156,12 @@ msgid "Run XML tagging" msgstr "Ejecutar etiquetado de XML" -#: ../addons/src/addons.c:417 ../geanylatex/src/geanylatex.c:241 -#: ../geanyprj/src/geanyprj.c:174 ../geanysendmail/src/geanysendmail.c:121 -#: ../geanysendmail/src/geanysendmail.c:287 ../geanyvc/src/geanyvc.c:1798 +#: ../addons/src/addons.c:417 ../autoclose/src/autoclose.c:871 +#: ../geanylatex/src/geanylatex.c:241 ../geanyprj/src/geanyprj.c:174 +#: ../geanysendmail/src/geanysendmail.c:123 +#: ../geanysendmail/src/geanysendmail.c:291 ../geanyvc/src/geanyvc.c:1854 #: ../geniuspaste/src/geniuspaste.c:140 ../spellcheck/src/scplugin.c:146 -#: ../treebrowser/src/treebrowser.c:1880 +#: ../treebrowser/src/treebrowser.c:1933 #: ../updatechecker/src/updatechecker.c:253 msgid "Plugin configuration directory could not be created." msgstr "No se ha podido crear el directorio de configuración del complemento." @@ -250,6 +252,14 @@ msgstr "" "Incluir selección automáticamente (sin pulsar una combinación de teclas)" +#: ../autoclose/src/autoclose.c:50 +msgid "Auto-close" +msgstr "Autocierre" + +#: ../autoclose/src/autoclose.c:51 +msgid "Auto-close braces and brackets with lot of features" +msgstr "Auto-cerrar paréntesis y corchetes con multitud de opciones" + #: ../codenav/src/codenavigation.c:52 msgid "Code navigation" msgstr "Navegación por el código" @@ -319,8 +329,8 @@ msgid "Various debuggers integration." msgstr "Integración de varios depuradores." -#: ../debugger/src/plugin.c:131 ../debugger/src/keys.c:76 -#: ../scope/data/scope.glade.h:16 ../scope/src/scope.c:225 +#: ../debugger/src/plugin.c:133 ../debugger/src/keys.c:76 +#: ../scope/data/scope.glade.h:124 ../scope/src/scope.c:226 msgid "Debug" msgstr "Depurar" @@ -456,7 +466,7 @@ msgid "Target" msgstr "Objetivo" -#: ../debugger/src/tabs.c:135 ../scope/data/scope.glade.h:12 +#: ../debugger/src/tabs.c:135 ../scope/src/scope.c:524 msgid "Breakpoints" msgstr "Puntos de ruptura" @@ -493,22 +503,22 @@ msgstr "Reiniciar" #: ../debugger/src/keys.c:52 ../debugger/src/btnpanel.c:113 -#: ../scope/src/scope.c:67 +#: ../scope/src/scope.c:66 msgid "Step into" msgstr "Entrar" #: ../debugger/src/keys.c:53 ../debugger/src/btnpanel.c:110 -#: ../scope/src/scope.c:68 +#: ../scope/src/scope.c:67 msgid "Step over" msgstr "Saltar" #: ../debugger/src/keys.c:54 ../debugger/src/btnpanel.c:122 -#: ../scope/src/scope.c:69 +#: ../scope/src/scope.c:68 msgid "Step out" msgstr "Salir" #: ../debugger/src/keys.c:55 ../debugger/src/btnpanel.c:125 -#: ../scope/src/scope.c:65 +#: ../scope/src/scope.c:64 msgid "Run to cursor" msgstr "Ejecutar hasta cursor" @@ -517,7 +527,7 @@ msgstr "Añadir/eliminar punto de ruptura" #: ../debugger/src/keys.c:57 -msgid "Jump to the currect instruction" +msgid "Jump to the current instruction" msgstr "Saltar a la instrucción actual" #: ../debugger/src/watch_model.c:220 @@ -548,6 +558,14 @@ msgid "Save debug session data to a project" msgstr "Guardar los datos de la sesión de depuración en un proyecto" +#: ../defineformat/src/defineformat.c:56 +msgid "Define formatter" +msgstr "Definir formateador" + +#: ../defineformat/src/defineformat.c:57 +msgid "Automatically align backslash in multi-line defines" +msgstr "Alinear la barra invertida automáticamente en ´define´s multilínea" + #. never search for more than this many chars #: ../devhelp/src/dhp.h:38 msgid "Documentation" @@ -659,7 +677,7 @@ msgstr "Libro:" #. i18n: a documentation book -#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1760 +#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1757 msgid "Book" msgstr "Libro" @@ -797,12 +815,12 @@ msgid "A developers' help browser for GNOME" msgstr "Un visor de ayuda para el desarrollador de Gnome" -#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2010 +#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2066 msgid "_File" msgstr "_Archivo" -#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1815 -#: ../geanymacro/src/geanymacro.c:2112 +#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1822 +#: ../geanymacro/src/geanymacro.c:2118 msgid "_Edit" msgstr "_Editar" @@ -982,55 +1000,63 @@ msgid "Column mode, select to line / brace / anchor." msgstr "Modo columna, seleccionar hasta la línea/corchete/ancla." -#: ../geanyextrasel/src/extrasel.c:482 +#: ../geanyextrasel/src/extrasel.c:502 msgid "E_xtra Selection" msgstr "Selección e_xtra" -#: ../geanyextrasel/src/extrasel.c:489 +#: ../geanyextrasel/src/extrasel.c:509 msgid "_Column Mode" msgstr "Modo _columna" -#: ../geanyextrasel/src/extrasel.c:494 +#: ../geanyextrasel/src/extrasel.c:514 msgid "Column mode" msgstr "Modo columna" -#: ../geanyextrasel/src/extrasel.c:496 +#: ../geanyextrasel/src/extrasel.c:516 msgid "Select to _Line" msgstr "Seleccionar hasta _línea" -#: ../geanyextrasel/src/extrasel.c:500 +#: ../geanyextrasel/src/extrasel.c:520 msgid "Select to line" msgstr "Seleccionar hasta línea" -#: ../geanyextrasel/src/extrasel.c:502 +#: ../geanyextrasel/src/extrasel.c:522 msgid "Select to Matching _Brace" msgstr "Seleccionar hasta _corchete correspondiente" -#: ../geanyextrasel/src/extrasel.c:506 +#: ../geanyextrasel/src/extrasel.c:526 msgid "Select to matching brace" msgstr "Seleccionar hasta corchete correspondiente" -#: ../geanyextrasel/src/extrasel.c:510 +#: ../geanyextrasel/src/extrasel.c:528 +msgid "_Toggle Stream/Rectangular" +msgstr "In_tercambiar flujo/rectangular" + +#: ../geanyextrasel/src/extrasel.c:532 +msgid "Convert selection" +msgstr "Convertir selección" + +#: ../geanyextrasel/src/extrasel.c:537 msgid "_Set Anchor" msgstr "Fijar an_cla" -#: ../geanyextrasel/src/extrasel.c:514 +#: ../geanyextrasel/src/extrasel.c:541 msgid "Set anchor" msgstr "Fijar ancla" -#: ../geanyextrasel/src/extrasel.c:516 +#: ../geanyextrasel/src/extrasel.c:543 msgid "Select to _Anchor" msgstr "Seleccionar hasta _ancla" -#: ../geanyextrasel/src/extrasel.c:520 +#: ../geanyextrasel/src/extrasel.c:547 msgid "Select to anchor" msgstr "Seleccionar hasta ancla" -#: ../geanyextrasel/src/extrasel.c:522 +#: ../geanyextrasel/src/extrasel.c:549 msgid "_Rectangle Select to Anchor" msgstr "Seleccionar en _rectángulo hasta ancla" -#: ../geanyextrasel/src/extrasel.c:527 +#: ../geanyextrasel/src/extrasel.c:554 msgid "Rectangle select to anchor" msgstr "Seleccionar en rectángulo hasta ancla" @@ -1445,76 +1471,76 @@ "Tipo de documentación por defecto para los lenguajes que no tienen un tipo " "especificado" -#: ../geanyinsertnum/src/insertnum.c:37 ../geanyinsertnum/src/insertnum.c:329 -#: ../geanyinsertnum/src/insertnum.c:461 +#: ../geanyinsertnum/src/insertnum.c:44 ../geanyinsertnum/src/insertnum.c:337 +#: ../geanyinsertnum/src/insertnum.c:484 msgid "Insert Numbers" msgstr "Insertar números" -#: ../geanyinsertnum/src/insertnum.c:37 +#: ../geanyinsertnum/src/insertnum.c:44 msgid "Insert/Fill columns with numbers." msgstr "Insertar/Rellenar columnas con números" -#: ../geanyinsertnum/src/insertnum.c:140 +#: ../geanyinsertnum/src/insertnum.c:146 msgid "Counting..." msgstr "Contando..." -#: ../geanyinsertnum/src/insertnum.c:188 +#: ../geanyinsertnum/src/insertnum.c:194 msgid "Preparing..." msgstr "Preparando..." -#: ../geanyinsertnum/src/insertnum.c:194 +#: ../geanyinsertnum/src/insertnum.c:200 msgid "Inserting..." msgstr "Insertando..." -#: ../geanyinsertnum/src/insertnum.c:318 +#: ../geanyinsertnum/src/insertnum.c:333 msgid "For base 11 and above" msgstr "Para base 11 y superiores" -#: ../geanyinsertnum/src/insertnum.c:341 +#: ../geanyinsertnum/src/insertnum.c:353 msgid "_Start:" msgstr "_Inicio:" -#: ../geanyinsertnum/src/insertnum.c:346 +#: ../geanyinsertnum/src/insertnum.c:358 msgid "S_tep:" msgstr "_Paso:" -#: ../geanyinsertnum/src/insertnum.c:352 +#: ../geanyinsertnum/src/insertnum.c:364 msgid "_Base:" msgstr "_Base:" -#: ../geanyinsertnum/src/insertnum.c:363 +#: ../geanyinsertnum/src/insertnum.c:380 msgid "Letters:" msgstr "Letras:" -#: ../geanyinsertnum/src/insertnum.c:366 +#: ../geanyinsertnum/src/insertnum.c:383 msgid "_Upper" msgstr "Mayúsc_ulas" -#: ../geanyinsertnum/src/insertnum.c:371 +#: ../geanyinsertnum/src/insertnum.c:388 msgid "_Lower" msgstr "Minúscu_las" -#: ../geanyinsertnum/src/insertnum.c:376 +#: ../geanyinsertnum/src/insertnum.c:393 msgid "Base _prefix" msgstr "_Prefijo base" -#: ../geanyinsertnum/src/insertnum.c:378 +#: ../geanyinsertnum/src/insertnum.c:395 msgid "0 for octal, 0x for hex, + for positive decimal" msgstr "0 para octal, 0x para hex, + para decimal positivo" -#: ../geanyinsertnum/src/insertnum.c:380 +#: ../geanyinsertnum/src/insertnum.c:397 msgid "Padding:" msgstr "Relleno:" -#: ../geanyinsertnum/src/insertnum.c:382 +#: ../geanyinsertnum/src/insertnum.c:399 msgid "Sp_ace" msgstr "Esp_acio" -#: ../geanyinsertnum/src/insertnum.c:385 +#: ../geanyinsertnum/src/insertnum.c:402 msgid "_Zero" msgstr "_Cero" -#: ../geanyinsertnum/src/insertnum.c:454 +#: ../geanyinsertnum/src/insertnum.c:477 msgid "Insert _Numbers" msgstr "Insertar _números" @@ -1948,20 +1974,20 @@ msgid "BibTeX reference name:" msgstr "Nombre de referencia BibTeX:" -#: ../geanylatex/src/geanylatex.c:1680 +#: ../geanylatex/src/geanylatex.c:1677 msgid "Dear Sir or Madame" msgstr "Estimado Señor o Señora" -#: ../geanylatex/src/geanylatex.c:1681 +#: ../geanylatex/src/geanylatex.c:1678 msgid "With kind regards" msgstr "Saludos cordiales" -#: ../geanylatex/src/geanylatex.c:1689 +#: ../geanylatex/src/geanylatex.c:1686 msgid "No template assigned. Aborting" msgstr "No se asignó ninguna plantilla. Cancelando" #. Building the wizard-dialog and showing it -#: ../geanylatex/src/geanylatex.c:1716 +#: ../geanylatex/src/geanylatex.c:1713 msgid "LaTeX-Wizard" msgstr "Asistente LaTeX" @@ -1969,67 +1995,67 @@ #. * Adds custom templates if there are any. If there are none just #. * adds default one #. TEMPLATE FILE -#: ../geanylatex/src/geanylatex.c:1731 ../markdown/src/conf.c:666 +#: ../geanylatex/src/geanylatex.c:1728 ../markdown/src/conf.c:659 msgid "Template:" msgstr "Plantilla:" -#: ../geanylatex/src/geanylatex.c:1735 +#: ../geanylatex/src/geanylatex.c:1732 msgid "Set the template which should be used for creating the new document" msgstr "Establezca la plantilla que se usará para crear el nuevo documento" -#: ../geanylatex/src/geanylatex.c:1744 +#: ../geanylatex/src/geanylatex.c:1741 msgid "Default" msgstr "Por defecto" #. Documentclass -#: ../geanylatex/src/geanylatex.c:1755 +#: ../geanylatex/src/geanylatex.c:1752 msgid "Documentclass:" msgstr "Clase de documento:" -#: ../geanylatex/src/geanylatex.c:1758 +#: ../geanylatex/src/geanylatex.c:1755 msgid "Choose the kind of document you want to write" msgstr "Elija el tipo de documento que desea escribir" -#: ../geanylatex/src/geanylatex.c:1762 +#: ../geanylatex/src/geanylatex.c:1759 msgid "Article" msgstr "Artículo" -#: ../geanylatex/src/geanylatex.c:1764 +#: ../geanylatex/src/geanylatex.c:1761 msgid "Report" msgstr "Informe" -#: ../geanylatex/src/geanylatex.c:1766 +#: ../geanylatex/src/geanylatex.c:1763 msgid "Letter" msgstr "Carta" -#: ../geanylatex/src/geanylatex.c:1768 +#: ../geanylatex/src/geanylatex.c:1765 msgid "Presentation" msgstr "Presentación" #. Encoding -#: ../geanylatex/src/geanylatex.c:1778 +#: ../geanylatex/src/geanylatex.c:1775 msgid "Encoding:" msgstr "Codificación:" -#: ../geanylatex/src/geanylatex.c:1782 +#: ../geanylatex/src/geanylatex.c:1779 msgid "Set the encoding for your new document" msgstr "Establezca la codificación para su nuevo documento" #. fontsize -#: ../geanylatex/src/geanylatex.c:1798 +#: ../geanylatex/src/geanylatex.c:1795 msgid "Font size" msgstr "Tamaño de letra" -#: ../geanylatex/src/geanylatex.c:1804 +#: ../geanylatex/src/geanylatex.c:1801 msgid "Set the default font size of your new document" msgstr "Establezca el tamaño de letra por defecto de su nuevo documento" #. Author -#: ../geanylatex/src/geanylatex.c:1816 +#: ../geanylatex/src/geanylatex.c:1813 msgid "Author:" msgstr "Autor:" -#: ../geanylatex/src/geanylatex.c:1819 +#: ../geanylatex/src/geanylatex.c:1816 msgid "" "Sets the value of the \\author command. In most cases this should be your " "name" @@ -2038,11 +2064,11 @@ "debería ser su nombre" #. Date -#: ../geanylatex/src/geanylatex.c:1833 +#: ../geanylatex/src/geanylatex.c:1830 msgid "Date:" msgstr "Fecha:" -#: ../geanylatex/src/geanylatex.c:1836 +#: ../geanylatex/src/geanylatex.c:1833 msgid "" "Sets the value of the \\date command inside header of your new created LaTeX-" "document. Keeping it at \\today is a good decision if you don't need any " @@ -2053,37 +2079,37 @@ "si usted no necesita ninguna fecha fija." #. Title of the new document -#: ../geanylatex/src/geanylatex.c:1848 +#: ../geanylatex/src/geanylatex.c:1845 msgid "Title:" msgstr "Título:" -#: ../geanylatex/src/geanylatex.c:1851 +#: ../geanylatex/src/geanylatex.c:1848 msgid "Sets the title of your new document." msgstr "Establece el título de su nuevo documento." #. Papersize -#: ../geanylatex/src/geanylatex.c:1860 +#: ../geanylatex/src/geanylatex.c:1857 msgid "Paper size:" msgstr "Tamaño del papel:" -#: ../geanylatex/src/geanylatex.c:1863 +#: ../geanylatex/src/geanylatex.c:1860 msgid "Choose the paper format for the newly created document" msgstr "Elija el formato de papel para el nuevo documento creado" #. Paper direction -#: ../geanylatex/src/geanylatex.c:1876 +#: ../geanylatex/src/geanylatex.c:1873 msgid "Paper Orientation:" msgstr "Orientación de papel:" -#: ../geanylatex/src/geanylatex.c:1879 +#: ../geanylatex/src/geanylatex.c:1876 msgid "Choose the paper orientation for the newly created document" msgstr "Elija la orientación de papel para el nuevo documento creado" -#: ../geanylatex/src/geanylatex.c:1900 +#: ../geanylatex/src/geanylatex.c:1897 msgid "Use KOMA-script classes if possible" msgstr "Utilizar clases de script KOMA si es posible" -#: ../geanylatex/src/geanylatex.c:1902 +#: ../geanylatex/src/geanylatex.c:1899 msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" "Keep in mind: To compile your document these classes have to be installed " @@ -2093,11 +2119,11 @@ "No olvide que para compilar su documento, estas clases deben ser instaladas " "primero." -#: ../geanylatex/src/geanylatex.c:1909 +#: ../geanylatex/src/geanylatex.c:1906 msgid "Use draft mode" msgstr "Usar modo borrador" -#: ../geanylatex/src/geanylatex.c:1911 +#: ../geanylatex/src/geanylatex.c:1908 msgid "" "Set the draft flag inside new created documents to get documents with a " "number of debugging helpers" @@ -2105,95 +2131,95 @@ "Establece el modo borrador en los nuevos documentos creados para obtener " "documentos con cierta cantidad de ayudantes de depuración" -#: ../geanylatex/src/geanylatex.c:1928 +#: ../geanylatex/src/geanylatex.c:1925 msgid "Run LaTeX-Wizard" msgstr "Ejecutar el asistente LaTeX" -#: ../geanylatex/src/geanylatex.c:1930 +#: ../geanylatex/src/geanylatex.c:1927 msgid "Insert \\label" msgstr "Insertar \\label" -#: ../geanylatex/src/geanylatex.c:1932 +#: ../geanylatex/src/geanylatex.c:1929 msgid "Insert \\ref" msgstr "Insertar \\ref" -#: ../geanylatex/src/geanylatex.c:1934 +#: ../geanylatex/src/geanylatex.c:1931 msgid "Insert linebreak \\\\ " msgstr "Insertar salto de línea \\\\" -#: ../geanylatex/src/geanylatex.c:1937 +#: ../geanylatex/src/geanylatex.c:1934 msgid "Insert command" msgstr "Insertar comando" -#: ../geanylatex/src/geanylatex.c:1939 +#: ../geanylatex/src/geanylatex.c:1936 msgid "Turn input replacement on/off" msgstr "Activar/desactivar reemplazo de entrada" -#: ../geanylatex/src/geanylatex.c:1943 +#: ../geanylatex/src/geanylatex.c:1940 msgid "Replace special characters" msgstr "Reemplazar caracteres especiales" -#: ../geanylatex/src/geanylatex.c:1946 +#: ../geanylatex/src/geanylatex.c:1943 msgid "Run insert environment dialog" msgstr "Ejecutar diálogo de insertar entorno" -#: ../geanylatex/src/geanylatex.c:1948 +#: ../geanylatex/src/geanylatex.c:1945 msgid "Insert \\item" msgstr "Insertar \\item" -#: ../geanylatex/src/geanylatex.c:1950 +#: ../geanylatex/src/geanylatex.c:1947 msgid "Format selection in bold font face" msgstr "Aplicar negrita a la selección" -#: ../geanylatex/src/geanylatex.c:1952 +#: ../geanylatex/src/geanylatex.c:1949 msgid "Format selection in italic font face" msgstr "Aplicar cursiva a la selección" -#: ../geanylatex/src/geanylatex.c:1954 +#: ../geanylatex/src/geanylatex.c:1951 msgid "Format selection in typewriter font face" msgstr "Aplicar fuente Typewriter a la selección" -#: ../geanylatex/src/geanylatex.c:1956 +#: ../geanylatex/src/geanylatex.c:1953 msgid "Format selection centered" msgstr "Centrar selección" -#: ../geanylatex/src/geanylatex.c:1958 +#: ../geanylatex/src/geanylatex.c:1955 msgid "Format selection left-aligned" msgstr "Alinear selección a la izquierda" -#: ../geanylatex/src/geanylatex.c:1960 +#: ../geanylatex/src/geanylatex.c:1957 msgid "Format selection right-aligned" msgstr "Alinear selección a la derecha" -#: ../geanylatex/src/geanylatex.c:1963 +#: ../geanylatex/src/geanylatex.c:1960 msgid "Insert description list" msgstr "Insertar lista de tipo description" -#: ../geanylatex/src/geanylatex.c:1966 +#: ../geanylatex/src/geanylatex.c:1963 msgid "Insert itemize list" msgstr "Insertar lista de tipo itemize" -#: ../geanylatex/src/geanylatex.c:1969 +#: ../geanylatex/src/geanylatex.c:1966 msgid "Insert enumerate list" msgstr "Insertar lista de tipo enumerate" -#: ../geanylatex/src/geanylatex.c:1972 +#: ../geanylatex/src/geanylatex.c:1969 msgid "Set selection one level up" msgstr "Establecer la selección a un nivel más arriba" -#: ../geanylatex/src/geanylatex.c:1975 +#: ../geanylatex/src/geanylatex.c:1972 msgid "Set selection one level down" msgstr "Establecer la selección a un nivel más abajo" -#: ../geanylatex/src/geanylatex.c:1978 +#: ../geanylatex/src/geanylatex.c:1975 msgid "Insert \\usepackage{}" msgstr "Insertar \\usepackage{}" -#: ../geanylatex/src/geanylatex.c:1981 +#: ../geanylatex/src/geanylatex.c:1978 msgid "Insert BibTeX reference dialog" msgstr "Diálogo insertar referencia BibTeX" -#: ../geanylatex/src/geanylatex.c:1988 +#: ../geanylatex/src/geanylatex.c:1985 msgid "" "GeanyLaTeX is a plugin to improve support for LaTeX in Geany.\n" "\n" @@ -2204,7 +2230,7 @@ "Por favor, notifique todos los fallos o características deseadas a " "cualquiera de los autores." -#: ../geanylatex/src/geanylatex.c:2026 +#: ../geanylatex/src/geanylatex.c:2023 msgid "" "glatex_set_autocompletion_contextsize has been initialized with an invalid " "value. Default value taken. Please check your configuration file" @@ -2213,117 +2239,117 @@ "válido. Por tanto, se ha tomado el valor por defecto. Por favor, revise su " "archivo de configuración" -#: ../geanylatex/src/geanylatex.c:2048 ../geanylatex/src/geanylatex.c:2055 +#: ../geanylatex/src/geanylatex.c:2045 ../geanylatex/src/geanylatex.c:2052 msgid "page \\pageref{{{reference}}}" msgstr "página \\pageref{{{reference}}}" -#: ../geanylatex/src/geanylatex.c:2052 ../geanylatex/src/geanylatex.c:2059 +#: ../geanylatex/src/geanylatex.c:2049 ../geanylatex/src/geanylatex.c:2056 msgid "\\ref{{{reference}}}, page \\pageref{{{reference}}}" msgstr "\\ref{{{reference}}}, página \\pageref{{{reference}}}" #. Build up menu for menubar -#: ../geanylatex/src/geanylatex.c:2107 +#: ../geanylatex/src/geanylatex.c:2104 msgid "_LaTeX" msgstr "_LaTeX" #. Filling up menubar menus #. LaTeX menu -#: ../geanylatex/src/geanylatex.c:2116 ../geanylatex/src/geanylatex.c:2328 +#: ../geanylatex/src/geanylatex.c:2113 ../geanylatex/src/geanylatex.c:2325 msgid "LaTeX-_Wizard" msgstr "_Asistente LaTeX" -#: ../geanylatex/src/geanylatex.c:2119 ../geanylatex/src/geanylatex.c:2331 +#: ../geanylatex/src/geanylatex.c:2116 ../geanylatex/src/geanylatex.c:2328 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "Inicia un asistente para crear fácilmente documentos de LaTeX" -#: ../geanylatex/src/geanylatex.c:2124 +#: ../geanylatex/src/geanylatex.c:2121 msgid "I_nsert Special Character" msgstr "I_nsertar carácter especial" -#: ../geanylatex/src/geanylatex.c:2126 +#: ../geanylatex/src/geanylatex.c:2123 msgid "Helps to use some not very common letters and signs" msgstr "Ayuda a utilizar algunos símbolos y letras poco comunes" -#: ../geanylatex/src/geanylatex.c:2136 +#: ../geanylatex/src/geanylatex.c:2133 msgid "Insert _Reference" msgstr "Insertar _referencia" -#: ../geanylatex/src/geanylatex.c:2138 +#: ../geanylatex/src/geanylatex.c:2135 msgid "Inserting references to the document" msgstr "Insertar referencias al documento" -#: ../geanylatex/src/geanylatex.c:2143 +#: ../geanylatex/src/geanylatex.c:2140 msgid "Insert _Label" msgstr "Insertar _etiqueta" -#: ../geanylatex/src/geanylatex.c:2145 +#: ../geanylatex/src/geanylatex.c:2142 msgid "Helps at inserting labels to a document" msgstr "Ayuda a insertar etiquetas a un documento" -#: ../geanylatex/src/geanylatex.c:2151 +#: ../geanylatex/src/geanylatex.c:2148 msgid "Insert _Environment" msgstr "Insertar _entorno" -#: ../geanylatex/src/geanylatex.c:2153 +#: ../geanylatex/src/geanylatex.c:2150 msgid "Helps at inserting an environment a document" msgstr "Ayuda a insertar un entorno a un documento" -#: ../geanylatex/src/geanylatex.c:2159 +#: ../geanylatex/src/geanylatex.c:2156 msgid "Insert P_ackage" msgstr "Insertar _paquete" -#: ../geanylatex/src/geanylatex.c:2161 +#: ../geanylatex/src/geanylatex.c:2158 msgid "A small dialog to insert \\usepackage{} into header of current file" msgstr "" "Un pequeño diálogo para insertar \\usepackage{} en la cabecera del fichero " "actual" -#: ../geanylatex/src/geanylatex.c:2166 ../scope/data/scope.glade.h:82 +#: ../geanylatex/src/geanylatex.c:2163 ../scope/data/scope.glade.h:58 msgid "_Format" msgstr "_Formato" #. Add font size menu -#: ../geanylatex/src/geanylatex.c:2183 +#: ../geanylatex/src/geanylatex.c:2180 msgid "F_ont size" msgstr "Tamaño de _fuente" -#: ../geanylatex/src/geanylatex.c:2201 +#: ../geanylatex/src/geanylatex.c:2198 msgid "_Special Character Replacement" msgstr "Reemplazo de caractere_s especiales" -#: ../geanylatex/src/geanylatex.c:2209 +#: ../geanylatex/src/geanylatex.c:2206 msgid "Bulk _Replace Special Characters" msgstr "_Reemplazar caracteres especiales de forma masiva" -#: ../geanylatex/src/geanylatex.c:2211 +#: ../geanylatex/src/geanylatex.c:2208 msgid "_Replace selected special characters with TeX substitutes" msgstr "_Reemplazar caracteres especiales seleccionados con sustitutos TeX" -#: ../geanylatex/src/geanylatex.c:2219 +#: ../geanylatex/src/geanylatex.c:2216 msgid "Toggle _Special Character Replacement" msgstr "Alternar reemplazo de caractere_s especiales" -#: ../geanylatex/src/geanylatex.c:2230 +#: ../geanylatex/src/geanylatex.c:2227 msgid "Insert _Command" msgstr "Insertar _comando" -#: ../geanylatex/src/geanylatex.c:2232 +#: ../geanylatex/src/geanylatex.c:2229 msgid "Inserting costumized command to document" msgstr "Insertar comando personalizado en el documento" -#: ../geanylatex/src/geanylatex.c:2257 +#: ../geanylatex/src/geanylatex.c:2254 msgid "_BibTeX" msgstr "_BibTeX" -#: ../geanylatex/src/geanylatex.c:2265 +#: ../geanylatex/src/geanylatex.c:2262 msgid "Insert B_ibTeX reference" msgstr "Insertar referencia B_ibTeX" -#: ../geanylatex/src/geanylatex.c:2267 +#: ../geanylatex/src/geanylatex.c:2264 msgid "Helps to insert a reference out of BibTeX files" msgstr "Ayuda a la inserción de referencias de archivos BibTeX" -#: ../geanylatex/src/geanylatex.c:2272 +#: ../geanylatex/src/geanylatex.c:2269 msgid "_BibTeX entries" msgstr "Entradas _BibTeX" @@ -2479,16 +2505,16 @@ msgid "Creating dummy text with Geany" msgstr "Creando texto de relleno con Geany" -#: ../geanylipsum/src/geanylipsum.c:86 +#: ../geanylipsum/src/geanylipsum.c:89 msgid "Lipsum-Generator" msgstr "Generador Lipsum" -#: ../geanylipsum/src/geanylipsum.c:87 +#: ../geanylipsum/src/geanylipsum.c:90 msgid "Enter the length of Lipsum text here" msgstr "Introduzca la longitud del texto Lipsum" #. Building menu entry -#: ../geanylipsum/src/geanylipsum.c:163 +#: ../geanylipsum/src/geanylipsum.c:164 msgid "_Lipsum" msgstr "_Lipsum" @@ -2626,19 +2652,19 @@ msgid "Browse..." msgstr "Explorar..." -#: ../geanylua/gsdlg.c:175 +#: ../geanylua/gsdlg.c:176 msgid "Select Color" msgstr "Seleccionar color" -#: ../geanylua/gsdlg.c:205 +#: ../geanylua/gsdlg.c:207 msgid "Choose..." msgstr "Elegir..." -#: ../geanylua/gsdlg.c:226 +#: ../geanylua/gsdlg.c:228 msgid "Select Font" msgstr "Seleccionar fuente" -#: ../geanylua/gsdlg.c:253 +#: ../geanylua/gsdlg.c:255 msgid "Select..." msgstr "Seleccionar..." @@ -2669,7 +2695,7 @@ "Error en el módulo «%s» en la función %s()\n" "no hay argumentos suficientes para el comando «%s».\n" -#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:398 +#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:396 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2709,7 +2735,7 @@ msgid "Save file" msgstr "Guardar archivo" -#: ../geanylua/glspi_dlg.c:436 +#: ../geanylua/glspi_dlg.c:438 #, c-format msgid "" "Error in module \"%s\" at function pickfile():\n" @@ -2718,7 +2744,7 @@ "Error en el módulo «%s» en la función pickfile()\n" "no se ha podido interpretar la cadena del filtro en el eargumento nº 3.\n" -#: ../geanylua/glspi_dlg.c:486 +#: ../geanylua/glspi_dlg.c:489 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2765,7 +2791,7 @@ "El complemento %s no se ha cargado correctamente.\n" "Compruebe su instalación." -#: ../geanylua/glspi_app.c:19 +#: ../geanylua/glspi_app.c:21 #, c-format msgid "" "%s %s: %s\n" @@ -2774,7 +2800,7 @@ "%s %s: %s\n" "Copyright (c) 2007-2010 " -#: ../geanylua/glspi_app.c:149 +#: ../geanylua/glspi_app.c:151 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2783,7 +2809,7 @@ "Error en el módulo «%s» en la función %s()\n" "no se encuentra el componente «%s» para el argumento nº1.\n" -#: ../geanylua/glspi_app.c:158 +#: ../geanylua/glspi_app.c:160 #, c-format msgid "" "Error in module \"%s\" at function %s() argument #2:\n" @@ -3136,6 +3162,18 @@ "Insertar un duplicado del texto seleccionado después de la selección. Si no " "hay nada seleccionado, duplicar la línea" +#: ../geanymacro/src/geanymacro.c:150 +msgid "Search for next \"\"" +msgstr "Buscar siguiente \"\"" + +#: ../geanymacro/src/geanymacro.c:151 +msgid "Search for previous \"\"" +msgstr "Buscar anterior \"\"" + +#: ../geanymacro/src/geanymacro.c:152 +msgid "Set start of search to beginning of selection" +msgstr "Mover inicio de búsqueda a inicio de selección" + #: ../geanymacro/src/geanymacro.c:181 msgid "Macros" msgstr "Macros" @@ -3382,12 +3420,12 @@ #. create buttons #: ../geanymacro/src/geanymacro.c:1393 ../geanymacro/src/geanymacro.c:1536 -#: ../geanymacro/src/geanymacro.c:1819 ../geanymacro/src/geanymacro.c:2116 +#: ../geanymacro/src/geanymacro.c:1826 ../geanymacro/src/geanymacro.c:2122 msgid "_Ok" msgstr "_Ok" #: ../geanymacro/src/geanymacro.c:1394 ../geanymacro/src/geanymacro.c:1537 -#: ../geanymacro/src/geanymacro.c:1820 +#: ../geanymacro/src/geanymacro.c:1827 msgid "_Cancel" msgstr "_Cancelar" @@ -3404,7 +3442,7 @@ msgid "Search for contents of clipboard" msgstr "Buscar el contenido del portapapeles" -#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:92 +#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:101 msgid "Search for:" msgstr "Buscar:" @@ -3438,58 +3476,58 @@ msgid "Text:" msgstr "Texto:" -#: ../geanymacro/src/geanymacro.c:1571 ../geanymacro/src/geanymacro.c:1755 +#: ../geanymacro/src/geanymacro.c:1570 ../geanymacro/src/geanymacro.c:1758 #, c-format msgid "Insert/replace with \"%s\"" msgstr "Insertar/reemplazar con «%s»" #. create dialog box -#: ../geanymacro/src/geanymacro.c:1731 +#: ../geanymacro/src/geanymacro.c:1735 #, c-format msgid "Edit: %s" msgstr "Editar: %s" #. add column -#: ../geanymacro/src/geanymacro.c:1794 +#: ../geanymacro/src/geanymacro.c:1801 msgid "Event" msgstr "Evento" #. add buttons -#: ../geanymacro/src/geanymacro.c:1809 +#: ../geanymacro/src/geanymacro.c:1816 msgid "Move _Up" msgstr "Mover hacia _arriba" -#: ../geanymacro/src/geanymacro.c:1811 +#: ../geanymacro/src/geanymacro.c:1818 msgid "Move Do_wn" msgstr "Mover hacia a_bajo" -#: ../geanymacro/src/geanymacro.c:1813 +#: ../geanymacro/src/geanymacro.c:1820 msgid "New _Above" msgstr "Nuevo _encima" -#: ../geanymacro/src/geanymacro.c:1814 +#: ../geanymacro/src/geanymacro.c:1821 msgid "New _Below" msgstr "Nuevo _debajo" -#: ../geanymacro/src/geanymacro.c:1817 ../geanymacro/src/geanymacro.c:2114 +#: ../geanymacro/src/geanymacro.c:1824 ../geanymacro/src/geanymacro.c:2120 msgid "_Delete" msgstr "_Eliminar" #. create dialog box -#: ../geanymacro/src/geanymacro.c:2059 +#: ../geanymacro/src/geanymacro.c:2065 msgid "Edit Macros" msgstr "Editar macros" -#: ../geanymacro/src/geanymacro.c:2089 +#: ../geanymacro/src/geanymacro.c:2095 msgid "Macro Name" msgstr "Nombre de macro" -#: ../geanymacro/src/geanymacro.c:2095 +#: ../geanymacro/src/geanymacro.c:2101 msgid "Key Trigger" msgstr "Tecla del disparador" #. add buttons -#: ../geanymacro/src/geanymacro.c:2110 +#: ../geanymacro/src/geanymacro.c:2116 msgid "_Re-Record" msgstr "_Regrabar" @@ -3508,6 +3546,55 @@ msgid "_Edit Macros" msgstr "_Editar macros" +#. *< \brief It's the information message about geany mini script +#: ../geanyminiscript/src/gms_gui.c:129 +msgid "" +"GMS : Geany Mini-Script filter Plugin\n" +"This plugin is a tool to apply a script filter on:\n" +" o the text selection,\n" +" o the current document,\n" +" o all documents of the current session.\n" +"\n" +"The filter type can be:\n" +" o Unix shell script,\n" +" o perl script,\n" +" o python script,\n" +" o sed commands,\n" +" o awk script.\n" +"\n" +"AUTHOR\n" +" Written by Pascal BURLOT (December,2008)\n" +"\n" +"LICENSE:\n" +"This program is free software; you can redistribute\n" +"it and/or modify it under the terms of the GNU \n" +"General Public License as published by the Free\n" +"Software Foundation; either version 2 of the License,\n" +"or (at your option) any later version." +msgstr "" +"GMS: Plugin de filtro Geany Mini-Script\n" +"Este plugin es una herramienta para aplicar un filtro de script a:\n" +" o la selección de texto,\n" +" o el documento actual,\n" +" o todos los documentos de la sesión actual.\n" +"\n" +"El filtro puede ser de tipo:\n" +" o script shell Unix,\n" +" o script perl,\n" +" o script python,\n" +" o commandos sed,\n" +" o script awk.\n" +"\n" +"AUTOR\n" +" Escrito por Pascal BURLOT (Diciembre, 2008)\n" +"\n" +"LICENCIA:\n" +"This program is free software; you can redistribute\n" +"it and/or modify it under the terms of the GNU \n" +"General Public License as published by the Free\n" +"Software Foundation; either version 2 of the License,\n" +"or (at your option) any later version." + #: ../geanyminiscript/src/gms_gui.c:253 msgid "Load Mini-Script File" msgstr "Cargar archivo mini-script" @@ -3516,113 +3603,112 @@ msgid "Save Mini-Script File" msgstr "Guardar archivo mini-script" -#: ../geanyminiscript/src/gms_gui.c:418 +#: ../geanyminiscript/src/gms_gui.c:419 msgid "Mini-Script Filter" msgstr "Filto mini-script" -#: ../geanyminiscript/src/gms_gui.c:446 +#: ../geanyminiscript/src/gms_gui.c:445 msgid "Clear the mini-script window" msgstr "Limpiar la ventana de mini-script" -#: ../geanyminiscript/src/gms_gui.c:451 +#: ../geanyminiscript/src/gms_gui.c:450 msgid "Load a mini-script into this window" msgstr "Cargar un mini-script en esta ventana" -#: ../geanyminiscript/src/gms_gui.c:456 +#: ../geanyminiscript/src/gms_gui.c:455 msgid "Save the mini-script into a file" msgstr "Guardar el mini-script en un archivo" -#: ../geanyminiscript/src/gms_gui.c:461 +#: ../geanyminiscript/src/gms_gui.c:460 msgid "Display a information about the mini-script plugin" msgstr "Mostrar información acerca de plugin mini-script" -#: ../geanyminiscript/src/gms_gui.c:469 +#: ../geanyminiscript/src/gms_gui.c:468 msgid "select the mini-script type" msgstr "seleccionar el tipo de mini-script" #. Hbox : Radio bouttons for choosing the input: #. * selection/current document/all documents of the current session -#: ../geanyminiscript/src/gms_gui.c:500 +#: ../geanyminiscript/src/gms_gui.c:499 msgid "filter input" msgstr "entrada del filtro" -#: ../geanyminiscript/src/gms_gui.c:502 +#: ../geanyminiscript/src/gms_gui.c:501 msgid "select the input of mini-script filter" msgstr "seleccionar la entrada del filtro del mini-script" -#: ../geanyminiscript/src/gms_gui.c:508 +#: ../geanyminiscript/src/gms_gui.c:507 msgid "selection" msgstr "selección" -#: ../geanyminiscript/src/gms_gui.c:509 +#: ../geanyminiscript/src/gms_gui.c:508 msgid "document" msgstr "documento" -#: ../geanyminiscript/src/gms_gui.c:510 +#: ../geanyminiscript/src/gms_gui.c:509 msgid "session" msgstr "sesión" #. Hbox : Radio bouttons for choosing the output: #. * current document/ or new document -#: ../geanyminiscript/src/gms_gui.c:519 +#: ../geanyminiscript/src/gms_gui.c:518 msgid "filter output" msgstr "salida del filtro" -#: ../geanyminiscript/src/gms_gui.c:521 +#: ../geanyminiscript/src/gms_gui.c:520 msgid "select the output of mini-script filter" msgstr "seleccionar la salida del filtro del mini-script" -#: ../geanyminiscript/src/gms_gui.c:527 +#: ../geanyminiscript/src/gms_gui.c:526 msgid "Current Doc." msgstr "Documento actual" -#: ../geanyminiscript/src/gms_gui.c:528 +#: ../geanyminiscript/src/gms_gui.c:527 msgid "New Doc." msgstr "Documento nuevo" -#: ../geanyminiscript/src/gms_gui.c:749 +#: ../geanyminiscript/src/gms_gui.c:748 msgid "script configuration" msgstr "configuración de script" -#. All plugins must set name, description, version and author. #: ../geanyminiscript/src/gms.c:58 msgid "Mini Script" msgstr "Mini Script" -#: ../geanyminiscript/src/gms.c:58 +#: ../geanyminiscript/src/gms.c:59 msgid "" "A tool to apply a script filter on a text selection or current document(s)" msgstr "" "Una herramienta para aplicar un filtro de script sobre una selección de " "texto o un documento actual" -#: ../geanyminiscript/src/gms.c:59 +#: ../geanyminiscript/src/gms.c:60 msgid "Pascal BURLOT, a Geany user" msgstr "Pascal BURLOT, un usuario de Geany" #. Add an item to the Tools menu -#: ../geanyminiscript/src/gms.c:278 +#: ../geanyminiscript/src/gms.c:249 msgid "_Mini-Script" msgstr "_Mini-Script" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:58 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:61 msgid "Numbered Bookmarks for Geany" msgstr "Marcadores numerados para Geany" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:923 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:927 #, c-format msgid "Unable to apply all markers to '%s' as all being used." msgstr "" "No se han podido aplicar todos los marcadores a «%s» ya que todos están en " "uso." -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:925 -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:969 -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1392 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:929 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:973 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1396 msgid "_Okay" msgstr "_OK" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:967 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:971 #, c-format msgid "" "'%s' has been edited since it was last saved by geany. Marker positions may " @@ -3633,52 +3719,52 @@ "posiciones de los marcadores no son fiables y no serán cargadas.\n" "Pulse «Ignorar» para intentar cargar los marcadores de todos modos." -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:970 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:974 msgid "_Ignore" msgstr "_Ignorar" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1215 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1219 msgid "remember fold state" msgstr "recordar estado de plegado" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1221 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1225 msgid "Center view when goto bookmark" msgstr "Centrar vista al ir a un marcador" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1228 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1232 msgid "Move to start of line" msgstr "Mover al inicio de la línea" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1229 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1233 msgid "Move to remembered position in line" msgstr "Mover a la posición recordada de la línea" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1230 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1234 msgid "Move to position in current line" msgstr "Mover a la posición en la línea actual" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1231 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1235 msgid "Move to End of line" msgstr "Mover al final de la línea" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1237 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1241 msgid "Save file settings with program settings" msgstr "Guardar los ajustes del archivo con los ajustes del programa" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1238 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1242 msgid "Save file settings to filename with suffix" msgstr "Guardar los ajustes del archivo a un nombre de fichero con sufijo" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1243 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1247 msgid "remember normal Bookmarks" msgstr "recordar marcadores normales" #. create dialog box -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1263 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1267 msgid "Numbered Bookmarks help" msgstr "Ayuda de marcadores numerados" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1270 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1274 msgid "" "This Plugin implements Numbered Bookmarks in Geany, as well as remembering " "the state of folds, and positions of standard non-numbered bookmarks when a " @@ -3706,7 +3792,7 @@ "podrá tener más de un marcador por línea. Para moverse a un marcador fijado " "anteriormente, pulse Ctrl+un número de 0 a 9." -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1391 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1395 msgid "Unable to apply markers as all being used." msgstr "No se pueden aplicar marcadores ya que están todos ocupados." @@ -3793,36 +3879,36 @@ msgstr "Seleccionar firmante" #. shouldn't get here -#: ../geanypg/src/pinentry.c:107 +#: ../geanypg/src/pinentry.c:111 msgid "Could not use pinentry." msgstr "No pudo usar pinentry" -#: ../geanypg/src/pinentry.c:119 +#: ../geanypg/src/pinentry.c:123 msgid "Unexpected output from pinentry." msgstr "Salida inesperado desde pinentry" #. read the rest of the first line after OK -#: ../geanypg/src/pinentry.c:127 +#: ../geanypg/src/pinentry.c:131 msgid "Passphrase entry" msgstr "entrada de contraseña" -#: ../geanypg/src/pinentry.c:131 +#: ../geanypg/src/pinentry.c:135 msgid "Passphrase" msgstr "Contraseña" -#: ../geanypg/src/pinentry.c:136 +#: ../geanypg/src/pinentry.c:140 msgid "Enter passphrase for" msgstr "Entra contraseña para" -#: ../geanypg/src/pinentry.c:167 +#: ../geanypg/src/pinentry.c:171 msgid "pinentry gave error" msgstr "pinentry ha hecho un error" -#: ../geanypg/src/pinentry.c:170 +#: ../geanypg/src/pinentry.c:174 msgid "Unexpected error from pinentry." msgstr "Error inesperado desde pinentry" -#: ../geanypg/src/pinentry.c:195 +#: ../geanypg/src/pinentry.c:199 msgid "" "Error, Passphrase input without using gpg-agent is not supported on Windows " "yet." @@ -3834,8 +3920,8 @@ msgid "a key with fingerprint" msgstr "un clave con huella dactilar" -#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:522 -#: ../spellcheck/src/gui.c:533 +#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:527 +#: ../spellcheck/src/gui.c:538 msgid "unknown" msgstr "desconocido" @@ -4002,7 +4088,7 @@ msgstr "Abrir archivo de firma" #: ../geanyprj/src/geanyprj.c:38 ../geanyprj/src/sidebar.c:456 -#: ../gproject/src/gproject-sidebar.c:822 +#: ../gproject/src/gproject-sidebar.c:870 msgid "Project" msgstr "Proyecto" @@ -4031,7 +4117,7 @@ msgid "C_reate" msgstr "C_rear" -#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:29 +#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:114 msgid "Name:" msgstr "Nombre:" @@ -4109,7 +4195,7 @@ msgid "Remove File" msgstr "Eliminar archivo" -#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:803 +#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:849 msgid "H_ide Sidebar" msgstr "Ocultar barra _lateral" @@ -4118,6 +4204,48 @@ msgid "Project \"%s\" opened." msgstr "Se ha abierto el proyecto «%s»." +#: ../geanypy/src/geanypy-plugin.c:34 +msgid "GeanyPy" +msgstr "GeanyPy" + +#: ../geanypy/src/geanypy-plugin.c:35 +msgid "Python plugins support" +msgstr "Soporte para plugins Python" + +#: ../geanypy/src/geanypy-plugin.c:77 +#, c-format +msgid "Unable to pre-load Python library: %s." +msgstr "No se ha podido precargar la biblioteca Python: %s." + +#: ../geanypy/src/geanypy-plugin.c:157 +msgid "Failed to import manager module" +msgstr "No de ha podido importar el módulo de gestión" + +#: ../geanypy/src/geanypy-plugin.c:166 +msgid "Failed to retrieve PluginManager from manager module" +msgstr "Ha fallado la importación de PluginManager del módulo de gestión" + +#: ../geanypy/src/geanypy-plugin.c:182 +msgid "System plugin directory not found." +msgstr "No se ha encontrado el directorio de plugins del sistema." + +#: ../geanypy/src/geanypy-plugin.c:211 +msgid "Unable to instantiate new PluginManager" +msgstr "No se ha podido instanciar un nuevo PluginManager" + +#: ../geanypy/src/geanypy-plugin.c:227 +msgid "Unable to get show_all() method on plugin manager" +msgstr "No de ha podido obtener el método get_all() en el gestor de plugins" + +#: ../geanypy/src/geanypy-plugin.c:255 +#, c-format +msgid "Unable to create Python plugins directory: %s: %s" +msgstr "No se ha podido crear el directorio de plugins Python: %s: %s" + +#: ../geanypy/src/geanypy-plugin.c:266 +msgid "Python Plugin Manager" +msgstr "Gestor de plugins Python" + #: ../geanysendmail/src/geanysendmail.c:43 msgid "GeanySendMail" msgstr "GeanySendMail" @@ -4138,13 +4266,13 @@ msgid "Enter the recipient's e-mail address:" msgstr "Introduzca la dirección e-mail del destinatario:" -#: ../geanysendmail/src/geanysendmail.c:136 +#: ../geanysendmail/src/geanysendmail.c:138 msgid "Filename placeholder not found. The executed command might have failed." msgstr "" "No se ha encontrado el sustituto del nombre de archivo. El comando ejecutado " "podría haber fallado." -#: ../geanysendmail/src/geanysendmail.c:142 +#: ../geanysendmail/src/geanysendmail.c:144 msgid "" "Recipient address placeholder not found. The executed command might have " "failed." @@ -4152,33 +4280,33 @@ "No se ha encontrado el sustituto de la dirección email del destinatario. El " "comando ejecutado podría haber fallado." -#: ../geanysendmail/src/geanysendmail.c:157 +#: ../geanysendmail/src/geanysendmail.c:159 msgid "Could not execute mailer. Please check your configuration." msgstr "" "No se ha podido ejecutar el programa de correo. Compruebe su configuración." -#: ../geanysendmail/src/geanysendmail.c:166 +#: ../geanysendmail/src/geanysendmail.c:168 msgid "Please define a mail client first." msgstr "Primero debe definir un cliente de correo." -#: ../geanysendmail/src/geanysendmail.c:171 +#: ../geanysendmail/src/geanysendmail.c:173 msgid "File has to be saved before sending." msgstr "Debe guardar el archivo antes de enviar." -#: ../geanysendmail/src/geanysendmail.c:187 +#: ../geanysendmail/src/geanysendmail.c:191 msgid "Mail" msgstr "Enviar" -#: ../geanysendmail/src/geanysendmail.c:218 +#: ../geanysendmail/src/geanysendmail.c:222 msgid "Send by mail" msgstr "Enviar por correo electrónico" #. add a label and a text entry to the dialog -#: ../geanysendmail/src/geanysendmail.c:308 +#: ../geanysendmail/src/geanysendmail.c:312 msgid "Path and options for the mail client:" msgstr "Ruta y opciones del cliente de correo:" -#: ../geanysendmail/src/geanysendmail.c:316 +#: ../geanysendmail/src/geanysendmail.c:320 msgid "" "Note: \n" "\t%f will be replaced by your file.\n" @@ -4196,31 +4324,31 @@ "\tsylpheed --attach \"%f\" --compose \"%r\"\n" "\tmutt -s \"Enviando '%b'\" -a \"%f\" \"%r\"" -#: ../geanysendmail/src/geanysendmail.c:326 +#: ../geanysendmail/src/geanysendmail.c:330 msgid "Show toolbar icon" msgstr "Mostrar icono en la barra de herramientas" -#: ../geanysendmail/src/geanysendmail.c:328 +#: ../geanysendmail/src/geanysendmail.c:332 msgid "Shows a icon in the toolbar to send file more easy." msgstr "" "Muestra un icono en la barra de herramientas para enviar el archivo más " "fácilmente." -#: ../geanysendmail/src/geanysendmail.c:334 +#: ../geanysendmail/src/geanysendmail.c:338 msgid "Use dialog for entering email address of recipients" msgstr "" "Usar un diálogo para introducir la dirección de correo de los destinatarios" -#: ../geanysendmail/src/geanysendmail.c:356 +#: ../geanysendmail/src/geanysendmail.c:360 msgid "Send file by mail" msgstr "Enviar archivo por correo electrónico" #. Build up menu entry -#: ../geanysendmail/src/geanysendmail.c:379 +#: ../geanysendmail/src/geanysendmail.c:383 msgid "_Mail document" msgstr "Enviar docu_mento" -#: ../geanysendmail/src/geanysendmail.c:382 +#: ../geanysendmail/src/geanysendmail.c:386 msgid "" "Sends the opened file as unzipped attachment by any mailer from your $PATH" msgstr "" @@ -4240,76 +4368,99 @@ msgid "geanyvc: s_spawn_sync error: %s" msgstr "Error de geanyvc: s_spawn_sync: %s" -#: ../geanyvc/src/geanyvc.c:609 ../geanyvc/src/geanyvc.c:620 +#: ../geanyvc/src/geanyvc.c:561 +#, c-format +msgid "File %s: action %s executed via %s." +msgstr "Archivo %s: acción %s ejecutado vía %s." + +#: ../geanyvc/src/geanyvc.c:614 ../geanyvc/src/geanyvc.c:625 #, c-format msgid "geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'" msgstr "geanyvc: vcdiff_file_activated: No se puede renombrar «%s» a «%s»" -#: ../geanyvc/src/geanyvc.c:646 ../geanyvc/src/geanyvc.c:696 +#: ../geanyvc/src/geanyvc.c:651 ../geanyvc/src/geanyvc.c:701 msgid "No changes were made." msgstr "No se han realizado cambios." -#: ../geanyvc/src/geanyvc.c:723 +#: ../geanyvc/src/geanyvc.c:728 msgid "No history available" msgstr "No hay historia disponible" -#: ../geanyvc/src/geanyvc.c:916 ../geanyvc/src/geanyvc.c:924 +#: ../geanyvc/src/geanyvc.c:921 ../geanyvc/src/geanyvc.c:929 #, c-format msgid "Do you really want to revert: %s?" msgstr "¿Está seguro de que quiere revertir «%s»?" -#: ../geanyvc/src/geanyvc.c:932 +#: ../geanyvc/src/geanyvc.c:937 #, c-format msgid "Do you really want to add: %s?" msgstr "¿Está seguro de que quiere añadir «%s»?" -#: ../geanyvc/src/geanyvc.c:939 +#: ../geanyvc/src/geanyvc.c:944 #, c-format msgid "Do you really want to remove: %s?" msgstr "¿Está seguro de que quiere eliminar «%s»?" -#: ../geanyvc/src/geanyvc.c:962 +#: ../geanyvc/src/geanyvc.c:967 msgid "Do you really want to update?" msgstr "¿Está seguro de que quiere actualizar?" -#: ../geanyvc/src/geanyvc.c:1225 +#: ../geanyvc/src/geanyvc.c:1094 +msgid "" +"The resulting differences cannot be displayed because the changes are too " +"big to display here and would slow down the UI significantly.\n" +"\n" +"To view the differences, cancel this dialog and open the differences in " +"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)." +msgstr "" +"Las diferencias resultantes no se pueden mostrar porque son demasiado " +"grandes para mostrar aquí y ralentizarían la UI considerablemente.\n" +"/nPara ver las diferencias cancele este diálogo y abra las diferencias " +"directamente en Geany mediante el menú GeanyVC (Directorio base -> Diff)." + +#: ../geanyvc/src/geanyvc.c:1243 msgid "Commit Y/N" msgstr "Commit S/N" -#: ../geanyvc/src/geanyvc.c:1235 +#: ../geanyvc/src/geanyvc.c:1253 msgid "Status" msgstr "Estado" -#: ../geanyvc/src/geanyvc.c:1242 +#: ../geanyvc/src/geanyvc.c:1260 msgid "Path" msgstr "Ruta" -#: ../geanyvc/src/geanyvc.c:1330 +#: ../geanyvc/src/geanyvc.c:1324 +#, c-format +msgid "Line: %d Column: %d" +msgstr "Línea: %d Columna: %d" + +#: ../geanyvc/src/geanyvc.c:1370 msgid "Commit" msgstr "Commit" -#: ../geanyvc/src/geanyvc.c:1372 +#: ../geanyvc/src/geanyvc.c:1412 msgid "_De-/select all files" msgstr "_De/seleccionar todos los archivos" -#: ../geanyvc/src/geanyvc.c:1413 +#: ../geanyvc/src/geanyvc.c:1456 msgid "Commit message:" msgstr "Mensaje de commit:" -#: ../geanyvc/src/geanyvc.c:1426 +#: ../geanyvc/src/geanyvc.c:1475 msgid "C_ommit" msgstr "C_ommit" -#: ../geanyvc/src/geanyvc.c:1500 +#: ../geanyvc/src/geanyvc.c:1556 msgid "Nothing to commit." msgstr "No hay nada para commit." -#: ../geanyvc/src/geanyvc.c:1546 +#: ../geanyvc/src/geanyvc.c:1602 #, c-format msgid "Error initializing spell checking: %s" msgstr "Ha ocurrido un error al iniciar la comprobación ortográfica: %s" -#: ../geanyvc/src/geanyvc.c:1558 +#: ../geanyvc/src/geanyvc.c:1614 #, c-format msgid "" "Error while setting up language for spellchecking. Please check " @@ -4318,13 +4469,13 @@ "Ha ocurrido un error al configurar un idioma para la comprobación " "otrográfica. Compruebe su configuración. El mensaje de error es: %s" -#: ../geanyvc/src/geanyvc.c:1834 +#: ../geanyvc/src/geanyvc.c:1890 msgid "Set Changed-flag for document tabs created by the plugin" msgstr "" "Fijar el indicador «Modificado» para pestañas de documentos creados por el " "complemento" -#: ../geanyvc/src/geanyvc.c:1837 +#: ../geanyvc/src/geanyvc.c:1893 msgid "" "If this option is activated, every new by the VC-plugin created document tab " "will be marked as changed. Even this option is useful in some cases, it " @@ -4335,43 +4486,43 @@ "puede ser útil en algunos casos, podrá causar la aparición de una molesta " "cantidad de diálogos del tipo «¿Desea guardar el archivo?»." -#: ../geanyvc/src/geanyvc.c:1845 +#: ../geanyvc/src/geanyvc.c:1901 msgid "Confirm adding new files to a VCS" msgstr "Confirmar la adición de archivos nuevos al VCS" -#: ../geanyvc/src/geanyvc.c:1848 +#: ../geanyvc/src/geanyvc.c:1904 msgid "Shows a confirmation dialog on adding a new (created) file to VCS." msgstr "Muestra un diálogo de confirmación al añadir un archivo nuevo al VCS." -#: ../geanyvc/src/geanyvc.c:1854 +#: ../geanyvc/src/geanyvc.c:1910 msgid "Maximize commit dialog" msgstr "Maximizar el diálogo de commit" -#: ../geanyvc/src/geanyvc.c:1855 +#: ../geanyvc/src/geanyvc.c:1911 msgid "Show commit dialog maximize." msgstr "Mostrar el diálogo de commit maximizado." -#: ../geanyvc/src/geanyvc.c:1861 +#: ../geanyvc/src/geanyvc.c:1917 msgid "Use external diff viewer" msgstr "Usar un visor de diffs externo" -#: ../geanyvc/src/geanyvc.c:1863 +#: ../geanyvc/src/geanyvc.c:1919 msgid "Use external diff viewer for file diff." msgstr "Usar un programa externo para visualizar diferencias entre archivos." -#: ../geanyvc/src/geanyvc.c:1869 +#: ../geanyvc/src/geanyvc.c:1925 msgid "Show VC entries at editor menu" msgstr "Mostrar menús de VC en el menú del editor" -#: ../geanyvc/src/geanyvc.c:1871 +#: ../geanyvc/src/geanyvc.c:1927 msgid "Show entries for VC functions inside editor menu" msgstr "Mostrar opciones de menú para funciones de VC en los menús del editor" -#: ../geanyvc/src/geanyvc.c:1876 +#: ../geanyvc/src/geanyvc.c:1932 msgid "Attach menu to menubar" msgstr "Añadir menú a la barra de menús" -#: ../geanyvc/src/geanyvc.c:1878 +#: ../geanyvc/src/geanyvc.c:1934 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " "directly inside Geany's menubar.Will take in account after next start of " @@ -4381,211 +4532,211 @@ "o directamente den la barra de menús de Geany. Se tendrá en cuenta después " "de reiniciar GeanyVC" -#: ../geanyvc/src/geanyvc.c:1886 +#: ../geanyvc/src/geanyvc.c:1942 msgid "Enable CVS" msgstr "Activar CVS" -#: ../geanyvc/src/geanyvc.c:1891 +#: ../geanyvc/src/geanyvc.c:1947 msgid "Enable GIT" msgstr "Activar GIT" -#: ../geanyvc/src/geanyvc.c:1896 +#: ../geanyvc/src/geanyvc.c:1952 msgid "Enable SVN" msgstr "Activar SVN" -#: ../geanyvc/src/geanyvc.c:1901 +#: ../geanyvc/src/geanyvc.c:1957 msgid "Enable SVK" msgstr "Activar SVK" -#: ../geanyvc/src/geanyvc.c:1906 +#: ../geanyvc/src/geanyvc.c:1962 msgid "Enable Bazaar" msgstr "Activar Bazaar" -#: ../geanyvc/src/geanyvc.c:1911 +#: ../geanyvc/src/geanyvc.c:1967 msgid "Enable Mercurial" msgstr "Activar Mercurial" -#: ../geanyvc/src/geanyvc.c:1917 +#: ../geanyvc/src/geanyvc.c:1973 msgid "Spellcheck language" msgstr "Idioma de comprobación ortográfica" -#: ../geanyvc/src/geanyvc.c:2008 +#: ../geanyvc/src/geanyvc.c:2064 msgid "_VC file Actions" msgstr "Acciones de archivo _VC" #. Diff of current file #. Diff of the current dir #. Complete diff of base directory -#: ../geanyvc/src/geanyvc.c:2014 ../geanyvc/src/geanyvc.c:2091 -#: ../geanyvc/src/geanyvc.c:2131 +#: ../geanyvc/src/geanyvc.c:2070 ../geanyvc/src/geanyvc.c:2147 +#: ../geanyvc/src/geanyvc.c:2187 msgid "_Diff" msgstr "_Diff" -#: ../geanyvc/src/geanyvc.c:2017 +#: ../geanyvc/src/geanyvc.c:2073 msgid "Make a diff from the current active file" msgstr "Crear un diff del archivo actual" #. Revert current file #. Revert current dir #. Revert everything -#: ../geanyvc/src/geanyvc.c:2022 ../geanyvc/src/geanyvc.c:2100 -#: ../geanyvc/src/geanyvc.c:2139 +#: ../geanyvc/src/geanyvc.c:2078 ../geanyvc/src/geanyvc.c:2156 +#: ../geanyvc/src/geanyvc.c:2195 msgid "_Revert" msgstr "_Revertir" -#: ../geanyvc/src/geanyvc.c:2025 +#: ../geanyvc/src/geanyvc.c:2081 msgid "Restore pristine working copy file (undo local edits)." msgstr "Restaurar una copia limpia de trabajo (deshacer ediciones locales)." #. Blame for current file -#: ../geanyvc/src/geanyvc.c:2034 +#: ../geanyvc/src/geanyvc.c:2090 msgid "_Blame" msgstr "_Culpar" -#: ../geanyvc/src/geanyvc.c:2037 +#: ../geanyvc/src/geanyvc.c:2093 msgid "Shows the changes made at one file per revision and author." msgstr "Muestra los cambios hechos a un archivo por revisión y autor." #. History/log of current file #. History/log of the current dir #. Complete History/Log of base directory -#: ../geanyvc/src/geanyvc.c:2044 ../geanyvc/src/geanyvc.c:2110 -#: ../geanyvc/src/geanyvc.c:2151 +#: ../geanyvc/src/geanyvc.c:2100 ../geanyvc/src/geanyvc.c:2166 +#: ../geanyvc/src/geanyvc.c:2207 msgid "_History (log)" msgstr "_Historial (registro)" -#: ../geanyvc/src/geanyvc.c:2047 +#: ../geanyvc/src/geanyvc.c:2103 msgid "Shows the log of the current file" msgstr "Muestra el registro del archivo actual" #. base version of the current file -#: ../geanyvc/src/geanyvc.c:2052 +#: ../geanyvc/src/geanyvc.c:2108 msgid "_Original" msgstr "_Original" -#: ../geanyvc/src/geanyvc.c:2055 +#: ../geanyvc/src/geanyvc.c:2111 msgid "Shows the original of the current file" msgstr "Muestra el original del archivo actual" #. add current file -#: ../geanyvc/src/geanyvc.c:2063 +#: ../geanyvc/src/geanyvc.c:2119 msgid "_Add to Version Control" msgstr "_Añadir a control de versiones" -#: ../geanyvc/src/geanyvc.c:2065 +#: ../geanyvc/src/geanyvc.c:2121 msgid "Add file to repository." msgstr "Añadir un archivo al repositorio." #. remove current file -#: ../geanyvc/src/geanyvc.c:2071 +#: ../geanyvc/src/geanyvc.c:2127 msgid "_Remove from Version Control" msgstr "Elimina_r del Control de Versiones" -#: ../geanyvc/src/geanyvc.c:2073 +#: ../geanyvc/src/geanyvc.c:2129 msgid "Remove file from repository." msgstr "Eliminar el archivo del repositorio." -#: ../geanyvc/src/geanyvc.c:2088 +#: ../geanyvc/src/geanyvc.c:2144 msgid "_Directory" msgstr "_Directorio" -#: ../geanyvc/src/geanyvc.c:2094 +#: ../geanyvc/src/geanyvc.c:2150 msgid "Make a diff from the directory of the current active file" msgstr "Realizar un diff del directorio del archivo actual" -#: ../geanyvc/src/geanyvc.c:2103 +#: ../geanyvc/src/geanyvc.c:2159 msgid "Restore original files in the current folder (undo local edits)." msgstr "" "Restaurar los archivos originales en el directorio actual (deshacer " "ediciones locales)." -#: ../geanyvc/src/geanyvc.c:2113 +#: ../geanyvc/src/geanyvc.c:2169 msgid "Shows the log of the current directory" msgstr "Muestra el registro del directorio actual" -#: ../geanyvc/src/geanyvc.c:2127 +#: ../geanyvc/src/geanyvc.c:2183 msgid "_Base Directory" msgstr "Directorio _Base" -#: ../geanyvc/src/geanyvc.c:2133 +#: ../geanyvc/src/geanyvc.c:2189 msgid "Make a diff from the top VC directory" msgstr "Crear un diff desde el directorio superior de CV" -#: ../geanyvc/src/geanyvc.c:2141 +#: ../geanyvc/src/geanyvc.c:2197 msgid "Revert any local edits." msgstr "Revertir cualquier modificación local" -#: ../geanyvc/src/geanyvc.c:2154 +#: ../geanyvc/src/geanyvc.c:2210 msgid "Shows the log of the top VC directory" msgstr "Muestra el registro del directorio superior de CV" -#: ../geanyvc/src/geanyvc.c:2180 +#: ../geanyvc/src/geanyvc.c:2236 msgid "VC _Commit" msgstr "_Commit CV" -#: ../geanyvc/src/geanyvc.c:2215 +#: ../geanyvc/src/geanyvc.c:2271 msgid "Show diff of file" msgstr "Mostrar diff del archivo" -#: ../geanyvc/src/geanyvc.c:2217 +#: ../geanyvc/src/geanyvc.c:2273 msgid "Show diff of directory" msgstr "Mostrar diff del directorio" -#: ../geanyvc/src/geanyvc.c:2219 +#: ../geanyvc/src/geanyvc.c:2275 msgid "Show diff of basedir" msgstr "Mostrar diff del directorio base" -#: ../geanyvc/src/geanyvc.c:2222 +#: ../geanyvc/src/geanyvc.c:2278 msgid "Commit changes" msgstr "Hacer commit de los cambios" -#: ../geanyvc/src/geanyvc.c:2224 +#: ../geanyvc/src/geanyvc.c:2280 msgid "Show status" msgstr "Mostrar estado" -#: ../geanyvc/src/geanyvc.c:2226 +#: ../geanyvc/src/geanyvc.c:2282 msgid "Revert single file" msgstr "Revertir un solo archivo" -#: ../geanyvc/src/geanyvc.c:2228 +#: ../geanyvc/src/geanyvc.c:2284 msgid "Revert directory" msgstr "Revertir directorio" -#: ../geanyvc/src/geanyvc.c:2230 +#: ../geanyvc/src/geanyvc.c:2286 msgid "Revert base directory" msgstr "Revertir directorio base" -#: ../geanyvc/src/geanyvc.c:2232 +#: ../geanyvc/src/geanyvc.c:2288 msgid "Update file" msgstr "Actualizar archivo" -#: ../geanyvc/src/geanyvc.c:2260 +#: ../geanyvc/src/geanyvc.c:2316 msgid "_VC" msgstr "C_V" -#: ../geanyvc/src/geanyvc.c:2266 +#: ../geanyvc/src/geanyvc.c:2322 msgid "_Version Control" msgstr "Control de _versiones" #. Status of basedir -#: ../geanyvc/src/geanyvc.c:2288 +#: ../geanyvc/src/geanyvc.c:2344 msgid "_Status" msgstr "E_stado" -#: ../geanyvc/src/geanyvc.c:2290 +#: ../geanyvc/src/geanyvc.c:2346 msgid "Show status." msgstr "Mostrar estado." -#: ../geanyvc/src/geanyvc.c:2297 +#: ../geanyvc/src/geanyvc.c:2353 msgid "Update from remote repository." msgstr "Actualizar desde el repositorio remoto." #. Commit all changes -#: ../geanyvc/src/geanyvc.c:2302 +#: ../geanyvc/src/geanyvc.c:2358 msgid "_Commit" msgstr "_Commit" -#: ../geanyvc/src/geanyvc.c:2304 +#: ../geanyvc/src/geanyvc.c:2360 msgid "Commit changes." msgstr "Hacer commit de los cambios." @@ -4745,95 +4896,251 @@ "Nota: defina los patrones de los archivos pertenecientes al proyecto bajo la " "pestaña «Proyecto»" -#: ../gproject/src/gproject-sidebar.c:81 -#: ../gproject/src/gproject-sidebar.c:792 +#: ../gproject/src/gproject-sidebar.c:90 +#: ../gproject/src/gproject-sidebar.c:838 msgid "Find File" msgstr "Buscar archivo" -#: ../gproject/src/gproject-sidebar.c:108 +#: ../gproject/src/gproject-sidebar.c:117 msgid "Search inside:" msgstr "Buscar en:" -#: ../gproject/src/gproject-sidebar.c:120 +#: ../gproject/src/gproject-sidebar.c:129 msgid "C_ase sensitive" msgstr "Sensible _a mayúsculas" -#: ../gproject/src/gproject-sidebar.c:123 +#: ../gproject/src/gproject-sidebar.c:132 msgid "Search in full path" msgstr "Buscar en la ruta completa" -#: ../gproject/src/gproject-sidebar.c:702 +#: ../gproject/src/gproject-sidebar.c:745 msgid "Reload all" msgstr "Recargar todos" -#: ../gproject/src/gproject-sidebar.c:711 -#: ../treebrowser/src/treebrowser.c:1282 +#: ../gproject/src/gproject-sidebar.c:754 +#: ../treebrowser/src/treebrowser.c:1281 msgid "Expand all" msgstr "Expandir todos" -#: ../gproject/src/gproject-sidebar.c:717 -#: ../treebrowser/src/treebrowser.c:1286 +#: ../gproject/src/gproject-sidebar.c:761 +#: ../treebrowser/src/treebrowser.c:1285 msgid "Collapse all" msgstr "Colapsar todos" -#: ../gproject/src/gproject-sidebar.c:726 +#: ../gproject/src/gproject-sidebar.c:771 msgid "Follow active editor" msgstr "Seguir editor activo" -#: ../gproject/src/gproject-sidebar.c:774 +#: ../gproject/src/gproject-sidebar.c:820 msgid "Expand All" msgstr "Expandir todos" -#: ../gproject/src/gproject-sidebar.c:783 -#: ../treebrowser/src/treebrowser.c:1234 +#: ../gproject/src/gproject-sidebar.c:829 msgid "Find in Files" msgstr "Buscar en archivos" #. POSITION OF VIEW -#: ../markdown/src/conf.c:570 +#: ../markdown/src/conf.c:567 msgid "Position:" msgstr "Posición:" -#: ../markdown/src/conf.c:576 +#: ../markdown/src/conf.c:573 msgid "Sidebar" msgstr "Barra lateral" -#: ../markdown/src/conf.c:584 +#: ../markdown/src/conf.c:581 msgid "Message Window" msgstr "Ventana de mensajes" -#: ../markdown/src/conf.c:598 +#: ../markdown/src/conf.c:595 msgid "Font:" msgstr "Fuente:" -#: ../markdown/src/conf.c:616 +#: ../markdown/src/conf.c:612 msgid "Code Font:" msgstr "Fuente de código:" -#: ../markdown/src/conf.c:634 +#: ../markdown/src/conf.c:629 msgid "BG Color:" msgstr "Color de fondo:" -#: ../markdown/src/conf.c:651 +#: ../markdown/src/conf.c:645 msgid "FG Color:" msgstr "Color de frente:" -#: ../markdown/src/conf.c:670 +#: ../markdown/src/conf.c:663 msgid "Select Template File" msgstr "Seleccionar plantilla" -#: ../markdown/src/plugin.c:33 +#: ../markdown/src/plugin.c:35 msgid "Real-time Markdown preview" msgstr "Vista previa en directo de Markdown" -#: ../markdown/src/plugin.c:49 +#: ../markdown/src/plugin.c:51 msgid "Markdown Preview" msgstr "Vista previa de Markdown" -#: ../markdown/src/plugin.c:160 +#: ../markdown/src/plugin.c:162 msgid "The current document does not have a Markdown filetype." msgstr "El documento actual no es un archivo de tipo Markdown." +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:35 +msgid "Pair Tag Highlighter" +msgstr "Resaltador de etiquetas parejas" + +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:36 +msgid "Finds and highlights matching opening/closing HTML tag" +msgstr "Encuentra y resalta etiquetas HTML de apertura/cierre" + +#: ../pohelper/data/menus.ui.h:1 +msgid "_Translation Helper" +msgstr "Ayudante de _traducción" + +#: ../pohelper/data/menus.ui.h:2 +msgid "_Previous String" +msgstr "Cadena _anterior" + +#: ../pohelper/data/menus.ui.h:3 ../pohelper/src/gph-plugin.c:1034 +msgid "Go to previous string" +msgstr "Ir a la cadena anterior" + +#: ../pohelper/data/menus.ui.h:4 +msgid "_Next String" +msgstr "Cadena _siguiente" + +#: ../pohelper/data/menus.ui.h:5 ../pohelper/src/gph-plugin.c:1037 +msgid "Go to next string" +msgstr "Ir a la siguiente cadena" + +#: ../pohelper/data/menus.ui.h:6 +msgid "Pre_vious Untranslated" +msgstr "A_nterior sin traducir" + +#: ../pohelper/data/menus.ui.h:7 ../pohelper/src/gph-plugin.c:1040 +msgid "Go to previous untranslated string" +msgstr "Ir a la anterior cadena sin traducir" + +#: ../pohelper/data/menus.ui.h:8 +msgid "Next _Untranslated" +msgstr "Siguien_te sin traducir" + +#: ../pohelper/data/menus.ui.h:9 ../pohelper/src/gph-plugin.c:1043 +msgid "Go to next untranslated string" +msgstr "Ir a la siguiente cadena sin traducir" + +#: ../pohelper/data/menus.ui.h:10 +msgid "Previous Fu_zzy" +msgstr "Difu_sa anterior" + +#: ../pohelper/data/menus.ui.h:11 ../pohelper/src/gph-plugin.c:1046 +msgid "Go to previous fuzzily translated string" +msgstr "Ir a la traducción difusa anterior" + +#: ../pohelper/data/menus.ui.h:12 +msgid "Next _Fuzzy" +msgstr "Siguiente di_fusa" + +#: ../pohelper/data/menus.ui.h:13 ../pohelper/src/gph-plugin.c:1049 +msgid "Go to next fuzzily translated string" +msgstr "Ir a la siguiente traducción difusa" + +#: ../pohelper/data/menus.ui.h:14 +msgid "Previous Untranslated or Fuzz_y" +msgstr "Anterior sin traducir o difu_sa" + +#: ../pohelper/data/menus.ui.h:15 ../pohelper/src/gph-plugin.c:1052 +msgid "Go to previous untranslated or fuzzy string" +msgstr "Ir a la anterior cadena sin traducir o difusa" + +#: ../pohelper/data/menus.ui.h:16 +msgid "Next Untranslated _or Fuzzy" +msgstr "Siguiente sin traducir _o difusa" + +#: ../pohelper/data/menus.ui.h:17 ../pohelper/src/gph-plugin.c:1056 +msgid "Go to next untranslated or fuzzy string" +msgstr "Ir a la siguiente cadena sin traducir o difusa" + +#: ../pohelper/data/menus.ui.h:18 ../pohelper/src/gph-plugin.c:1067 +msgid "Toggle current translation fuzziness" +msgstr "Conmutar estado de traducción difusa" + +#: ../pohelper/data/menus.ui.h:19 +msgid "_Toggle Fuzziness" +msgstr "Conmu_tar difuso" + +#: ../pohelper/data/menus.ui.h:20 +msgid "Paste _Message as Translation" +msgstr "Pegar _original como traducción" + +#: ../pohelper/data/menus.ui.h:21 +msgid "Paste the original untranslated string to the translation" +msgstr "Pegar la cadena original sin traducir como traducción" + +#: ../pohelper/data/menus.ui.h:22 ../pohelper/src/gph-plugin.c:1064 +msgid "Reflow the current translation string" +msgstr "Refluir la cadena de traducción actual" + +#: ../pohelper/data/menus.ui.h:23 +msgid "_Reflow Translation" +msgstr "_Refluir traducción" + +#: ../pohelper/data/menus.ui.h:24 +msgid "" +"Whether to update the translation headers (author, revision date, ...) upon " +"file save" +msgstr "" +"Indica si se actualizan las cabeceras de la traducción (autor, fecha de " +"revisión, etc.) al guardar el archivo" + +#: ../pohelper/data/menus.ui.h:25 +msgid "Update _Headers Upon Save" +msgstr "Actualizar _cabeceras al guardar" + +#: ../pohelper/src/gph-plugin.c:41 +msgid "Translation Helper" +msgstr "Ayudante de traducción" + +#: ../pohelper/src/gph-plugin.c:42 +msgid "Improves support for GetText translation files." +msgstr "Mejora el soporte para archivos de traducción Gettext." + +#: ../pohelper/src/gph-plugin.c:1060 +msgid "Paste original untranslated string to translation" +msgstr "Pegar cadena original sin traducir como traducción" + +#: ../pohelper/src/gph-plugin.c:1102 +#, c-format +msgid "Failed to load configuration file: %s" +msgstr "No se pudo cargar el archivo de configuración: %s" + +#: ../pohelper/src/gph-plugin.c:1127 +#, c-format +msgid "Failed to create configuration directory \"%s\": %s" +msgstr "No se pudo crear el directorio de configuración «%s»: %s" + +#: ../pohelper/src/gph-plugin.c:1130 +#, c-format +msgid "Failed to save configuration file: %s" +msgstr "No se pudo guardar el archivo de configuración: %s" + +#: ../pohelper/src/gph-plugin.c:1185 +#, c-format +msgid "" +"Failed to load UI definition, please check your installation. The error was: " +"%s" +msgstr "" +"No se pudo cargar la definición de UI, compruebe su instalación. El mensaje " +"de error: %s" + +#: ../pohelper/src/gph-plugin.c:1225 +#, c-format +msgid "" +"Cannot find widget \"%s\" in the UI definition, please check your " +"installation." +msgstr "" +"No se pudo encontrar el widget «%s» en la definición de UI, compruebe su " +"instalación." + #: ../pretty-printer/src/PluginEntry.c:37 msgid "XML PrettyPrinter" msgstr "PrettyPrinter XML" @@ -4923,503 +5230,568 @@ msgstr "Cambio de línea" #: ../scope/data/scope.glade.h:1 -msgid "-" -msgstr "-" +msgid "Debu_g" +msgstr "Depura_r" #: ../scope/data/scope.glade.h:2 -msgid "Inspect" -msgstr "Inspeccionar" +msgid "_Setup Program" +msgstr "_Configurar programa" #: ../scope/data/scope.glade.h:3 -msgid "Others" -msgstr "Otros" +msgid "Recent _Programs" +msgstr "_Programas recientes" #: ../scope/data/scope.glade.h:4 -msgid "Panel" -msgstr "Panel" +msgid "_Run/Continue" +msgstr "Ejecuta_r/continuar" #: ../scope/data/scope.glade.h:5 -msgid "Values" -msgstr "Valores" +msgid "Run to _Cursor" +msgstr "Ejecutar hasta _cursor" #: ../scope/data/scope.glade.h:6 -msgid "@" -msgstr "@" +msgid "Run to _Source" +msgstr "Ejecutar hasta _origen" #: ../scope/data/scope.glade.h:7 -msgid "Add _Break" -msgstr "Añadir _ruptura" +msgid "Step _Into" +msgstr "En_trar" #: ../scope/data/scope.glade.h:8 -msgid "Add _Watch" -msgstr "Añadir _vigilancia" +msgid "Step _Over" +msgstr "S_altar" #: ../scope/data/scope.glade.h:9 -msgid "Apply on _Run" -msgstr "Aplicar al ejecuta_r" +msgid "Step O_ut" +msgstr "Sal_ir" #: ../scope/data/scope.glade.h:10 -msgid "Auto _Hide" -msgstr "Ocultar _automáticamente" +msgid "_Terminate" +msgstr "_Terminar" #: ../scope/data/scope.glade.h:11 -msgid "Auto _run program/exit gdb" -msgstr "Ejecutar programa automáticamente/_salir de gdb" +msgid "Toggle _Breakpoint" +msgstr "Intercam_biar punto de ruptura" + +#: ../scope/data/scope.glade.h:12 +msgid "_GDB Command" +msgstr "Comando _GDB:" #: ../scope/data/scope.glade.h:13 -msgid "Convert _UTF-8 to locale" -msgstr "Convertir _UTF-8 a locale" +msgid "_More" +msgstr "_Más" #: ../scope/data/scope.glade.h:14 -msgid "Count:" -msgstr "Suma:" +msgid "_Show Terminal" +msgstr "_Mostrar terminal" #: ../scope/data/scope.glade.h:15 -msgid "Debu_g" -msgstr "Depura_r" +msgid "_Reset Markers" +msgstr "_Reiniciar marcadores" + +#: ../scope/data/scope.glade.h:16 +msgid "_Cleanup Files" +msgstr "Ar_chivos de limpieza" #: ../scope/data/scope.glade.h:17 -msgid "Debug Console" -msgstr "Consola de depuración:" +msgid "_Feed" +msgstr "_Alimentar" #: ../scope/data/scope.glade.h:18 -msgid "Default 8-bit text mode:" -msgstr "Modo pred. texto 8-bits:" +msgid "_Window" +msgstr "_Ventana" #: ../scope/data/scope.glade.h:19 -msgid "Display" -msgstr "Mostrar" +msgid "_Auto Show" +msgstr "_Automostrar" #: ../scope/data/scope.glade.h:20 -msgid "E_xpand on apply" -msgstr "E_xpandir al aplicar" +msgid "Auto _Hide" +msgstr "Ocultar _automáticamente" #: ../scope/data/scope.glade.h:21 -msgid "En_vironment:" -msgstr "Ento_rno:" +msgid "Show on _Error" +msgstr "Mostrar en _error" #: ../scope/data/scope.glade.h:22 -msgid "Enter assignment expression:" -msgstr "Introduzca expresión de asignación:" +msgid "_Unsorted" +msgstr "_Desordenado" #: ../scope/data/scope.glade.h:23 -msgid "Enter gdb command:" -msgstr "Introduzca comando gdb:" +msgid "_View Source" +msgstr "_Ver fuente" #: ../scope/data/scope.glade.h:24 -msgid "Expand" -msgstr "Expandir" - +msgid "S_ynchronize" +msgstr "S_incronizar" + #: ../scope/data/scope.glade.h:25 -msgid "Frame:" -msgstr "Marco:" +msgid "_Interrupt" +msgstr "_Interrumpir" #: ../scope/data/scope.glade.h:26 -msgid "Inspect" -msgstr "Inspeccionar" +msgid "_Send Signal" +msgstr "Enviar _señal" #: ../scope/data/scope.glade.h:27 -msgid "Locals" -msgstr "Locales" +msgid "S_elect on" +msgstr "S_eleccionar al" #: ../scope/data/scope.glade.h:28 -msgid "Memory" -msgstr "Memoria" +msgid "_Running" +msgstr "_Ejecutando" + +#: ../scope/data/scope.glade.h:29 +msgid "_Stopped" +msgstr "_Detenido" #: ../scope/data/scope.glade.h:30 -msgid "Object:" -msgstr "Objeto:" +msgid "_Exited" +msgstr "_Terminado" #: ../scope/data/scope.glade.h:31 -msgid "Open on" -msgstr "Abrir al" +msgid "_Follow" +msgstr "_Seguir" #: ../scope/data/scope.glade.h:32 -msgid "Options" -msgstr "Opciones" +msgid "_Columns" +msgstr "_Columnas" -#: ../scope/data/scope.glade.h:33 ../scope/src/prefs.c:337 -msgid "Program" -msgstr "Programa" +#: ../scope/data/scope.glade.h:33 +msgid "Show _Group" +msgstr "Mostrar _grupo" #: ../scope/data/scope.glade.h:34 -msgid "Program Terminal" -msgstr "Terminal de programa" +msgid "Show _Core" +msgstr "Mostrar nú_cleo" #: ../scope/data/scope.glade.h:35 -msgid "R_ead" -msgstr "L_eer" +msgid "Add _Break" +msgstr "Añadir _ruptura" #: ../scope/data/scope.glade.h:36 -msgid "Recent _Programs" -msgstr "_Programas recientes" +msgid "Add _Watch" +msgstr "Añadir _vigilancia" #: ../scope/data/scope.glade.h:37 -msgid "Run to _Cursor" -msgstr "Ejecutar hasta _cursor" +msgid "Apply on _Run" +msgstr "Aplicar al ejecuta_r" #: ../scope/data/scope.glade.h:38 -msgid "Run to _Source" -msgstr "Ejecutar hasta _origen" +msgid "_Show @entry" +msgstr "_Mostrar @entrada" #: ../scope/data/scope.glade.h:39 -msgid "S_elect on" -msgstr "S_eleccionar al" +msgid "Show _Address" +msgstr "Mostrar _dirección" #: ../scope/data/scope.glade.h:40 -msgid "S_how" -msgstr "Mo_strar" +msgid "_Modify" +msgstr "_Modificar" #: ../scope/data/scope.glade.h:41 -msgid "S_ynchronize" -msgstr "S_incronizar" +msgid "_Watch" +msgstr "_Vigilancia" #: ../scope/data/scope.glade.h:42 -msgid "Setup Program" -msgstr "Configurar programa" +msgid "_Inspect" +msgstr "_Inspeccionar" #: ../scope/data/scope.glade.h:43 -msgid "Show =li_brary messages" -msgstr "Mostrar mensajes de bib_lioteca" +msgid "_8-bit mode" +msgstr "modo _8-bits" #: ../scope/data/scope.glade.h:44 -msgid "Show _Address" -msgstr "Mostrar _dirección" +msgid "_Default" +msgstr "Por _defecto" #: ../scope/data/scope.glade.h:45 -msgid "Show _Core" -msgstr "Mostrar nú_cleo" +msgid "_7 bit" +msgstr "_7 bits" #: ../scope/data/scope.glade.h:46 -msgid "Show _Group" -msgstr "Mostrar _grupo" +msgid "_Locale" +msgstr "_Locale" #: ../scope/data/scope.glade.h:47 -msgid "Show _tooltips" -msgstr "Mostrar ayuda emergen_te" +msgid "_UTF-8" +msgstr "_UTF-8" #: ../scope/data/scope.glade.h:48 -msgid "Show on _Error" -msgstr "Mostrar en _error" +msgid "_Show .names" +msgstr "Mo_strar .nombres" #: ../scope/data/scope.glade.h:49 -msgid "Stack" -msgstr "Pila" +msgid "R_ead" +msgstr "L_eer" #: ../scope/data/scope.glade.h:50 -msgid "Start:" -msgstr "Inicio:" +msgid "_Group by" +msgstr "A_grupar por" #: ../scope/data/scope.glade.h:51 -msgid "Step O_ut" -msgstr "Sal_ir" +msgid "_1" +msgstr "_1" #: ../scope/data/scope.glade.h:52 -msgid "Step _Into" -msgstr "En_trar" +msgid "_2" +msgstr "_2" #: ../scope/data/scope.glade.h:53 -msgid "Step _Over" -msgstr "S_altar" +msgid "_4" +msgstr "_4" #: ../scope/data/scope.glade.h:54 -msgid "Threads" -msgstr "Hilos" +msgid "_8" +msgstr "_8" #: ../scope/data/scope.glade.h:55 -msgid "Toggle _Breakpoint" -msgstr "Intercam_biar punto de ruptura" +msgid "_Jump To" +msgstr "_Saltar a" #: ../scope/data/scope.glade.h:56 -msgid "Update all _views" -msgstr "Actualizar todas las _vistas" +msgid "_Apply" +msgstr "_Aplicar" #: ../scope/data/scope.glade.h:57 -msgid "Watches" -msgstr "Vigilancias" - -#: ../scope/data/scope.glade.h:58 -msgid "_1" -msgstr "_1" +msgid "_Expand" +msgstr "_Expandir" #: ../scope/data/scope.glade.h:59 -msgid "_2" -msgstr "_2" +msgid "_Natural" +msgstr "_Natural" #: ../scope/data/scope.glade.h:60 -msgid "_4" -msgstr "_4" +msgid "_Decimal" +msgstr "_Decimal" #: ../scope/data/scope.glade.h:61 -msgid "_7 bit" -msgstr "_7 bits" +msgid "_Hex" +msgstr "_Hex" #: ../scope/data/scope.glade.h:62 -msgid "_7-bit \\nnn" -msgstr "_7-bits \\nnn" +msgid "_Octal" +msgstr "_Octal" #: ../scope/data/scope.glade.h:63 -msgid "_8" -msgstr "_8" +msgid "_Binary" +msgstr "_Binario" #: ../scope/data/scope.glade.h:64 -msgid "_8-bit mode" -msgstr "modo _8-bits" +msgid "_Raw" +msgstr "C_rudo" #: ../scope/data/scope.glade.h:65 -msgid "_Apply" -msgstr "_Aplicar" +msgid "_Evaluate/Modify" +msgstr "_Evaluar/modificar" #: ../scope/data/scope.glade.h:66 -msgid "_Apply on run" -msgstr "_Aplicar al ejecutar" +msgid "_Watch Expression" +msgstr "Expresión de _vigilancia" #: ../scope/data/scope.glade.h:67 -msgid "_Arguments:" -msgstr "_Argumentos:" +msgid "_Inspect Variable" +msgstr "_Inspeccionar variable" #: ../scope/data/scope.glade.h:68 -msgid "_Auto Show" -msgstr "_Automostrar" +msgid "Threads" +msgstr "Hilos" #: ../scope/data/scope.glade.h:69 -msgid "_Binary" -msgstr "_Binario" +msgid "Stack" +msgstr "Pila" #: ../scope/data/scope.glade.h:70 -msgid "_Cleanup Files" -msgstr "Ar_chivos de limpieza" +msgid "Locals" +msgstr "Locales" #: ../scope/data/scope.glade.h:71 -msgid "_Columns" -msgstr "_Columnas" +msgid "Watches" +msgstr "Vigilancias" #: ../scope/data/scope.glade.h:72 -msgid "_Decimal" -msgstr "_Decimal" +msgid "Memory" +msgstr "Memoria" #: ../scope/data/scope.glade.h:73 -msgid "_Default" -msgstr "Por _defecto" +msgid "Enter gdb command:" +msgstr "Introduzca comando gdb:" #: ../scope/data/scope.glade.h:74 -msgid "_Delete all breakpoints, watches and inspects" -msgstr "Borrar to_dos los puntos de ruptura, vigilancias e inspecciones" +msgid "Convert _UTF-8 to locale" +msgstr "Convertir _UTF-8 a locale" #: ../scope/data/scope.glade.h:75 -msgid "_Evaluate/Modify" -msgstr "_Evaluar/modificar" +msgid "_Thread" +msgstr "_Hilo" #: ../scope/data/scope.glade.h:76 -msgid "_Executable:" -msgstr "_Ejecutable:" +msgid "_Group" +msgstr "A_grupar" #: ../scope/data/scope.glade.h:77 -msgid "_Exited" -msgstr "_Terminado" +msgid "_Frame" +msgstr "_Marco" #: ../scope/data/scope.glade.h:78 -msgid "_Expand" -msgstr "_Expandir" +msgid "Setup Program" +msgstr "Configurar programa" #: ../scope/data/scope.glade.h:79 -msgid "_Expand on apply" -msgstr "_Expandir al aplicar" +msgid "_Executable:" +msgstr "_Ejecutable:" #: ../scope/data/scope.glade.h:80 -msgid "_Feed" -msgstr "_Alimentar" +msgid "_Arguments:" +msgstr "_Argumentos:" #: ../scope/data/scope.glade.h:81 -msgid "_Follow" -msgstr "_Seguir" +msgid "En_vironment:" +msgstr "Ento_rno:" + +#: ../scope/data/scope.glade.h:82 +msgid "_Working dir:" +msgstr "Directorio de _trabajo:" #: ../scope/data/scope.glade.h:83 -msgid "_Frame" -msgstr "_Marco" +msgid "_Load script:" +msgstr "_Cargar script:" #: ../scope/data/scope.glade.h:84 -msgid "_GDB Command" -msgstr "Comando _GDB:" +msgid "Auto _run program/exit gdb" +msgstr "Ejecutar programa automáticamente/_salir de gdb" #: ../scope/data/scope.glade.h:85 -msgid "_Group" -msgstr "A_grupar" +msgid "_Non-stop mode" +msgstr "Modo _non-stop" #: ../scope/data/scope.glade.h:86 -msgid "_Group by" -msgstr "A_grupar por" +msgid "_Temporary breakpoint on load at:" +msgstr "Punto de ruptura _temporal al cargar en:" #: ../scope/data/scope.glade.h:87 -msgid "_Hex" -msgstr "_Hex" +msgid "_Delete all breakpoints, watches, inspects and registers" +msgstr "" +"Borrar to_dos los puntos de ruptura, vigilancias, inspecciones y registros" -#: ../scope/data/scope.glade.h:88 -msgid "_Import" -msgstr "_Importar" +#: ../scope/data/scope.glade.h:88 ../scope/src/scope.c:522 +msgid "Program" +msgstr "Programa" #: ../scope/data/scope.glade.h:89 -msgid "_Inspect" -msgstr "_Inspeccionar" +msgid "Open on" +msgstr "Abrir al" #: ../scope/data/scope.glade.h:90 -msgid "_Inspect Variable" -msgstr "_Inspeccionar variable" +msgid "g_db load" +msgstr "carga g_db" #: ../scope/data/scope.glade.h:91 -msgid "_Interrupt" -msgstr "_Interrumpir" +msgid "p_rogram start" +msgstr "inicio de p_rograma" #: ../scope/data/scope.glade.h:92 -msgid "_Jump To" -msgstr "_Saltar a" +msgid "Update all _views" +msgstr "Actualizar todas las _vistas" #: ../scope/data/scope.glade.h:93 -msgid "_Load script:" -msgstr "_Cargar script:" +msgid "Panel" +msgstr "Panel" #: ../scope/data/scope.glade.h:94 -msgid "_Locale" -msgstr "_Locale" +msgid "Default 8-bit text mode:" +msgstr "Modo pred. texto 8-bits:" #: ../scope/data/scope.glade.h:95 -msgid "_Modify" -msgstr "_Modificar" +msgid "_7-bit \\nnn" +msgstr "_7-bits \\nnn" #: ../scope/data/scope.glade.h:96 -msgid "_More" -msgstr "_Más" +msgid "Display" +msgstr "Mostrar" #: ../scope/data/scope.glade.h:97 -msgid "_Natural" -msgstr "_Natural" +msgid "_member" +msgstr "_miembro" #: ../scope/data/scope.glade.h:98 -msgid "_Non-stop mode" -msgstr "Modo _non-stop" +msgid "and" +msgstr "y" #: ../scope/data/scope.glade.h:99 -msgid "_Octal" -msgstr "_Octal" +msgid "_argument" +msgstr "_argumento" #: ../scope/data/scope.glade.h:100 -msgid "_Reset Markers" -msgstr "_Reiniciar marcadores" +msgid "names" +msgstr "nombres" #: ../scope/data/scope.glade.h:101 -msgid "_Run/Continue" -msgstr "Ejecuta_r/continuar" +msgid "Values" +msgstr "Valores" #: ../scope/data/scope.glade.h:102 -msgid "_Running" -msgstr "_Ejecutando" +msgid "E_xpand on apply" +msgstr "E_xpandir al aplicar" #: ../scope/data/scope.glade.h:103 -msgid "_Send Signal" -msgstr "Enviar _señal" +msgid "S_how" +msgstr "Mo_strar" #: ../scope/data/scope.glade.h:104 -msgid "_Setup Program" -msgstr "_Configurar programa" +msgid "children" +msgstr "hijos" #: ../scope/data/scope.glade.h:105 -msgid "_Show .names" -msgstr "Mo_strar .nombres" +msgid "Inspect" +msgstr "Inspeccionar" #: ../scope/data/scope.glade.h:106 -msgid "_Show @entry" -msgstr "_Mostrar @entrada" +msgid "Show =li_brary messages" +msgstr "Mostrar mensajes de bib_lioteca" #: ../scope/data/scope.glade.h:107 -msgid "_Show Terminal" -msgstr "_Mostrar terminal" +msgid "Show _tooltips" +msgstr "Mostrar ayuda emergen_te" #: ../scope/data/scope.glade.h:108 -msgid "_Stopped" -msgstr "_Detenido" +msgid "Others" +msgstr "Otros" #: ../scope/data/scope.glade.h:109 -msgid "_Temporary breakpoint at:" -msgstr "Punto de ruptura _temporal en:" +msgid "Options" +msgstr "Opciones" #: ../scope/data/scope.glade.h:110 -msgid "_Terminate" -msgstr "_Terminar" +msgid "_Import" +msgstr "_Importar" #: ../scope/data/scope.glade.h:111 -msgid "_Thread" -msgstr "_Hilo" +msgid "Enter assignment expression:" +msgstr "Introduzca expresión de asignación:" #: ../scope/data/scope.glade.h:112 -msgid "_UTF-8" -msgstr "_UTF-8" +msgid "Inspect" +msgstr "Inspeccionar" #: ../scope/data/scope.glade.h:113 -msgid "_Unsorted" -msgstr "_Desordenado" - -#: ../scope/data/scope.glade.h:114 -msgid "_View Source" -msgstr "_Ver fuente" +msgid "Object:" +msgstr "Objeto:" #: ../scope/data/scope.glade.h:115 -msgid "_Watch" -msgstr "_Vigilancia" +msgid "-" +msgstr "-" #: ../scope/data/scope.glade.h:116 -msgid "_Watch Expression" -msgstr "Expresión de _vigilancia" +msgid "Frame:" +msgstr "Marco:" #: ../scope/data/scope.glade.h:117 -msgid "_Window" -msgstr "_Ventana" +msgid "@" +msgstr "@" #: ../scope/data/scope.glade.h:118 -msgid "_Working dir:" -msgstr "Directorio de _trabajo:" +msgid "_Apply on run" +msgstr "_Aplicar al ejecutar" #: ../scope/data/scope.glade.h:119 -msgid "_argument" -msgstr "_argumento" +msgid "Expand" +msgstr "Expandir" #: ../scope/data/scope.glade.h:120 -msgid "_member" -msgstr "_miembro" +msgid "Start:" +msgstr "Inicio:" #: ../scope/data/scope.glade.h:121 -msgid "and" -msgstr "y" +msgid "Count:" +msgstr "Suma:" #: ../scope/data/scope.glade.h:122 -msgid "children" -msgstr "hijos" - -#: ../scope/data/scope.glade.h:123 -msgid "g_db load" -msgstr "carga g_db" +msgid "_Expand on apply" +msgstr "_Expandir al aplicar" -#: ../scope/data/scope.glade.h:124 -msgid "names" -msgstr "nombres" +#: ../scope/data/scope.glade.h:123 ../scope/src/scope.c:522 +msgid "Program Terminal" +msgstr "Terminal de programa" #: ../scope/data/scope.glade.h:125 -msgid "p_rogram start" -msgstr "inicio de p_rograma" +msgid "Registers" +msgstr "Registros" -#: ../scope/src/break.c:947 +#: ../scope/src/break.c:97 +msgid "breakpoint" +msgstr "punto de ruptura" + +#: ../scope/src/break.c:98 +msgid "hardware breakpoint" +msgstr "punto de ruptura hardware" + +#: ../scope/src/break.c:99 +msgid "tracepoint" +msgstr "punto de observación" + +#: ../scope/src/break.c:100 +msgid "fast tracepoint" +msgstr "punto de observación rápido" + +#: ../scope/src/break.c:101 +msgid "write watchpoint" +msgstr "escribir punto de observación" + +#: ../scope/src/break.c:104 +msgid "access watchpoint" +msgstr "acceder punto de observación" + +#: ../scope/src/break.c:106 +msgid "read watchpoint" +msgstr "leer punto de observación" + +#: ../scope/src/break.c:108 +msgid "catchpoint" +msgstr "punto de captura" + +#: ../scope/src/break.c:135 ../scope/src/break.c:139 +msgid "CLI" +msgstr "CLI" + +#: ../scope/src/break.c:136 +msgid "unsupported MI" +msgstr "MI no soportado" + +#: ../scope/src/break.c:141 +msgid "on load" +msgstr "al cargar" + +#: ../scope/src/break.c:142 +msgid "Run to Cursor" +msgstr "Ejecutar hasta cursor" + +#: ../scope/src/break.c:1013 #, c-format msgid "" "There are two or more breakpoints at %s:%d.\n" +"\n" "Use the breakpoint list to remove the exact one." msgstr "" "Hay dos o más puntos de ruptura en %s:%d.\n" +"\n" "Use la lista de puntos de ruptura para eliminar el adecuado." -#: ../scope/src/break.c:1200 +#: ../scope/src/break.c:1252 +#, c-format +msgid ", %s" +msgstr ", %s" + +#: ../scope/src/break.c:1278 +#, c-format +msgid "func %s" +msgstr "func %s" + +#: ../scope/src/break.c:1309 msgid "Add Breakpoint" msgstr "Añadir punto de ruptura" -#: ../scope/src/break.c:1215 +#: ../scope/src/break.c:1324 msgid "Add Watchpoint" msgstr "Añadir punto de observación" @@ -5431,7 +5803,8 @@ msgid "Enter char # (0..255):" msgstr "Introducir char # (0..255):" -#: ../scope/src/conterm.c:466 ../scope/src/scope.c:502 +#: ../scope/src/conterm.c:509 ../scope/src/scope.c:550 +#: ../scope/src/scope.c:551 #, c-format msgid "Scope: %s." msgstr "Ámbito: %s." @@ -5450,60 +5823,61 @@ msgid "Program terminated." msgstr "Programa terminado." -#: ../scope/src/debug.c:468 +#: ../scope/src/debug.c:469 msgid "No breakpoints. Hanging." msgstr "No hay puntos de ruptura. Colgando." -#: ../scope/src/debug.c:596 ../scope/src/thread.c:97 +#: ../scope/src/debug.c:598 ../scope/src/thread.c:92 #, c-format msgid "%s." msgstr "%s." -#: ../scope/src/inspect.c:77 +#: ../scope/src/inspect.c:66 msgid "..." msgstr "..." -#: ../scope/src/inspect.c:324 +#: ../scope/src/inspect.c:339 msgid "invalid data" msgstr "datos no válidos" -#: ../scope/src/inspect.c:356 +#: ../scope/src/inspect.c:371 msgid "no children in range" msgstr "no hay hijo en el rango" -#: ../scope/src/inspect.c:440 +#: ../scope/src/inspect.c:454 msgid "out of scope" msgstr "fuera de ámbito" -#: ../scope/src/inspect.c:587 +#: ../scope/src/inspect.c:627 msgid "Duplicate inspect variable name." msgstr "Nombre de variable de inspección duplicado." -#: ../scope/src/memory.c:299 +#: ../scope/src/memory.c:292 msgid "Read Memory" msgstr "Leer memoria" -#: ../scope/src/memory.c:408 -msgid "Scope: pointer size > 8, Data disabled." -msgstr "Ámbito: tamaño de puntero > 8, Datos desactivados." +#: ../scope/src/memory.c:396 +#, c-format +msgid "Scope: pointer size > %d, Data disabled." +msgstr "Ámbito: tamaño de puntero > %d, Datos desactivados." -#: ../scope/src/menu.c:380 +#: ../scope/src/menu.c:375 msgid "Modify" msgstr "Modificar" -#: ../scope/src/menu.c:490 +#: ../scope/src/menu.c:481 msgid "Evaluate/modify" msgstr "Evaluar/modificar" -#: ../scope/src/menu.c:491 +#: ../scope/src/menu.c:482 msgid "Watch expression" msgstr "Expresión de observación" -#: ../scope/src/menu.c:492 +#: ../scope/src/menu.c:483 msgid "Inspect variable" msgstr "Inspeccionar variable" -#: ../scope/src/parse.c:416 +#: ../scope/src/parse.c:437 msgid "Undefined GDB error." msgstr "Error de GDB indefinido." @@ -5515,35 +5889,27 @@ msgid "Select File" msgstr "Seleccionar archivo" -#: ../scope/src/prefs.c:338 -msgid "Breaks" -msgstr "Puntos de ruptura" - -#: ../scope/src/prefs.c:339 -msgid "Console" -msgstr "Consola" - -#: ../scope/src/prefs.c:347 ../scope/src/utils.c:570 +#: ../scope/src/prefs.c:294 ../scope/src/utils.c:438 #, c-format msgid "Scope: %s: %s." msgstr "Ámbito: %s: %s." -#: ../scope/src/prefs.c:352 +#: ../scope/src/prefs.c:299 msgid "Scope: created configuration file." msgstr "Ámbito: creado archivo de configuración." -#: ../scope/src/program.c:231 +#: ../scope/src/program.c:251 #, c-format msgid "Loaded debug settings for %s." msgstr "Cargados ajustes de depuración para %s." -#: ../scope/src/program.c:239 +#: ../scope/src/program.c:259 #, c-format msgid "Could not load debug settings file %s: %s." msgstr "" "No se ha podido cargar el archivo de configuración de depuración %s: %s." -#: ../scope/src/program.c:359 +#: ../scope/src/program.c:379 #, c-format msgid "" "%s: %s.\n" @@ -5554,16 +5920,15 @@ "\n" "¿Continuar?" -#: ../scope/src/program.c:394 -msgid "Delete all breakpoints, watches and inspects?" -msgstr "" -"¿Desea eliminar todos los puntos de ruptura, vigilancias e inspecciones?" +#: ../scope/src/program.c:415 +msgid "Delete all breakpoints, watches et cetera?" +msgstr "¿Desea eliminar todos los puntos de ruptura, vigilancias, etc.?" -#: ../scope/src/program.c:501 +#: ../scope/src/program.c:523 msgid "as _Name=value" msgstr "como _Nombre=valor" -#: ../scope/src/program.c:502 +#: ../scope/src/program.c:524 msgid "as _Name = value" msgstr "como _Nombre = valor" @@ -5572,157 +5937,169 @@ msgstr "Depurador de ámbito" #: ../scope/src/scope.c:35 -msgid "Simple GDB front-end." -msgstr "Interfaz sencilla para GDB." +msgid "Relatively simple GDB front-end." +msgstr "Interfaz relativamente sencilla para GDB." -#: ../scope/src/scope.c:63 +#: ../scope/src/scope.c:62 msgid "Setup program" msgstr "Configurar programa" -#: ../scope/src/scope.c:64 +#: ../scope/src/scope.c:63 msgid "Run/continue" msgstr "Ejecutar/continuar" -#: ../scope/src/scope.c:66 +#: ../scope/src/scope.c:65 msgid "Run to source" msgstr "Ejecutar hasta origen" -#: ../scope/src/scope.c:70 +#: ../scope/src/scope.c:69 msgid "Terminate" msgstr "Terminar" -#: ../scope/src/scope.c:71 +#: ../scope/src/scope.c:70 msgid "Toggle breakpoint" msgstr "Intercambiar punto de ruptura" -#: ../scope/src/scope.c:73 ../scope/src/scope.c:76 +#: ../scope/src/scope.c:72 ../scope/src/scope.c:75 msgid "GDB command" msgstr "Comando GDB" -#: ../scope/src/scope.c:74 +#: ../scope/src/scope.c:73 msgid "Show terminal" msgstr "Mostrar terminal" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Busy" msgstr "Ocupado" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Ready" msgstr "Listo" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Hang" msgstr "Colgar" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Assem" msgstr "Ensam" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Load" msgstr "Cargar" -#: ../scope/src/scope.c:394 +#: ../scope/src/scope.c:421 msgid "Build action activated. Terminate debugging?" msgstr "Activada la acción de compilación. ¿Terminar depuración?" -#: ../scope/src/thread.c:58 +#: ../scope/src/scope.c:524 +msgid "Breaks" +msgstr "Puntos de ruptura" + +#: ../scope/src/scope.c:526 +msgid "Console" +msgstr "Consola" + +#: ../scope/src/scope.c:526 +msgid "Debug Console" +msgstr "Consola de depuración:" + +#: ../scope/src/thread.c:48 #, c-format msgid "Thread group %s started." msgstr "Iniciado grupo de hilos %s." -#: ../scope/src/thread.c:76 +#: ../scope/src/thread.c:63 msgid "Thread group " msgstr "Grupo de hilos" -#: ../scope/src/thread.c:88 +#: ../scope/src/thread.c:83 msgid " exited" msgstr "terminado" -#: ../scope/src/thread.c:91 +#: ../scope/src/thread.c:86 #, c-format msgid " with exit code %s" msgstr "con código de salida %s" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 msgid "Send Signal" msgstr "Enviar señal" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 msgid "Enter signal #:" msgstr "Introducir nº de señal:" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Terminate Process" msgstr "Terminar proceso" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Enter exit code:" msgstr "Introducir código de salida:" -#: ../scope/src/thread.c:937 +#: ../scope/src/thread.c:891 msgid "Running" msgstr "Ejecutando" -#: ../scope/src/thread.c:938 +#: ../scope/src/thread.c:892 msgid "Stopped" msgstr "Detenido" -#: ../scope/src/utils.c:44 +#: ../scope/src/utils.c:45 #, c-format -msgid "%s: error %lu." -msgstr "%s: error %lu." +msgid "%s: %s" +msgstr "%s: %s" -#: ../scope/src/utils.c:358 +#: ../scope/src/utils.c:225 #, c-format msgid "Scope: error reading [%s]." msgstr "Ámbito: error al leer [%s]." -#: ../scope/src/views.c:505 +#: ../scope/src/views.c:526 msgid "…" msgstr "…" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Send" msgstr "_Enviar" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Busy" msgstr "_Ocupado" -#: ../scope/src/views.c:535 +#: ../scope/src/views.c:558 msgid "GDB Command" msgstr "Comando GDB" -#: ../spellcheck/src/speller.c:94 +#: ../spellcheck/src/speller.c:180 msgid "Try: " msgstr "Intentar: " -#: ../spellcheck/src/speller.c:173 +#: ../spellcheck/src/speller.c:252 msgid "Checking" msgstr "Comprobando" -#: ../spellcheck/src/speller.c:186 +#: ../spellcheck/src/speller.c:265 #, c-format msgid "Checking file \"%s\" (lines %d to %d using %s):" msgstr "Comprobando el archivo «%s» (líneas %d a %d usando %s):" -#: ../spellcheck/src/speller.c:196 +#: ../spellcheck/src/speller.c:275 #, c-format msgid "Checking file \"%s\" (using %s):" msgstr "Comprobando el archivo «%s» (usando %s):" -#: ../spellcheck/src/speller.c:223 +#: ../spellcheck/src/speller.c:302 msgid "The checked text is spelled correctly." msgstr "El texto comprobado es correcto." -#: ../spellcheck/src/speller.c:233 +#: ../spellcheck/src/speller.c:312 #, c-format msgid "The Enchant library couldn't be initialized (%s)." msgstr "No se ha podido inicializar la biblioteca Enchant (%s)." -#: ../spellcheck/src/speller.c:234 +#: ../spellcheck/src/speller.c:313 msgid "unknown error (maybe the chosen language is not available)" msgstr "error desconocido (quizás el idioma elegido no está disponible)" @@ -5818,17 +6195,17 @@ msgid "Ignore All" msgstr "Ignorar todo" -#: ../spellcheck/src/gui.c:521 +#: ../spellcheck/src/gui.c:526 #, c-format msgid "Default (%s)" msgstr "Predeterminado (%s)" -#: ../spellcheck/src/gui.c:532 +#: ../spellcheck/src/gui.c:537 #, c-format msgid "Toggle spell check while typing (current language: %s)" msgstr "Conmutar comprobación ortográfica al escribir (idioma actual: %s)" -#: ../spellcheck/src/gui.c:587 +#: ../spellcheck/src/gui.c:592 msgid "Spelling Suggestions" msgstr "Sugerencias" @@ -5859,28 +6236,28 @@ #. OK. Something went not as expected. #. * We did have a selection but cannot parse it into rows. #. * Aborting -#: ../tableconvert/src/tableconvert.c:236 +#: ../tableconvert/src/tableconvert.c:237 msgid "Something went wrong on parsing selection. Aborting" msgstr "Algo fue mal al parsear la selección. Deteniendo" -#: ../tableconvert/src/tableconvert.c:268 +#: ../tableconvert/src/tableconvert.c:269 msgid "Convert selection to table" msgstr "Convertir selección en tabla" #. Build up menu entry -#: ../tableconvert/src/tableconvert.c:281 +#: ../tableconvert/src/tableconvert.c:282 msgid "_Convert to table" msgstr "_Convertir en tabla" -#: ../tableconvert/src/tableconvert.c:284 +#: ../tableconvert/src/tableconvert.c:285 msgid "Converts current marked list to a table." msgstr "Convierte la lista marcada en una tabla" -#: ../treebrowser/src/treebrowser.c:120 +#: ../treebrowser/src/treebrowser.c:124 msgid "TreeBrowser" msgstr "Visor de árbol" -#: ../treebrowser/src/treebrowser.c:121 +#: ../treebrowser/src/treebrowser.c:125 msgid "" "This plugin adds a tree browser to Geany, allowing the user to browse files " "using a tree view of the directory being browsed." @@ -5888,30 +6265,30 @@ "Este complemento añade un navegador de archivos a Geany, permitiendo al " "usuario navegar por sus archivos mediante un árbol de directorios." -#: ../treebrowser/src/treebrowser.c:430 +#: ../treebrowser/src/treebrowser.c:434 #, c-format msgid "%s: no such directory." msgstr "%s: no existe el directorio." -#: ../treebrowser/src/treebrowser.c:526 ../treebrowser/src/treebrowser.c:561 -#: ../treebrowser/src/treebrowser.c:663 +#: ../treebrowser/src/treebrowser.c:537 ../treebrowser/src/treebrowser.c:572 +#: ../treebrowser/src/treebrowser.c:670 msgid "(Empty)" msgstr "(Vacío)" -#: ../treebrowser/src/treebrowser.c:966 +#: ../treebrowser/src/treebrowser.c:971 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "No se ha podido ejecutar el comando externo configurado «%s» (%s)." -#: ../treebrowser/src/treebrowser.c:1037 +#: ../treebrowser/src/treebrowser.c:1042 msgid "NewDirectory" msgstr "NewDirectory" -#: ../treebrowser/src/treebrowser.c:1039 +#: ../treebrowser/src/treebrowser.c:1044 msgid "NewFile" msgstr "NewFile" -#: ../treebrowser/src/treebrowser.c:1044 +#: ../treebrowser/src/treebrowser.c:1049 #, c-format msgid "" "Target file '%s' exists\n" @@ -5920,97 +6297,101 @@ "El archivo de destino «%s» existe.\n" "¿Está seguro de que desea reemplazarlo con un archivo vacío?" -#: ../treebrowser/src/treebrowser.c:1089 +#: ../treebrowser/src/treebrowser.c:1095 #, c-format msgid "Do you really want to delete '%s' ?" msgstr "¿Está seguro de que desea eliminar «%s»?" -#: ../treebrowser/src/treebrowser.c:1208 ../treebrowser/src/treebrowser.c:1692 +#: ../treebrowser/src/treebrowser.c:1207 ../treebrowser/src/treebrowser.c:1738 msgid "Go up" msgstr "Subir" -#: ../treebrowser/src/treebrowser.c:1212 ../treebrowser/src/treebrowser.c:1707 +#: ../treebrowser/src/treebrowser.c:1211 ../treebrowser/src/treebrowser.c:1753 msgid "Set path from document" msgstr "Fijar ruta del documento" -#: ../treebrowser/src/treebrowser.c:1216 -msgid "Open externally" -msgstr "Abrir externamente" +#: ../treebrowser/src/treebrowser.c:1215 +msgid "_Open externally" +msgstr "_Abrir externamente" -#: ../treebrowser/src/treebrowser.c:1221 +#: ../treebrowser/src/treebrowser.c:1220 msgid "Open Terminal" msgstr "Abrir terminal" -#: ../treebrowser/src/treebrowser.c:1225 +#: ../treebrowser/src/treebrowser.c:1224 msgid "Set as root" msgstr "Fijar como raíz" -#: ../treebrowser/src/treebrowser.c:1230 ../treebrowser/src/treebrowser.c:1697 -#: ../treebrowser/src/treebrowser.c:2060 +#: ../treebrowser/src/treebrowser.c:1229 ../treebrowser/src/treebrowser.c:1743 +#: ../treebrowser/src/treebrowser.c:2123 msgid "Refresh" msgstr "Refrescar" -#: ../treebrowser/src/treebrowser.c:1242 +#: ../treebrowser/src/treebrowser.c:1233 +msgid "_Find in Files" +msgstr "_Buscar en archivos" + +#: ../treebrowser/src/treebrowser.c:1241 msgid "Create new directory" msgstr "Crear directorio nuevo" -#: ../treebrowser/src/treebrowser.c:1246 +#: ../treebrowser/src/treebrowser.c:1245 msgid "Create new file" msgstr "Crear archivo nuevo" -#: ../treebrowser/src/treebrowser.c:1250 +#: ../treebrowser/src/treebrowser.c:1249 msgid "Rename" msgstr "Renombrar" -#: ../treebrowser/src/treebrowser.c:1255 +#: ../treebrowser/src/treebrowser.c:1254 msgid "Delete" msgstr "Eliminar" -#: ../treebrowser/src/treebrowser.c:1263 +#: ../treebrowser/src/treebrowser.c:1262 #, c-format msgid "Close: %s" msgstr "Cerrar: %s" -#: ../treebrowser/src/treebrowser.c:1268 +#: ../treebrowser/src/treebrowser.c:1267 #, c-format msgid "Close Child Documents " msgstr "Cerrar documentos hijo" -#: ../treebrowser/src/treebrowser.c:1273 -msgid "Copy full path to clipboard" -msgstr "Copiar ruta completa al portapapeles" +#: ../treebrowser/src/treebrowser.c:1272 +msgid "_Copy full path to clipboard" +msgstr "_Copiar ruta completa al portapapeles" -#: ../treebrowser/src/treebrowser.c:1293 ../treebrowser/src/treebrowser.c:1974 +#: ../treebrowser/src/treebrowser.c:1292 ../treebrowser/src/treebrowser.c:2032 msgid "Show bookmarks" msgstr "Mostrar marcadores" -#: ../treebrowser/src/treebrowser.c:1298 ../treebrowser/src/treebrowser.c:1928 +#: ../treebrowser/src/treebrowser.c:1297 ../treebrowser/src/treebrowser.c:1981 msgid "Show hidden files" msgstr "Mostrar archivos ocultos" -#: ../treebrowser/src/treebrowser.c:1303 +#: ../treebrowser/src/treebrowser.c:1302 msgid "Show toolbars" msgstr "Mostrar barras" -#: ../treebrowser/src/treebrowser.c:1574 +#: ../treebrowser/src/treebrowser.c:1621 #, c-format msgid "Target file '%s' exists, do you really want to replace it?" msgstr "" "El archivo de destino «%s» existe. ¿Está seguro de que desea reemplazarlo?" -#: ../treebrowser/src/treebrowser.c:1702 +#: ../treebrowser/src/treebrowser.c:1748 msgid "Home" msgstr "Inicio" -#: ../treebrowser/src/treebrowser.c:1712 +#: ../treebrowser/src/treebrowser.c:1758 msgid "Track path" msgstr "Rastrear ruta" -#: ../treebrowser/src/treebrowser.c:1717 +#: ../treebrowser/src/treebrowser.c:1763 msgid "Hide bars" msgstr "Ocultar barras" -#: ../treebrowser/src/treebrowser.c:1727 +#: ../treebrowser/src/treebrowser.c:1773 msgid "" "Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' " "reverse try for example this '!;*.c;*.h;*.cpp'" @@ -6018,19 +6399,19 @@ "Filtro (*.c;*.h;*.cpp), y si quiere un filtro temporal utilice «!», por " "ejemplo: '!;*.c;*.h;*.cpp'" -#: ../treebrowser/src/treebrowser.c:1735 +#: ../treebrowser/src/treebrowser.c:1781 msgid "Addressbar for example '/projects/my-project'" msgstr "Barra de direcciones, por ejemplo «/proyectos/mi-proyecto»" -#: ../treebrowser/src/treebrowser.c:1760 +#: ../treebrowser/src/treebrowser.c:1806 msgid "Tree Browser" msgstr "Visor de árbol" -#: ../treebrowser/src/treebrowser.c:1892 +#: ../treebrowser/src/treebrowser.c:1945 msgid "External open command" msgstr "Comando de apertura externa" -#: ../treebrowser/src/treebrowser.c:1897 +#: ../treebrowser/src/treebrowser.c:1950 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -6044,53 +6425,53 @@ "%f se reemplazará con el nombre de archivo con la ruta completa\n" "%d se reemplazará con la ruta del directorio sin el nombre de archivo" -#: ../treebrowser/src/treebrowser.c:1905 +#: ../treebrowser/src/treebrowser.c:1958 msgid "Toolbar" msgstr "Barra de herramientas" -#: ../treebrowser/src/treebrowser.c:1907 +#: ../treebrowser/src/treebrowser.c:1960 msgid "Hidden" msgstr "Oculta" -#: ../treebrowser/src/treebrowser.c:1908 +#: ../treebrowser/src/treebrowser.c:1961 msgid "Top" msgstr "Arriba" -#: ../treebrowser/src/treebrowser.c:1909 +#: ../treebrowser/src/treebrowser.c:1962 msgid "Bottom" msgstr "Abajo" -#: ../treebrowser/src/treebrowser.c:1914 +#: ../treebrowser/src/treebrowser.c:1967 msgid "If position is changed, the option require plugin restart." msgstr "Si se cambia la posición será necesario reiniciar el complemento." -#: ../treebrowser/src/treebrowser.c:1918 +#: ../treebrowser/src/treebrowser.c:1971 msgid "Show icons" msgstr "Mostrar iconos" -#: ../treebrowser/src/treebrowser.c:1920 +#: ../treebrowser/src/treebrowser.c:1973 msgid "None" msgstr "Ninguno" -#: ../treebrowser/src/treebrowser.c:1921 +#: ../treebrowser/src/treebrowser.c:1974 msgid "Base" msgstr "Base" -#: ../treebrowser/src/treebrowser.c:1922 +#: ../treebrowser/src/treebrowser.c:1975 msgid "Content-type" msgstr "Tipo de contenido" -#: ../treebrowser/src/treebrowser.c:1933 +#: ../treebrowser/src/treebrowser.c:1986 msgid "On Windows, this just hide files that are prefixed with '.' (dot)" msgstr "" "En Windows esto solamente oculta archivos cuyo nombre empieza con un " "«.» (punto)." -#: ../treebrowser/src/treebrowser.c:1935 +#: ../treebrowser/src/treebrowser.c:1988 msgid "Hide object files" msgstr "Ocultar archivos objeto" -#: ../treebrowser/src/treebrowser.c:1940 +#: ../treebrowser/src/treebrowser.c:1993 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -6098,47 +6479,55 @@ "No mostrar los archivos objeto generados en el visor de archivos, esto " "incluye *.o, *.obj. *.so, *.dll, *.a, *.lib" -#: ../treebrowser/src/treebrowser.c:1942 +#: ../treebrowser/src/treebrowser.c:1995 msgid "Reverse filter" msgstr "Invertir filtro" -#: ../treebrowser/src/treebrowser.c:1947 +#: ../treebrowser/src/treebrowser.c:2000 msgid "Follow current document" msgstr "Seguir documento actual" -#: ../treebrowser/src/treebrowser.c:1952 +#: ../treebrowser/src/treebrowser.c:2005 msgid "Single click, open document and focus it" msgstr "Una sola pulsación abre el documento y lo enfoca" -#: ../treebrowser/src/treebrowser.c:1957 +#: ../treebrowser/src/treebrowser.c:2010 msgid "Double click open directory" msgstr "Doble pulsación para abrir un directorio" -#: ../treebrowser/src/treebrowser.c:1962 +#: ../treebrowser/src/treebrowser.c:2015 msgid "On delete file, close it if is opened" msgstr "Al borrar un archivo, cerrarlo si está abierto" -#: ../treebrowser/src/treebrowser.c:1967 +#: ../treebrowser/src/treebrowser.c:2020 +msgid "Focus editor on file open" +msgstr "Enfocar el editor al abrir un archivo" + +#: ../treebrowser/src/treebrowser.c:2025 msgid "Show tree lines" msgstr "Mostrar líneas de árbol" -#: ../treebrowser/src/treebrowser.c:2050 +#: ../treebrowser/src/treebrowser.c:2037 +msgid "Open new files" +msgstr "Abrir archivos nuevos" + +#: ../treebrowser/src/treebrowser.c:2113 msgid "Focus File List" msgstr "Enfocar lista de archivos" -#: ../treebrowser/src/treebrowser.c:2052 +#: ../treebrowser/src/treebrowser.c:2115 msgid "Focus Path Entry" msgstr "Enfocar entrada de ruta" -#: ../treebrowser/src/treebrowser.c:2054 +#: ../treebrowser/src/treebrowser.c:2117 msgid "Rename Object" msgstr "Renombrar objeto" -#: ../treebrowser/src/treebrowser.c:2056 +#: ../treebrowser/src/treebrowser.c:2119 msgid "Create New File" msgstr "Crear archivo nuevo" -#: ../treebrowser/src/treebrowser.c:2058 +#: ../treebrowser/src/treebrowser.c:2121 msgid "Create New Directory" msgstr "Crear directorio nuevo" @@ -6207,44 +6596,44 @@ msgid "utility" msgstr "utilidad" -#: ../webhelper/src/gwh-settings.c:775 +#: ../webhelper/src/gwh-settings.c:782 #, c-format msgid "%s:" msgstr "%s:" -#: ../webhelper/src/gwh-browser.c:528 +#: ../webhelper/src/gwh-browser.c:534 msgid "_Zoom" msgstr "_Zoom" -#: ../webhelper/src/gwh-browser.c:550 +#: ../webhelper/src/gwh-browser.c:556 msgid "Full-_content zoom" msgstr "Zoom a todo el _contenido" -#: ../webhelper/src/gwh-browser.c:561 +#: ../webhelper/src/gwh-browser.c:567 msgid "Flip panes orientation" msgstr "Voltear orientación de los paneles" -#: ../webhelper/src/gwh-browser.c:808 +#: ../webhelper/src/gwh-browser.c:814 msgid "Back" msgstr "Atrás" -#: ../webhelper/src/gwh-browser.c:812 +#: ../webhelper/src/gwh-browser.c:818 msgid "Forward" msgstr "Adelante" -#: ../webhelper/src/gwh-browser.c:816 +#: ../webhelper/src/gwh-browser.c:822 msgid "Cancel loading" msgstr "Cancelar carga" -#: ../webhelper/src/gwh-browser.c:820 +#: ../webhelper/src/gwh-browser.c:826 msgid "Reload current page" msgstr "Recargar página actual" -#: ../webhelper/src/gwh-browser.c:833 ../webhelper/src/gwh-browser.c:879 +#: ../webhelper/src/gwh-browser.c:839 ../webhelper/src/gwh-browser.c:885 msgid "Web inspector" msgstr "Inspector web" -#: ../webhelper/src/gwh-browser.c:834 +#: ../webhelper/src/gwh-browser.c:840 msgid "Toggle web inspector" msgstr "Des/activar inspector web" @@ -6385,6 +6774,9 @@ msgid "Autocompletes XML/HTML tags using snippets." msgstr "Autocompleta etiquetas XML/HTML mediante recortes" +#~ msgid "%s: error %lu." +#~ msgstr "%s: error %lu." + #~ msgid "Plugins" #~ msgstr "Plugins" @@ -6468,9 +6860,6 @@ #~ msgid "tty temporary directory not specified!\n" #~ msgstr "No se ha indicado el directorio temporal para tty.\n" -#~ msgid "tty temporary directory not found!\n" -#~ msgstr "No se ha encontrado el directorio temporal para tty.\n" - #~ msgid "tty helper program not specified!\n" #~ msgstr "No se ha especificado el programa de apoyo para tty.\n" @@ -6537,21 +6926,12 @@ #~ msgid "No %s selected" #~ msgstr "No se ha seleccionado %s" -#~ msgid "watchpoint" -#~ msgstr "punto de observación" - #~ msgid "Delete selected watchpoint?" #~ msgstr "¿Desea eliminar el punto de observación seleccionado?" #~ msgid "Delete selected breakpoint?" #~ msgstr "¿Desea eliminar el punto de ruptura seleccionado?" -#~ msgid "Edit watchpoint" -#~ msgstr "Editar punto de observación" - -#~ msgid "Edit breakpoint" -#~ msgstr "Editar punto de ruptura" - #~ msgid "Enabled" #~ msgstr "Activado" @@ -6902,10 +7282,6 @@ #~ "Quiere usar una cifra simétrica?" #~ msgstr "No " -#, fuzzy -#~ msgid "GeanyPG" -#~ msgstr "GeanyGDB" - #~ msgid "Lionel Fuentes" #~ msgstr "Lionel Fuentes" diff -Nru geany-plugins-1.23+dfsg/po/fr.po geany-plugins-1.24+dfsg/po/fr.po --- geany-plugins-1.23+dfsg/po/fr.po 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/po/fr.po 2014-04-12 14:28:39.000000000 +0000 @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Geany-plugins 1.23\n" +"Project-Id-Version: Geany-plugins 1.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-10 04:33+0100\n" -"PO-Revision-Date: 2013-03-10 05:19+0100\n" +"POT-Creation-Date: 2014-03-30 19:33+0200\n" +"PO-Revision-Date: 2014-04-10 17:19+0200\n" "Last-Translator: Colomban Wendling \n" "Language-Team: French \n" "Language: fr\n" @@ -36,12 +36,12 @@ msgid "Contents" msgstr "Contenu" -#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:624 +#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:625 msgid "Bookmarks" msgstr "Marque-pages" #. complete update -#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2295 +#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2351 msgid "_Update" msgstr "Mettre à jo_ur" @@ -78,15 +78,15 @@ msgid "Context:" msgstr "Contexte :" -#: ../addons/src/ao_xmltagging.c:56 +#: ../addons/src/ao_xmltagging.c:54 msgid "XML tagging" msgstr "" -#: ../addons/src/ao_xmltagging.c:67 +#: ../addons/src/ao_xmltagging.c:65 msgid "Tag name to be inserted:" msgstr "Nom du tag à insérer :" -#: ../addons/src/ao_xmltagging.c:71 +#: ../addons/src/ao_xmltagging.c:69 #, fuzzy, c-format msgid "" "%s will be replaced with your current selection. Please keep care on your " @@ -156,11 +156,12 @@ msgid "Run XML tagging" msgstr "" -#: ../addons/src/addons.c:417 ../geanylatex/src/geanylatex.c:241 -#: ../geanyprj/src/geanyprj.c:174 ../geanysendmail/src/geanysendmail.c:121 -#: ../geanysendmail/src/geanysendmail.c:287 ../geanyvc/src/geanyvc.c:1798 +#: ../addons/src/addons.c:417 ../autoclose/src/autoclose.c:871 +#: ../geanylatex/src/geanylatex.c:241 ../geanyprj/src/geanyprj.c:174 +#: ../geanysendmail/src/geanysendmail.c:123 +#: ../geanysendmail/src/geanysendmail.c:291 ../geanyvc/src/geanyvc.c:1854 #: ../geniuspaste/src/geniuspaste.c:140 ../spellcheck/src/scplugin.c:146 -#: ../treebrowser/src/treebrowser.c:1883 +#: ../treebrowser/src/treebrowser.c:1933 #: ../updatechecker/src/updatechecker.c:253 msgid "Plugin configuration directory could not be created." msgstr "Le répertoire de configuration du plugin n'a pas pu être créé." @@ -251,6 +252,14 @@ msgid "Enclose selection automatically (without having to press a keybinding)" msgstr "" +#: ../autoclose/src/autoclose.c:50 +msgid "Auto-close" +msgstr "" + +#: ../autoclose/src/autoclose.c:51 +msgid "Auto-close braces and brackets with lot of features" +msgstr "" + #: ../codenav/src/codenavigation.c:52 msgid "Code navigation" msgstr "Navigateur de code" @@ -274,9 +283,9 @@ msgstr "Aller au fichier" #: ../codenav/src/goto_file.c:109 -#, c-format +#, c-format, fuzzy msgid "(From the %s plugin)" -msgstr "" +msgstr "(Du plugin %s)" #. Add the menu item and make it sensitive only when a document is opened #. Frame, which is the returned widget @@ -320,8 +329,8 @@ msgid "Various debuggers integration." msgstr "Intégration de divers débogueurs." -#: ../debugger/src/plugin.c:131 ../debugger/src/keys.c:76 -#: ../scope/data/scope.glade.h:125 ../scope/src/scope.c:225 +#: ../debugger/src/plugin.c:133 ../debugger/src/keys.c:76 +#: ../scope/data/scope.glade.h:124 ../scope/src/scope.c:226 msgid "Debug" msgstr "Déboguage" @@ -398,9 +407,8 @@ msgstr "Impossible d'exécuter le processus gdb" #: ../debugger/src/dbm_gdb.c:782 -#, fuzzy msgid "~\"Loading target file.\\n\"" -msgstr "Choisir une cible" +msgstr "~\"Chargement du fichier cible.\\n\"" #: ../debugger/src/dbm_gdb.c:782 msgid "Error loading file" @@ -429,12 +437,14 @@ msgstr "Impossible de trouver un fichier source « %s »" #: ../debugger/src/stree.c:140 +#, fuzzy msgid "Active frame" -msgstr "" +msgstr "Page active" #: ../debugger/src/stree.c:140 +#, fuzzy msgid "Click an arrow to switch to a frame" -msgstr "" +msgstr "Cliquez les flèches pour changer de page" #: ../debugger/src/stree.c:363 ../geanylatex/src/bibtexlabels.c:46 msgid "Address" @@ -456,7 +466,7 @@ msgid "Target" msgstr "Cible" -#: ../debugger/src/tabs.c:135 ../scope/data/scope.glade.h:69 +#: ../debugger/src/tabs.c:135 ../scope/src/scope.c:524 msgid "Breakpoints" msgstr "Points d'arrêt" @@ -493,22 +503,22 @@ msgstr "Redémarrer" #: ../debugger/src/keys.c:52 ../debugger/src/btnpanel.c:113 -#: ../scope/src/scope.c:67 +#: ../scope/src/scope.c:66 msgid "Step into" msgstr "" #: ../debugger/src/keys.c:53 ../debugger/src/btnpanel.c:110 -#: ../scope/src/scope.c:68 +#: ../scope/src/scope.c:67 msgid "Step over" msgstr "" #: ../debugger/src/keys.c:54 ../debugger/src/btnpanel.c:122 -#: ../scope/src/scope.c:69 +#: ../scope/src/scope.c:68 msgid "Step out" msgstr "" #: ../debugger/src/keys.c:55 ../debugger/src/btnpanel.c:125 -#: ../scope/src/scope.c:65 +#: ../scope/src/scope.c:64 msgid "Run to cursor" msgstr "Exécuter jusqu'au curseur" @@ -550,6 +560,16 @@ msgid "Save debug session data to a project" msgstr "Enregistrer la session de déboguage dans un projet" +#: ../defineformat/src/defineformat.c:56 +#, fuzzy +msgid "Define formatter" +msgstr "Formateur de defines" + +#: ../defineformat/src/defineformat.c:57 +#, fuzzy +msgid "Automatically align backslash in multi-line defines" +msgstr "Aligne automatiquement les backslashes dans des defines multi-lignes" + #. never search for more than this many chars #: ../devhelp/src/dhp.h:38 msgid "Documentation" @@ -661,7 +681,7 @@ msgstr "Livre :" #. i18n: a documentation book -#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1760 +#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1759 msgid "Book" msgstr "Livre" @@ -750,7 +770,7 @@ #: ../devhelp/devhelp/dh-search.c:620 #, fuzzy msgid "Search in:" -msgstr "Mots à rechercher :" +msgstr "Rechercher dans :" #: ../devhelp/devhelp/dh-window.c:98 msgid "50%" @@ -796,7 +816,7 @@ msgid "A developers' help browser for GNOME" msgstr "Un navigateur d'aide pour développeur pour GNOME" -#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2010 +#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2066 msgid "_File" msgstr "_Fichier" @@ -984,55 +1004,64 @@ msgid "Column mode, select to line / brace / anchor." msgstr "" -#: ../geanyextrasel/src/extrasel.c:482 +#: ../geanyextrasel/src/extrasel.c:502 msgid "E_xtra Selection" msgstr "" -#: ../geanyextrasel/src/extrasel.c:489 +#: ../geanyextrasel/src/extrasel.c:509 msgid "_Column Mode" msgstr "" -#: ../geanyextrasel/src/extrasel.c:494 +#: ../geanyextrasel/src/extrasel.c:514 msgid "Column mode" msgstr "" -#: ../geanyextrasel/src/extrasel.c:496 +#: ../geanyextrasel/src/extrasel.c:516 msgid "Select to _Line" msgstr "" -#: ../geanyextrasel/src/extrasel.c:500 +#: ../geanyextrasel/src/extrasel.c:520 msgid "Select to line" msgstr "" -#: ../geanyextrasel/src/extrasel.c:502 +#: ../geanyextrasel/src/extrasel.c:522 msgid "Select to Matching _Brace" msgstr "" -#: ../geanyextrasel/src/extrasel.c:506 +#: ../geanyextrasel/src/extrasel.c:526 msgid "Select to matching brace" msgstr "" -#: ../geanyextrasel/src/extrasel.c:510 +#: ../geanyextrasel/src/extrasel.c:528 +msgid "_Toggle Stream/Rectangular" +msgstr "" + +#: ../geanyextrasel/src/extrasel.c:532 +#, fuzzy +msgid "Convert selection" +msgstr "Convertir la sélection" + +#: ../geanyextrasel/src/extrasel.c:537 msgid "_Set Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:514 +#: ../geanyextrasel/src/extrasel.c:541 msgid "Set anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:516 +#: ../geanyextrasel/src/extrasel.c:543 msgid "Select to _Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:520 +#: ../geanyextrasel/src/extrasel.c:547 msgid "Select to anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:522 +#: ../geanyextrasel/src/extrasel.c:549 msgid "_Rectangle Select to Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:527 +#: ../geanyextrasel/src/extrasel.c:554 msgid "Rectangle select to anchor" msgstr "" @@ -1448,76 +1477,76 @@ "Type de documentation par défaut pour tous les langages pour lesquels aucun " "n'est défini" -#: ../geanyinsertnum/src/insertnum.c:37 ../geanyinsertnum/src/insertnum.c:329 -#: ../geanyinsertnum/src/insertnum.c:461 +#: ../geanyinsertnum/src/insertnum.c:44 ../geanyinsertnum/src/insertnum.c:337 +#: ../geanyinsertnum/src/insertnum.c:484 msgid "Insert Numbers" msgstr "Insérer des nombres" -#: ../geanyinsertnum/src/insertnum.c:37 +#: ../geanyinsertnum/src/insertnum.c:44 msgid "Insert/Fill columns with numbers." msgstr "Insert ou remplit des colonnes avec des nombres." -#: ../geanyinsertnum/src/insertnum.c:140 +#: ../geanyinsertnum/src/insertnum.c:146 msgid "Counting..." msgstr "Décompte…" -#: ../geanyinsertnum/src/insertnum.c:188 +#: ../geanyinsertnum/src/insertnum.c:194 msgid "Preparing..." msgstr "Préparation…" -#: ../geanyinsertnum/src/insertnum.c:194 +#: ../geanyinsertnum/src/insertnum.c:200 msgid "Inserting..." msgstr "Insertion…" -#: ../geanyinsertnum/src/insertnum.c:318 +#: ../geanyinsertnum/src/insertnum.c:333 msgid "For base 11 and above" msgstr "Pour base 11 et supérieure" -#: ../geanyinsertnum/src/insertnum.c:341 +#: ../geanyinsertnum/src/insertnum.c:353 msgid "_Start:" msgstr "_Début :" -#: ../geanyinsertnum/src/insertnum.c:346 +#: ../geanyinsertnum/src/insertnum.c:358 msgid "S_tep:" msgstr "_Pas :" -#: ../geanyinsertnum/src/insertnum.c:352 +#: ../geanyinsertnum/src/insertnum.c:364 msgid "_Base:" msgstr "_Base :" -#: ../geanyinsertnum/src/insertnum.c:363 +#: ../geanyinsertnum/src/insertnum.c:380 msgid "Letters:" msgstr "Lettres :" -#: ../geanyinsertnum/src/insertnum.c:366 +#: ../geanyinsertnum/src/insertnum.c:383 msgid "_Upper" msgstr "_Majuscules" -#: ../geanyinsertnum/src/insertnum.c:371 +#: ../geanyinsertnum/src/insertnum.c:388 msgid "_Lower" msgstr "M_inuscules" -#: ../geanyinsertnum/src/insertnum.c:376 +#: ../geanyinsertnum/src/insertnum.c:393 msgid "Base _prefix" msgstr "_Préfixe de base" -#: ../geanyinsertnum/src/insertnum.c:378 +#: ../geanyinsertnum/src/insertnum.c:395 msgid "0 for octal, 0x for hex, + for positive decimal" msgstr "0 pour octal, 0x pour hexadécimal et + pour les entiers positifs" -#: ../geanyinsertnum/src/insertnum.c:380 +#: ../geanyinsertnum/src/insertnum.c:397 msgid "Padding:" msgstr "Alignement :" -#: ../geanyinsertnum/src/insertnum.c:382 +#: ../geanyinsertnum/src/insertnum.c:399 msgid "Sp_ace" msgstr "Esp_aces" -#: ../geanyinsertnum/src/insertnum.c:385 +#: ../geanyinsertnum/src/insertnum.c:402 msgid "_Zero" msgstr "_Zéros" -#: ../geanyinsertnum/src/insertnum.c:454 +#: ../geanyinsertnum/src/insertnum.c:477 msgid "Insert _Numbers" msgstr "Insérer des _nombres" @@ -1550,7 +1579,7 @@ msgstr "Environnement :" #: ../geanylatex/src/latexutils.c:87 -#, fuzzy, c-format +#, c-format msgid "" "Could not determine where to insert package: %s\n" "Please try insert package manually" @@ -1559,7 +1588,7 @@ "Essayez d'insérer le package manuellement" #: ../geanylatex/src/latexutils.c:89 -#, fuzzy, c-format +#, c-format msgid "Could not determine where to insert package: %s" msgstr "Impossible de déterminer où insérer le package : %s" @@ -1799,7 +1828,7 @@ #: ../geanylatex/src/bibtexlabels.c:123 msgid "Series of books in which the book was published" -msgstr "" +msgstr "Série de livre dans laquelle le livre a été publié" #: ../geanylatex/src/bibtexlabels.c:124 msgid "Title of the work" @@ -1938,12 +1967,10 @@ msgstr "Ajouter des packages additionnels" #: ../geanylatex/src/geanylatex.c:1192 -#, fuzzy msgid "Package name:" msgstr "Nom du package :" #: ../geanylatex/src/geanylatex.c:1195 -#, fuzzy msgid "Package options:" msgstr "Options du package :" @@ -1955,20 +1982,20 @@ msgid "BibTeX reference name:" msgstr "Nom de la référence BibTeX" -#: ../geanylatex/src/geanylatex.c:1680 +#: ../geanylatex/src/geanylatex.c:1679 msgid "Dear Sir or Madame" msgstr "" -#: ../geanylatex/src/geanylatex.c:1681 +#: ../geanylatex/src/geanylatex.c:1680 msgid "With kind regards" msgstr "" -#: ../geanylatex/src/geanylatex.c:1689 +#: ../geanylatex/src/geanylatex.c:1688 msgid "No template assigned. Aborting" msgstr "Aucun modèle associé. Abandon" #. Building the wizard-dialog and showing it -#: ../geanylatex/src/geanylatex.c:1716 +#: ../geanylatex/src/geanylatex.c:1715 msgid "LaTeX-Wizard" msgstr "Assistant LaTeX" @@ -1976,67 +2003,67 @@ #. * Adds custom templates if there are any. If there are none just #. * adds default one #. TEMPLATE FILE -#: ../geanylatex/src/geanylatex.c:1731 ../markdown/src/conf.c:668 +#: ../geanylatex/src/geanylatex.c:1730 ../markdown/src/conf.c:659 msgid "Template:" msgstr "Modèle :" -#: ../geanylatex/src/geanylatex.c:1735 +#: ../geanylatex/src/geanylatex.c:1734 msgid "Set the template which should be used for creating the new document" msgstr "Définit le modèle qui doit être utilisé pour créer le document" -#: ../geanylatex/src/geanylatex.c:1744 +#: ../geanylatex/src/geanylatex.c:1743 msgid "Default" msgstr "Par défaut" #. Documentclass -#: ../geanylatex/src/geanylatex.c:1755 +#: ../geanylatex/src/geanylatex.c:1754 msgid "Documentclass:" msgstr "Classe du document :" -#: ../geanylatex/src/geanylatex.c:1758 +#: ../geanylatex/src/geanylatex.c:1757 msgid "Choose the kind of document you want to write" msgstr "Choisissez le genre de document que vous voulez écrire" -#: ../geanylatex/src/geanylatex.c:1762 +#: ../geanylatex/src/geanylatex.c:1761 msgid "Article" msgstr "Article" -#: ../geanylatex/src/geanylatex.c:1764 +#: ../geanylatex/src/geanylatex.c:1763 msgid "Report" msgstr "Raport" -#: ../geanylatex/src/geanylatex.c:1766 +#: ../geanylatex/src/geanylatex.c:1765 msgid "Letter" msgstr "Lettre" -#: ../geanylatex/src/geanylatex.c:1768 +#: ../geanylatex/src/geanylatex.c:1767 msgid "Presentation" msgstr "Présentation" #. Encoding -#: ../geanylatex/src/geanylatex.c:1778 +#: ../geanylatex/src/geanylatex.c:1777 msgid "Encoding:" msgstr "Encodage :" -#: ../geanylatex/src/geanylatex.c:1782 +#: ../geanylatex/src/geanylatex.c:1781 msgid "Set the encoding for your new document" msgstr "Définit l'encodage pour votre nouveau document" #. fontsize -#: ../geanylatex/src/geanylatex.c:1798 +#: ../geanylatex/src/geanylatex.c:1797 msgid "Font size" msgstr "Taille de la police" -#: ../geanylatex/src/geanylatex.c:1804 +#: ../geanylatex/src/geanylatex.c:1803 msgid "Set the default font size of your new document" msgstr "Définit la taille par défaut de la police pour votre nouveau document" #. Author -#: ../geanylatex/src/geanylatex.c:1816 +#: ../geanylatex/src/geanylatex.c:1815 msgid "Author:" msgstr "Auteur :" -#: ../geanylatex/src/geanylatex.c:1819 +#: ../geanylatex/src/geanylatex.c:1818 msgid "" "Sets the value of the \\author command. In most cases this should be your " "name" @@ -2045,11 +2072,11 @@ "devrait être votre nom" #. Date -#: ../geanylatex/src/geanylatex.c:1833 +#: ../geanylatex/src/geanylatex.c:1832 msgid "Date:" msgstr "Date :" -#: ../geanylatex/src/geanylatex.c:1836 +#: ../geanylatex/src/geanylatex.c:1835 msgid "" "Sets the value of the \\date command inside header of your new created LaTeX-" "document. Keeping it at \\today is a good decision if you don't need any " @@ -2060,37 +2087,37 @@ "besoin d'un date précise." #. Title of the new document -#: ../geanylatex/src/geanylatex.c:1848 +#: ../geanylatex/src/geanylatex.c:1847 msgid "Title:" msgstr "Titre :" -#: ../geanylatex/src/geanylatex.c:1851 +#: ../geanylatex/src/geanylatex.c:1850 msgid "Sets the title of your new document." msgstr "Définit le titre de votre nouveau document." #. Papersize -#: ../geanylatex/src/geanylatex.c:1860 +#: ../geanylatex/src/geanylatex.c:1859 msgid "Paper size:" msgstr "Taille du papier :" -#: ../geanylatex/src/geanylatex.c:1863 +#: ../geanylatex/src/geanylatex.c:1862 msgid "Choose the paper format for the newly created document" msgstr "Définit le format du papier pour votre nouveau document" #. Paper direction -#: ../geanylatex/src/geanylatex.c:1876 +#: ../geanylatex/src/geanylatex.c:1875 msgid "Paper Orientation:" msgstr "Orientation du papier :" -#: ../geanylatex/src/geanylatex.c:1879 +#: ../geanylatex/src/geanylatex.c:1878 msgid "Choose the paper orientation for the newly created document" msgstr "Définit l'orientation du papier pour votre nouveau document" -#: ../geanylatex/src/geanylatex.c:1900 +#: ../geanylatex/src/geanylatex.c:1899 msgid "Use KOMA-script classes if possible" msgstr "Utiliser les classes de script KOMA si possible" -#: ../geanylatex/src/geanylatex.c:1902 +#: ../geanylatex/src/geanylatex.c:1901 msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" "Keep in mind: To compile your document these classes have to be installed " @@ -2100,105 +2127,106 @@ "Souvenez vous : pour compiler votre document ces classes doivent être " "installées." -#: ../geanylatex/src/geanylatex.c:1909 +#: ../geanylatex/src/geanylatex.c:1908 msgid "Use draft mode" msgstr "Utiliser le mode ébauche" -#: ../geanylatex/src/geanylatex.c:1911 +#: ../geanylatex/src/geanylatex.c:1910 msgid "" "Set the draft flag inside new created documents to get documents with a " "number of debugging helpers" msgstr "" -#: ../geanylatex/src/geanylatex.c:1928 +#: ../geanylatex/src/geanylatex.c:1927 msgid "Run LaTeX-Wizard" msgstr "Lancer l'assistant LaTeX" -#: ../geanylatex/src/geanylatex.c:1930 +#: ../geanylatex/src/geanylatex.c:1929 msgid "Insert \\label" msgstr "Insérer \\label" -#: ../geanylatex/src/geanylatex.c:1932 +#: ../geanylatex/src/geanylatex.c:1931 msgid "Insert \\ref" msgstr "Insérer \\ref" -#: ../geanylatex/src/geanylatex.c:1934 +#: ../geanylatex/src/geanylatex.c:1933 msgid "Insert linebreak \\\\ " msgstr "Insérer une coupure de ligne \\\\ " -#: ../geanylatex/src/geanylatex.c:1937 +#: ../geanylatex/src/geanylatex.c:1936 msgid "Insert command" msgstr "Insérer une commande" -#: ../geanylatex/src/geanylatex.c:1939 +#: ../geanylatex/src/geanylatex.c:1938 +#, fuzzy msgid "Turn input replacement on/off" -msgstr "" +msgstr "Activer/désactiver les remplacements lors de la frappe" -#: ../geanylatex/src/geanylatex.c:1943 +#: ../geanylatex/src/geanylatex.c:1942 msgid "Replace special characters" msgstr "Remplacer les caractères spéciaux" -#: ../geanylatex/src/geanylatex.c:1946 +#: ../geanylatex/src/geanylatex.c:1945 msgid "Run insert environment dialog" msgstr "Afficher le dialogue d'insertion d'environnement" -#: ../geanylatex/src/geanylatex.c:1948 +#: ../geanylatex/src/geanylatex.c:1947 msgid "Insert \\item" msgstr "Insérer \\item" -#: ../geanylatex/src/geanylatex.c:1950 +#: ../geanylatex/src/geanylatex.c:1949 msgid "Format selection in bold font face" msgstr "Formatter la sélection avec une police grasse" -#: ../geanylatex/src/geanylatex.c:1952 +#: ../geanylatex/src/geanylatex.c:1951 msgid "Format selection in italic font face" msgstr "Formatter la sélection avec une police italique" -#: ../geanylatex/src/geanylatex.c:1954 +#: ../geanylatex/src/geanylatex.c:1953 msgid "Format selection in typewriter font face" msgstr "Formatter la sélection avec une police à chasse fixe" -#: ../geanylatex/src/geanylatex.c:1956 +#: ../geanylatex/src/geanylatex.c:1955 msgid "Format selection centered" msgstr "Centrer la sélection" -#: ../geanylatex/src/geanylatex.c:1958 +#: ../geanylatex/src/geanylatex.c:1957 msgid "Format selection left-aligned" msgstr "Aligner la sélection à gauche" -#: ../geanylatex/src/geanylatex.c:1960 +#: ../geanylatex/src/geanylatex.c:1959 msgid "Format selection right-aligned" msgstr "Aligner la sélection à droite" -#: ../geanylatex/src/geanylatex.c:1963 +#: ../geanylatex/src/geanylatex.c:1962 msgid "Insert description list" msgstr "Insérer une liste de description" -#: ../geanylatex/src/geanylatex.c:1966 +#: ../geanylatex/src/geanylatex.c:1965 msgid "Insert itemize list" msgstr "Insérer une liste d'éléments" -#: ../geanylatex/src/geanylatex.c:1969 +#: ../geanylatex/src/geanylatex.c:1968 msgid "Insert enumerate list" msgstr "" -#: ../geanylatex/src/geanylatex.c:1972 +#: ../geanylatex/src/geanylatex.c:1971 msgid "Set selection one level up" msgstr "" -#: ../geanylatex/src/geanylatex.c:1975 +#: ../geanylatex/src/geanylatex.c:1974 msgid "Set selection one level down" msgstr "" -#: ../geanylatex/src/geanylatex.c:1978 +#: ../geanylatex/src/geanylatex.c:1977 msgid "Insert \\usepackage{}" msgstr "Insérer \\usepackage{}" -#: ../geanylatex/src/geanylatex.c:1981 +#: ../geanylatex/src/geanylatex.c:1980 msgid "Insert BibTeX reference dialog" msgstr "" -#: ../geanylatex/src/geanylatex.c:1988 +#: ../geanylatex/src/geanylatex.c:1987 msgid "" "GeanyLaTeX is a plugin to improve support for LaTeX in Geany.\n" "\n" @@ -2208,7 +2236,7 @@ "\n" "Merci de rapporter tous les bogues ou demandes d'améliorations aux auteurs." -#: ../geanylatex/src/geanylatex.c:2026 +#: ../geanylatex/src/geanylatex.c:2025 msgid "" "glatex_set_autocompletion_contextsize has been initialized with an invalid " "value. Default value taken. Please check your configuration file" @@ -2217,118 +2245,118 @@ "invalide ; la valeur par défaut a été utilisée à la place. Veuillez vérifier " "votre fichier de configuration." -#: ../geanylatex/src/geanylatex.c:2048 ../geanylatex/src/geanylatex.c:2055 +#: ../geanylatex/src/geanylatex.c:2047 ../geanylatex/src/geanylatex.c:2054 msgid "page \\pageref{{{reference}}}" msgstr "" -#: ../geanylatex/src/geanylatex.c:2052 ../geanylatex/src/geanylatex.c:2059 +#: ../geanylatex/src/geanylatex.c:2051 ../geanylatex/src/geanylatex.c:2058 msgid "\\ref{{{reference}}}, page \\pageref{{{reference}}}" msgstr "" #. Build up menu for menubar -#: ../geanylatex/src/geanylatex.c:2107 +#: ../geanylatex/src/geanylatex.c:2106 msgid "_LaTeX" msgstr "_LaTeX" #. Filling up menubar menus #. LaTeX menu -#: ../geanylatex/src/geanylatex.c:2116 ../geanylatex/src/geanylatex.c:2328 +#: ../geanylatex/src/geanylatex.c:2115 ../geanylatex/src/geanylatex.c:2327 msgid "LaTeX-_Wizard" msgstr "_Assistant LaTeX" -#: ../geanylatex/src/geanylatex.c:2119 ../geanylatex/src/geanylatex.c:2331 +#: ../geanylatex/src/geanylatex.c:2118 ../geanylatex/src/geanylatex.c:2330 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "Lance un assistant pour créer aisément des documents LaTeX" -#: ../geanylatex/src/geanylatex.c:2124 +#: ../geanylatex/src/geanylatex.c:2123 msgid "I_nsert Special Character" msgstr "I_nsérer un caractère spécial" -#: ../geanylatex/src/geanylatex.c:2126 +#: ../geanylatex/src/geanylatex.c:2125 msgid "Helps to use some not very common letters and signs" msgstr "Facilite l'utilisation de lettres et de signes peu communs" -#: ../geanylatex/src/geanylatex.c:2136 +#: ../geanylatex/src/geanylatex.c:2135 msgid "Insert _Reference" msgstr "Insérer une _référence" -#: ../geanylatex/src/geanylatex.c:2138 +#: ../geanylatex/src/geanylatex.c:2137 msgid "Inserting references to the document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2143 +#: ../geanylatex/src/geanylatex.c:2142 msgid "Insert _Label" msgstr "Insérer un _label" -#: ../geanylatex/src/geanylatex.c:2145 +#: ../geanylatex/src/geanylatex.c:2144 msgid "Helps at inserting labels to a document" msgstr "Aide à insérer des labels dans un document" -#: ../geanylatex/src/geanylatex.c:2151 +#: ../geanylatex/src/geanylatex.c:2150 msgid "Insert _Environment" msgstr "Insérer un _environnement" -#: ../geanylatex/src/geanylatex.c:2153 +#: ../geanylatex/src/geanylatex.c:2152 msgid "Helps at inserting an environment a document" msgstr "Facilite l'insertion d'un environnement au document" -#: ../geanylatex/src/geanylatex.c:2159 -#, fuzzy +#: ../geanylatex/src/geanylatex.c:2158 msgid "Insert P_ackage" msgstr "Insérer un p_ackage" -#: ../geanylatex/src/geanylatex.c:2161 +#: ../geanylatex/src/geanylatex.c:2160 msgid "A small dialog to insert \\usepackage{} into header of current file" msgstr "" "Un dialogue pour insérer \\usepackage{} dans l'en-tête du document courant" -#: ../geanylatex/src/geanylatex.c:2166 ../scope/data/scope.glade.h:58 +#: ../geanylatex/src/geanylatex.c:2165 ../scope/data/scope.glade.h:58 msgid "_Format" msgstr "_Format" #. Add font size menu -#: ../geanylatex/src/geanylatex.c:2183 +#: ../geanylatex/src/geanylatex.c:2182 msgid "F_ont size" msgstr "Taille de la p_olice" -#: ../geanylatex/src/geanylatex.c:2201 +#: ../geanylatex/src/geanylatex.c:2200 msgid "_Special Character Replacement" msgstr "Remplacement de caractères _spéciaux" -#: ../geanylatex/src/geanylatex.c:2209 +#: ../geanylatex/src/geanylatex.c:2208 +#, fuzzy msgid "Bulk _Replace Special Characters" -msgstr "" +msgstr "_Remplacement en masse de caractères spéciaux" -#: ../geanylatex/src/geanylatex.c:2211 +#: ../geanylatex/src/geanylatex.c:2210 msgid "_Replace selected special characters with TeX substitutes" msgstr "" "_Remplace les caractères spéciaux sélectionnés par des substitutions TeX" -#: ../geanylatex/src/geanylatex.c:2219 +#: ../geanylatex/src/geanylatex.c:2218 msgid "Toggle _Special Character Replacement" msgstr "Basculer le remplacement des caractères _spéciaux" -#: ../geanylatex/src/geanylatex.c:2230 +#: ../geanylatex/src/geanylatex.c:2229 msgid "Insert _Command" msgstr "Insérer une _commande" -#: ../geanylatex/src/geanylatex.c:2232 +#: ../geanylatex/src/geanylatex.c:2231 msgid "Inserting costumized command to document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2257 +#: ../geanylatex/src/geanylatex.c:2256 msgid "_BibTeX" msgstr "_BibTeX" -#: ../geanylatex/src/geanylatex.c:2265 +#: ../geanylatex/src/geanylatex.c:2264 msgid "Insert B_ibTeX reference" msgstr "Insérer une référence B_ibTeX" -#: ../geanylatex/src/geanylatex.c:2267 +#: ../geanylatex/src/geanylatex.c:2266 msgid "Helps to insert a reference out of BibTeX files" msgstr "" -#: ../geanylatex/src/geanylatex.c:2272 +#: ../geanylatex/src/geanylatex.c:2271 msgid "_BibTeX entries" msgstr "Entrées _BibTeX" @@ -2485,16 +2513,16 @@ msgid "Creating dummy text with Geany" msgstr "Créer de faux-textes avec Geany" -#: ../geanylipsum/src/geanylipsum.c:86 +#: ../geanylipsum/src/geanylipsum.c:89 msgid "Lipsum-Generator" msgstr "Générateur de faux-texte" -#: ../geanylipsum/src/geanylipsum.c:87 +#: ../geanylipsum/src/geanylipsum.c:90 msgid "Enter the length of Lipsum text here" msgstr "Entrez la longueur du faux-texte ici" #. Building menu entry -#: ../geanylipsum/src/geanylipsum.c:163 +#: ../geanylipsum/src/geanylipsum.c:164 msgid "_Lipsum" msgstr "_Lipsum" @@ -2513,8 +2541,8 @@ "Error in module \"%s\" at function %s():\n" " expected type \"%s\" for argument #%d\n" msgstr "" -"Erreur dans le module \"%s\" à la fonction %s():\n" -"attendait le type \"%s\" pour l'argument #%d\n" +"Erreur dans le module \"%s\" à la fonction %s() :\n" +"le type \"%s\" &tait attendu pour l'argument n° %d\n" #: ../geanylua/glspi.h:114 #, c-format @@ -2522,20 +2550,19 @@ "Error in module \"%s\" at function %s():\n" " expected type \"%s\" or \"%s\" for argument #%d\n" msgstr "" -"Erreur dans le module \"%s\" à la fonction %s():\n" -"attendait les types \"%s\" ou \"%s\" pour l'argument #%d\n" +"Erreur dans le module \"%s\" à la fonction %s() :\n" +"les types \"%s\" ou \"%s\" étaient attendus pour l'argument n° %d\n" #: ../geanylua/glspi.h:128 ../geanylua/gsdlg_lua.c:108 -#, fuzzy, c-format +#, c-format msgid "" "Error in module \"%s\" at function %s():\n" " invalid table in argument #%d:\n" " expected type \"%s\" for element #%d\n" msgstr "" "Erreur dans le module \"%s\" à la fonction %s() :\n" -"table invalide pour l'argument #%d:\n" -"attendait le type \"%s\" pour l'élément #%d\n" -" " +"tableau invalide pour l'argument n° %d :\n" +"le type \"%s\" était attendu pour l'élément n° %d\n" #. #. * glspi_ver.c - This file is part of the Lua scripting plugin for the Geany IDE @@ -2633,19 +2660,19 @@ msgid "Browse..." msgstr "Parcourir…" -#: ../geanylua/gsdlg.c:175 +#: ../geanylua/gsdlg.c:176 msgid "Select Color" msgstr "Sélectionner une couleur" -#: ../geanylua/gsdlg.c:205 +#: ../geanylua/gsdlg.c:207 msgid "Choose..." msgstr "Choisir…" -#: ../geanylua/gsdlg.c:226 +#: ../geanylua/gsdlg.c:228 msgid "Select Font" msgstr "Sélectionner une police" -#: ../geanylua/gsdlg.c:253 +#: ../geanylua/gsdlg.c:255 msgid "Select..." msgstr "Sélectionner…" @@ -2655,8 +2682,8 @@ "Error in module \"%s\" at function navigate():\n" "unknown navigation mode \"%s\" for argument #1.\n" msgstr "" -"Erreur dans le module \"%s\" à la fonction navigate():\n" -"mode de navigation \"%s\" inconnu pour l'argument #1.\n" +"Erreur dans le module \"%s\" à la fonction navigate() :\n" +"mode de navigation \"%s\" inconnu pour l'argument n° 1.\n" #: ../geanylua/glspi_sci.c:603 #, c-format @@ -2664,7 +2691,7 @@ "Error in module \"%s\" at function %s():\n" "API command \"%s\" not implemented.\n" msgstr "" -"Erreur dans le module \"%s\" à la fonction %s():\n" +"Erreur dans le module \"%s\" à la fonction %s() :\n" "la commande \"%s\" de l'API n'est pas implémentée.\n" #: ../geanylua/glspi_sci.c:614 @@ -2673,29 +2700,28 @@ "Error in module \"%s\" at function %s():\n" "not enough arguments for command \"%s\".\n" msgstr "" -"Erreur dans le module \"%s\" à la fonction %s():\n" +"Erreur dans le module \"%s\" à la fonction %s() :\n" "pas assez d'arguments pour la commande \"%s\".\n" -#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:398 +#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:396 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" "unknown command \"%s\" given for argument #1.\n" msgstr "" -"Erreur dans le module \"%s\" à la fonction %s():\n" -"commande \"%s\" donnée pour l'argument #1 inconnue.\n" +"Erreur dans le module \"%s\" à la fonction %s() :\n" +"commande \"%s\" donnée pour l'argument n° 1 inconnue.\n" #: ../geanylua/glspi_sci.c:794 -#, fuzzy, c-format +#, c-format msgid "" "Error in module \"%s\" at function %s():\n" " invalid table in argument #%d:\n" " unknown flag \"%s\" for element #%d\n" msgstr "" -"Erreur dans le module \"%s\" à la fonction %s():\n" -" table invalide dans l'argument #%d:\n" -" flag \"%s\" inconnu pour l'élément #%d\n" -" " +"Erreur dans le module \"%s\" à la fonction %s() :\n" +" tableau invalide pour l'argument n° %d :\n" +" drapeau \"%s\" inconnu pour l'élément n° %d\n" #: ../geanylua/glspi_sci.c:798 msgid "" @@ -2717,24 +2743,23 @@ msgid "Save file" msgstr "Enregistrer" -#: ../geanylua/glspi_dlg.c:436 -#, fuzzy, c-format +#: ../geanylua/glspi_dlg.c:438 +#, c-format msgid "" "Error in module \"%s\" at function pickfile():\n" "failed to parse filter string at argument #3.\n" msgstr "" -"Erreur dans le module \"%s\" à la fonction pickfile():\n" -"impossible d'analyser la chaîne filtre en argument #2.\n" +"Erreur dans le module \"%s\" à la fonction pickfile() :\n" +"impossible d'analyser la chaîne filtre en argument n° 3.\n" -#: ../geanylua/glspi_dlg.c:486 -#, fuzzy, c-format +#: ../geanylua/glspi_dlg.c:489 +#, c-format msgid "" "Error in module \"%s\" at function %s():\n" "expected string \"open\" or \"save\" for argument #1.\n" msgstr "" -"Erreur dans le module \"%s\" à la fonction %s():\n" -"attendait la chaîne \"open\" ou \"save\" pour l'argument #1.\n" -" " +"Erreur dans le module \"%s\" à la fonction %s() :\n" +"la chaîne \"open\" ou \"save\" était attendue pour l'argument n° 1.\n" #: ../geanylua/geanylua.c:163 #, fuzzy, c-format @@ -2770,34 +2795,30 @@ "Impossible de charger le plugin %s.\n" "Veuillez vérifier votre installation." -#: ../geanylua/glspi_app.c:19 -#, fuzzy, c-format +#: ../geanylua/glspi_app.c:21 +#, c-format msgid "" "%s %s: %s\n" "Copyright (c) 2007-2010 " msgstr "" -"%s %s: %s\n" -"Copyright (c) 2007-2008 " -#: ../geanylua/glspi_app.c:149 -#, fuzzy, c-format +#: ../geanylua/glspi_app.c:151 +#, c-format msgid "" "Error in module \"%s\" at function %s():\n" "widget \"%s\" not found for argument #1.\n" msgstr "" -"Erreur dans le module \"%s\" à la fonction %s():\n" -"le widget \"%s\" est introuvable pour l'argument #1.\n" -" " +"Erreur dans le module \"%s\" à la fonction %s() :\n" +"le widget \"%s\" est introuvable pour l'argument n° 1.\n" -#: ../geanylua/glspi_app.c:158 -#, fuzzy, c-format +#: ../geanylua/glspi_app.c:160 +#, c-format msgid "" "Error in module \"%s\" at function %s() argument #2:\n" "widget \"%s\" has no signal named \"%s\".\n" msgstr "" -"Erreur dans le module \"%s\" à la fonction %s() argument #2:\n" +"Erreur dans le module \"%s\" à l'argument n° 2 de la fonction %s() :\n" "le widget \"%s\" n'a pas de signal nommé \"%s\".\n" -" " #: ../geanymacro/src/geanymacro.c:55 msgid "Cut to Clipboard" @@ -3423,7 +3444,7 @@ msgid "Search for contents of clipboard" msgstr "Rechercher le contenu du presse-papier" -#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:92 +#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:101 msgid "Search for:" msgstr "Rechercher :" @@ -3529,19 +3550,19 @@ msgstr "Modifi_er les macros" #. *< \brief It's the information message about geany mini script -#: ../geanyminiscript/src/gms_gui.c:130 +#: ../geanyminiscript/src/gms_gui.c:129 #, fuzzy msgid "" "GMS : Geany Mini-Script filter Plugin\n" -"This plugin is a tool to apply a script filter on :\n" +"This plugin is a tool to apply a script filter on:\n" " o the text selection,\n" " o the current document,\n" " o all documents of the current session.\n" "\n" -"The filter type can be : \n" -" o Unix shell script, \n" -" o perl script, \n" -" o python script, \n" +"The filter type can be:\n" +" o Unix shell script,\n" +" o perl script,\n" +" o python script,\n" " o sed commands,\n" " o awk script.\n" "\n" @@ -3556,7 +3577,7 @@ "or (at your option) any later version." msgstr "" "GMS : Geany Mini-Script filter Plugin\n" -"Ce plugin est un outils pour appliquer un script sur:\n" +"Ce plugin est un outil pour appliquer un script sur :\n" " o la sélection de texte,\n" " o le document courant,\n" " o tous les documents de la session courante.\n" @@ -3578,81 +3599,80 @@ "Software Foundation; either version 2 of the License,\n" "or (at your option) any later version." -#: ../geanyminiscript/src/gms_gui.c:254 +#: ../geanyminiscript/src/gms_gui.c:253 msgid "Load Mini-Script File" msgstr "Chargement du mini-script" -#: ../geanyminiscript/src/gms_gui.c:311 +#: ../geanyminiscript/src/gms_gui.c:310 msgid "Save Mini-Script File" msgstr "Sauvegarde du Mini-script" -#: ../geanyminiscript/src/gms_gui.c:420 +#: ../geanyminiscript/src/gms_gui.c:419 msgid "Mini-Script Filter" msgstr "Filtre Mini-Script" -#: ../geanyminiscript/src/gms_gui.c:448 +#: ../geanyminiscript/src/gms_gui.c:445 msgid "Clear the mini-script window" msgstr "Efface la fenêtre du mini-script" -#: ../geanyminiscript/src/gms_gui.c:453 +#: ../geanyminiscript/src/gms_gui.c:450 msgid "Load a mini-script into this window" msgstr "Charge un fichier mini-script dans la fenêtre" -#: ../geanyminiscript/src/gms_gui.c:458 +#: ../geanyminiscript/src/gms_gui.c:455 msgid "Save the mini-script into a file" msgstr "Sauve le mini-script courant dans un fichier" -#: ../geanyminiscript/src/gms_gui.c:463 -#, fuzzy +#: ../geanyminiscript/src/gms_gui.c:460 msgid "Display a information about the mini-script plugin" -msgstr "Affiche des informations supplémentaires sur l'élément sélectionné" +msgstr "Affiche des informations sur le plugin mini-script" -#: ../geanyminiscript/src/gms_gui.c:471 +#: ../geanyminiscript/src/gms_gui.c:468 msgid "select the mini-script type" msgstr "Sélectionne le type du mini-script" #. Hbox : Radio bouttons for choosing the input: #. * selection/current document/all documents of the current session -#: ../geanyminiscript/src/gms_gui.c:502 +#: ../geanyminiscript/src/gms_gui.c:499 msgid "filter input" msgstr "Entrée du filtre" -#: ../geanyminiscript/src/gms_gui.c:504 +#: ../geanyminiscript/src/gms_gui.c:501 msgid "select the input of mini-script filter" msgstr "Sélectionne l'entrée du mini-script" -#: ../geanyminiscript/src/gms_gui.c:510 +#: ../geanyminiscript/src/gms_gui.c:507 msgid "selection" msgstr "sélection" -#: ../geanyminiscript/src/gms_gui.c:511 +#: ../geanyminiscript/src/gms_gui.c:508 msgid "document" msgstr "document" -#: ../geanyminiscript/src/gms_gui.c:512 +#: ../geanyminiscript/src/gms_gui.c:509 msgid "session" msgstr "session" #. Hbox : Radio bouttons for choosing the output: #. * current document/ or new document -#: ../geanyminiscript/src/gms_gui.c:521 +#: ../geanyminiscript/src/gms_gui.c:518 msgid "filter output" msgstr "sortie du filtre" -#: ../geanyminiscript/src/gms_gui.c:523 +#: ../geanyminiscript/src/gms_gui.c:520 msgid "select the output of mini-script filter" msgstr "Sélectionne la sortie du mini-script" -#: ../geanyminiscript/src/gms_gui.c:529 +#: ../geanyminiscript/src/gms_gui.c:526 msgid "Current Doc." msgstr "Doc. courant" -#: ../geanyminiscript/src/gms_gui.c:530 +#: ../geanyminiscript/src/gms_gui.c:527 #, fuzzy msgid "New Doc." msgstr "Nouveau Document" -#: ../geanyminiscript/src/gms_gui.c:751 +#: ../geanyminiscript/src/gms_gui.c:748 msgid "script configuration" msgstr "" @@ -3716,20 +3736,23 @@ msgstr "" #: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1232 +#, fuzzy msgid "Move to start of line" -msgstr "" +msgstr "Se déplacer au début de la ligne" #: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1233 msgid "Move to remembered position in line" msgstr "Aller à la position enregistrée sur la ligne" #: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1234 +#, fuzzy msgid "Move to position in current line" -msgstr "" +msgstr "Se déplacer à la position dans la ligne courante" #: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1235 +#, fuzzy msgid "Move to End of line" -msgstr "" +msgstr "Se déplace à la fin de la ligne" #: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1241 msgid "Save file settings with program settings" @@ -3864,36 +3887,36 @@ msgstr "Sélectionner le signataire" #. shouldn't get here -#: ../geanypg/src/pinentry.c:107 +#: ../geanypg/src/pinentry.c:111 msgid "Could not use pinentry." msgstr "Impossible d'utiliser Pinentry." -#: ../geanypg/src/pinentry.c:119 +#: ../geanypg/src/pinentry.c:123 msgid "Unexpected output from pinentry." msgstr "Sortie imprévue de pinentry." #. read the rest of the first line after OK -#: ../geanypg/src/pinentry.c:127 +#: ../geanypg/src/pinentry.c:131 msgid "Passphrase entry" msgstr "" -#: ../geanypg/src/pinentry.c:131 +#: ../geanypg/src/pinentry.c:135 msgid "Passphrase" msgstr "Mot de passe" -#: ../geanypg/src/pinentry.c:136 +#: ../geanypg/src/pinentry.c:140 msgid "Enter passphrase for" msgstr "Entrez la phrase de passe pour" -#: ../geanypg/src/pinentry.c:167 +#: ../geanypg/src/pinentry.c:171 msgid "pinentry gave error" msgstr "pinentry a retourné l'erreur" -#: ../geanypg/src/pinentry.c:170 +#: ../geanypg/src/pinentry.c:174 msgid "Unexpected error from pinentry." msgstr "Erreur de pinentry imprévue." -#: ../geanypg/src/pinentry.c:195 +#: ../geanypg/src/pinentry.c:199 msgid "" "Error, Passphrase input without using gpg-agent is not supported on Windows " "yet." @@ -3905,8 +3928,8 @@ msgid "a key with fingerprint" msgstr "une clé avec emprunte" -#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:522 -#: ../spellcheck/src/gui.c:533 +#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:527 +#: ../spellcheck/src/gui.c:538 msgid "unknown" msgstr "inconnue" @@ -4021,8 +4044,9 @@ msgstr "Inconnu" #: ../geanypg/src/verify_aux.c:137 ../geanypg/src/verify_aux.c:155 +#, fuzzy msgid "n/a" -msgstr "" +msgstr "n/d" #: ../geanypg/src/verify_aux.c:137 ../geanypg/src/verify_aux.c:155 msgid "bad" @@ -4074,7 +4098,7 @@ msgstr "Ouvrir un fichier de signature" #: ../geanyprj/src/geanyprj.c:38 ../geanyprj/src/sidebar.c:456 -#: ../gproject/src/gproject-sidebar.c:822 +#: ../gproject/src/gproject-sidebar.c:870 msgid "Project" msgstr "Projet" @@ -4103,7 +4127,7 @@ msgid "C_reate" msgstr "C_réer" -#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:116 +#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:114 msgid "Name:" msgstr "Nom :" @@ -4181,7 +4205,7 @@ msgid "Remove File" msgstr "Supprimer le fichier" -#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:803 +#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:849 msgid "H_ide Sidebar" msgstr "Cac_her la barre latérale" @@ -4190,6 +4214,55 @@ msgid "Project \"%s\" opened." msgstr "Projet « %s » ouvert." +#: ../geanypy/src/geanypy-plugin.c:34 +#, fuzzy +msgid "GeanyPy" +msgstr "GeanyVC" + +#: ../geanypy/src/geanypy-plugin.c:35 +msgid "Python plugins support" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:77 +#, c-format +msgid "Unable to pre-load Python library: %s." +msgstr "Impossible de pré-charger la bibliothèque Python : %s" + +#: ../geanypy/src/geanypy-plugin.c:157 +#, fuzzy +msgid "Failed to import manager module" +msgstr "Impossible d'importer le module \"manager\"" + +#: ../geanypy/src/geanypy-plugin.c:166 +#, fuzzy +msgid "Failed to retrieve PluginManager from manager module" +msgstr "Impossible d'obtenir le PluginManager du module \"manager\"" + +#: ../geanypy/src/geanypy-plugin.c:182 +msgid "System plugin directory not found." +msgstr "Dossier de plugins système introuvable." + +#: ../geanypy/src/geanypy-plugin.c:211 +#, fuzzy +msgid "Unable to instantiate new PluginManager" +msgstr "Impossible d'instancier un nouveau PluginManager" + +#: ../geanypy/src/geanypy-plugin.c:227 +#, fuzzy +msgid "Unable to get show_all() method on plugin manager" +msgstr "" +"Impossible d'obtenir la méthode show_all() sur le gestionnaire de " +"plugins" + +#: ../geanypy/src/geanypy-plugin.c:255 +#, c-format +msgid "Unable to create Python plugins directory: %s: %s" +msgstr "Impossible de créer le dossier des plugins Python : %s : %s" + +#: ../geanypy/src/geanypy-plugin.c:266 +msgid "Python Plugin Manager" +msgstr "Gestionnaire de plugins Python" + #: ../geanysendmail/src/geanysendmail.c:43 msgid "GeanySendMail" msgstr "GeanySendMail" @@ -4210,13 +4283,13 @@ msgid "Enter the recipient's e-mail address:" msgstr "Entrez l'adresse email du destinataire :" -#: ../geanysendmail/src/geanysendmail.c:136 +#: ../geanysendmail/src/geanysendmail.c:138 msgid "Filename placeholder not found. The executed command might have failed." msgstr "" "Le remplacement du nom de fichier n'a pas été trouvé. La commande exécutée a " "peut-être échouée." -#: ../geanysendmail/src/geanysendmail.c:142 +#: ../geanysendmail/src/geanysendmail.c:144 msgid "" "Recipient address placeholder not found. The executed command might have " "failed." @@ -4224,33 +4297,33 @@ "Le remplacement de l'adresse du destinataire n'a pas été trouvé. La commande " "exécutée a peut-être échouée." -#: ../geanysendmail/src/geanysendmail.c:157 +#: ../geanysendmail/src/geanysendmail.c:159 msgid "Could not execute mailer. Please check your configuration." msgstr "" "Impossible d'exécuter le client mail, veuillez vérifier votre configuration." -#: ../geanysendmail/src/geanysendmail.c:166 +#: ../geanysendmail/src/geanysendmail.c:168 msgid "Please define a mail client first." msgstr "Veuillez d'abord définir un client e-mail." -#: ../geanysendmail/src/geanysendmail.c:171 +#: ../geanysendmail/src/geanysendmail.c:173 msgid "File has to be saved before sending." msgstr "Le fichier doit d'abord être enregistré avant de l'envoyer." -#: ../geanysendmail/src/geanysendmail.c:187 +#: ../geanysendmail/src/geanysendmail.c:191 msgid "Mail" msgstr "E-Mail" -#: ../geanysendmail/src/geanysendmail.c:218 +#: ../geanysendmail/src/geanysendmail.c:222 msgid "Send by mail" msgstr "Envoyer par email" #. add a label and a text entry to the dialog -#: ../geanysendmail/src/geanysendmail.c:308 +#: ../geanysendmail/src/geanysendmail.c:312 msgid "Path and options for the mail client:" msgstr "Chemin et options du client mail :" -#: ../geanysendmail/src/geanysendmail.c:316 +#: ../geanysendmail/src/geanysendmail.c:320 msgid "" "Note: \n" "\t%f will be replaced by your file.\n" @@ -4268,28 +4341,28 @@ "\tsylpheed --attach \"%f\" --compose \"%r\"\n" "\tmutt -s \"Sending '%b'\" -a \"%f\" \"%r\"" -#: ../geanysendmail/src/geanysendmail.c:326 +#: ../geanysendmail/src/geanysendmail.c:330 msgid "Show toolbar icon" msgstr "Afficher l'icône dans la barre d'outils" -#: ../geanysendmail/src/geanysendmail.c:328 +#: ../geanysendmail/src/geanysendmail.c:332 msgid "Shows a icon in the toolbar to send file more easy." msgstr "Affiche une icône dans la barre d'outils pour faciliter du fichier." -#: ../geanysendmail/src/geanysendmail.c:334 +#: ../geanysendmail/src/geanysendmail.c:338 msgid "Use dialog for entering email address of recipients" msgstr "Utilisez le dialogue pour entrer les adresses e-mail des destinataires" -#: ../geanysendmail/src/geanysendmail.c:356 +#: ../geanysendmail/src/geanysendmail.c:360 msgid "Send file by mail" msgstr "Envoyer le fichier par e-mail" #. Build up menu entry -#: ../geanysendmail/src/geanysendmail.c:379 +#: ../geanysendmail/src/geanysendmail.c:383 msgid "_Mail document" msgstr "Envoyer par _mail" -#: ../geanysendmail/src/geanysendmail.c:382 +#: ../geanysendmail/src/geanysendmail.c:386 msgid "" "Sends the opened file as unzipped attachment by any mailer from your $PATH" msgstr "" @@ -4309,77 +4382,103 @@ msgid "geanyvc: s_spawn_sync error: %s" msgstr "geanyvc : erreur de s_spawn_sync : %s" -#: ../geanyvc/src/geanyvc.c:609 ../geanyvc/src/geanyvc.c:620 +#: ../geanyvc/src/geanyvc.c:561 +#, c-format +msgid "File %s: action %s executed via %s." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:614 ../geanyvc/src/geanyvc.c:625 #, c-format msgid "geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'" msgstr "" "geanyvc : vcdiff_file_activated : Impossible de renommer « %s » en « %s »" -#: ../geanyvc/src/geanyvc.c:646 ../geanyvc/src/geanyvc.c:696 +#: ../geanyvc/src/geanyvc.c:651 ../geanyvc/src/geanyvc.c:701 msgid "No changes were made." msgstr "Aucune modification n'a été effectuée." -#: ../geanyvc/src/geanyvc.c:723 +#: ../geanyvc/src/geanyvc.c:728 msgid "No history available" msgstr "Pas d'historique disponible" -#: ../geanyvc/src/geanyvc.c:916 ../geanyvc/src/geanyvc.c:924 +#: ../geanyvc/src/geanyvc.c:921 ../geanyvc/src/geanyvc.c:929 #, c-format msgid "Do you really want to revert: %s?" msgstr "Voulez-vous vraiment rétablir : %s ?" -#: ../geanyvc/src/geanyvc.c:932 +#: ../geanyvc/src/geanyvc.c:937 #, c-format msgid "Do you really want to add: %s?" msgstr "Voulez-vous vraiment ajouter : %s ?" -#: ../geanyvc/src/geanyvc.c:939 +#: ../geanyvc/src/geanyvc.c:944 #, c-format msgid "Do you really want to remove: %s?" msgstr "Voulez-vous vraiment supprimer : %s ?" -#: ../geanyvc/src/geanyvc.c:962 +#: ../geanyvc/src/geanyvc.c:967 msgid "Do you really want to update?" msgstr "Voulez-vous vraiment mettre à jour ?" -#: ../geanyvc/src/geanyvc.c:1225 +#: ../geanyvc/src/geanyvc.c:1094 +msgid "" +"The resulting differences cannot be displayed because the changes are too " +"big to display here and would slow down the UI significantly.\n" +"\n" +"To view the differences, cancel this dialog and open the differences in " +"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)." +msgstr "" +"Les différences résultantes ne peuvent être affichées car les " +"changements sont trop importants et ralentiraient significativement " +"l'interface.\n" +"\n" +"Pour afficher les différences, fermez ce dialogue et ouvrez le diff " +"directement dans Geany en utilisant le menu GeanyVC (Dossier racine " +"-> Diff)." + +#: ../geanyvc/src/geanyvc.c:1243 msgid "Commit Y/N" msgstr "Commiter (O/N)" -#: ../geanyvc/src/geanyvc.c:1235 +#: ../geanyvc/src/geanyvc.c:1253 msgid "Status" msgstr "Statut" -#: ../geanyvc/src/geanyvc.c:1242 +#: ../geanyvc/src/geanyvc.c:1260 msgid "Path" msgstr "Chemin" -#: ../geanyvc/src/geanyvc.c:1330 +#: ../geanyvc/src/geanyvc.c:1324 +#, c-format +msgid "Line: %d Column: %d" +msgstr "Ligne : %d Colonne : %d" + +#: ../geanyvc/src/geanyvc.c:1370 msgid "Commit" msgstr "Commit" -#: ../geanyvc/src/geanyvc.c:1372 +#: ../geanyvc/src/geanyvc.c:1412 msgid "_De-/select all files" msgstr "Sélectionner/_désélectionner tous les fichiers" -#: ../geanyvc/src/geanyvc.c:1413 +#: ../geanyvc/src/geanyvc.c:1456 msgid "Commit message:" msgstr "Message de commit :" -#: ../geanyvc/src/geanyvc.c:1426 +#: ../geanyvc/src/geanyvc.c:1475 msgid "C_ommit" msgstr "C_ommit" -#: ../geanyvc/src/geanyvc.c:1500 +#: ../geanyvc/src/geanyvc.c:1556 msgid "Nothing to commit." msgstr "Rien à commiter." -#: ../geanyvc/src/geanyvc.c:1546 +#: ../geanyvc/src/geanyvc.c:1602 #, c-format msgid "Error initializing spell checking: %s" msgstr "Erreur lors de l'initialisation de la vérification orthographique : %s" -#: ../geanyvc/src/geanyvc.c:1558 +#: ../geanyvc/src/geanyvc.c:1614 #, c-format msgid "" "Error while setting up language for spellchecking. Please check " @@ -4389,11 +4488,11 @@ "orthographique. Veuillez vérifier la configuration. Le message d'erreur " "était : %s" -#: ../geanyvc/src/geanyvc.c:1834 +#: ../geanyvc/src/geanyvc.c:1890 msgid "Set Changed-flag for document tabs created by the plugin" msgstr "Marquer les documents créés par le plugin comme modifiés" -#: ../geanyvc/src/geanyvc.c:1837 +#: ../geanyvc/src/geanyvc.c:1893 msgid "" "If this option is activated, every new by the VC-plugin created document tab " "will be marked as changed. Even this option is useful in some cases, it " @@ -4404,47 +4503,47 @@ "cas, elle peut résulter en de nombreux et ennuyeux dialogues demandant si le " "document doit être enregistré." -#: ../geanyvc/src/geanyvc.c:1845 +#: ../geanyvc/src/geanyvc.c:1901 msgid "Confirm adding new files to a VCS" msgstr "Confirmer l'ajout de nouveaux fichier au VCS" -#: ../geanyvc/src/geanyvc.c:1848 +#: ../geanyvc/src/geanyvc.c:1904 msgid "Shows a confirmation dialog on adding a new (created) file to VCS." msgstr "" "Affiche un dialogue de confirmation lors de l'ajout d'un nouveau fichier au " "VCS" -#: ../geanyvc/src/geanyvc.c:1854 +#: ../geanyvc/src/geanyvc.c:1910 msgid "Maximize commit dialog" msgstr "Maximiser le dialogue de commit" -#: ../geanyvc/src/geanyvc.c:1855 +#: ../geanyvc/src/geanyvc.c:1911 msgid "Show commit dialog maximize." msgstr "Afficher le dialogue de commit maximisé." -#: ../geanyvc/src/geanyvc.c:1861 +#: ../geanyvc/src/geanyvc.c:1917 msgid "Use external diff viewer" msgstr "Utiliser une visionneuse de diff externe" -#: ../geanyvc/src/geanyvc.c:1863 +#: ../geanyvc/src/geanyvc.c:1919 msgid "Use external diff viewer for file diff." msgstr "Utiliser une visionneuse externe pour afficher les diff de fichiers." -#: ../geanyvc/src/geanyvc.c:1869 +#: ../geanyvc/src/geanyvc.c:1925 msgid "Show VC entries at editor menu" msgstr "Montrer les commandes dans le menu de l'éditeur" -#: ../geanyvc/src/geanyvc.c:1871 +#: ../geanyvc/src/geanyvc.c:1927 msgid "Show entries for VC functions inside editor menu" msgstr "" "Afficher les entrées pour les fonctionnalités du VCS dans le menu de " "l'éditeur" -#: ../geanyvc/src/geanyvc.c:1876 +#: ../geanyvc/src/geanyvc.c:1932 msgid "Attach menu to menubar" msgstr "Attacher le menu à la barre de menu" -#: ../geanyvc/src/geanyvc.c:1878 +#: ../geanyvc/src/geanyvc.c:1934 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " "directly inside Geany's menubar.Will take in account after next start of " @@ -4454,68 +4553,68 @@ "directement dans la barre de menus de Geany. Un redémarrage du plugin est " "nécessaire pour appliquer cette option." -#: ../geanyvc/src/geanyvc.c:1886 +#: ../geanyvc/src/geanyvc.c:1942 msgid "Enable CVS" msgstr "Activer CVS" -#: ../geanyvc/src/geanyvc.c:1891 +#: ../geanyvc/src/geanyvc.c:1947 msgid "Enable GIT" msgstr "Activer Git" -#: ../geanyvc/src/geanyvc.c:1896 +#: ../geanyvc/src/geanyvc.c:1952 msgid "Enable SVN" msgstr "Activer SVN" -#: ../geanyvc/src/geanyvc.c:1901 +#: ../geanyvc/src/geanyvc.c:1957 msgid "Enable SVK" msgstr "Activer SVK" -#: ../geanyvc/src/geanyvc.c:1906 +#: ../geanyvc/src/geanyvc.c:1962 msgid "Enable Bazaar" msgstr "Activer Bazaar" -#: ../geanyvc/src/geanyvc.c:1911 +#: ../geanyvc/src/geanyvc.c:1967 msgid "Enable Mercurial" msgstr "Activer Mercurial" -#: ../geanyvc/src/geanyvc.c:1917 +#: ../geanyvc/src/geanyvc.c:1973 msgid "Spellcheck language" msgstr "Langue de la vérification orthographique" -#: ../geanyvc/src/geanyvc.c:2008 +#: ../geanyvc/src/geanyvc.c:2064 msgid "_VC file Actions" msgstr "Actions du _VCS sur le fichier" #. Diff of current file #. Diff of the current dir #. Complete diff of base directory -#: ../geanyvc/src/geanyvc.c:2014 ../geanyvc/src/geanyvc.c:2091 -#: ../geanyvc/src/geanyvc.c:2131 +#: ../geanyvc/src/geanyvc.c:2070 ../geanyvc/src/geanyvc.c:2147 +#: ../geanyvc/src/geanyvc.c:2187 msgid "_Diff" msgstr "_Diff" -#: ../geanyvc/src/geanyvc.c:2017 +#: ../geanyvc/src/geanyvc.c:2073 msgid "Make a diff from the current active file" msgstr "Faire un diff depuis le fichier courant" #. Revert current file #. Revert current dir #. Revert everything -#: ../geanyvc/src/geanyvc.c:2022 ../geanyvc/src/geanyvc.c:2100 -#: ../geanyvc/src/geanyvc.c:2139 +#: ../geanyvc/src/geanyvc.c:2078 ../geanyvc/src/geanyvc.c:2156 +#: ../geanyvc/src/geanyvc.c:2195 msgid "_Revert" msgstr "_Rétablir" -#: ../geanyvc/src/geanyvc.c:2025 +#: ../geanyvc/src/geanyvc.c:2081 msgid "Restore pristine working copy file (undo local edits)." msgstr "Restaurer la copie locale originale (annule les changements locaux)." #. Blame for current file -#: ../geanyvc/src/geanyvc.c:2034 +#: ../geanyvc/src/geanyvc.c:2090 msgid "_Blame" msgstr "_Blame" -#: ../geanyvc/src/geanyvc.c:2037 +#: ../geanyvc/src/geanyvc.c:2093 msgid "Shows the changes made at one file per revision and author." msgstr "" "Affiche les changements effectués dans un fichier par révision et auteur." @@ -4523,143 +4622,143 @@ #. History/log of current file #. History/log of the current dir #. Complete History/Log of base directory -#: ../geanyvc/src/geanyvc.c:2044 ../geanyvc/src/geanyvc.c:2110 -#: ../geanyvc/src/geanyvc.c:2151 +#: ../geanyvc/src/geanyvc.c:2100 ../geanyvc/src/geanyvc.c:2166 +#: ../geanyvc/src/geanyvc.c:2207 msgid "_History (log)" msgstr "_Historique (log)" -#: ../geanyvc/src/geanyvc.c:2047 +#: ../geanyvc/src/geanyvc.c:2103 msgid "Shows the log of the current file" msgstr "Afficher l'historique du fichier courant" #. base version of the current file -#: ../geanyvc/src/geanyvc.c:2052 +#: ../geanyvc/src/geanyvc.c:2108 msgid "_Original" msgstr "_Original" -#: ../geanyvc/src/geanyvc.c:2055 +#: ../geanyvc/src/geanyvc.c:2111 msgid "Shows the original of the current file" msgstr "Affiche l'original du fichier courant" #. add current file -#: ../geanyvc/src/geanyvc.c:2063 +#: ../geanyvc/src/geanyvc.c:2119 msgid "_Add to Version Control" msgstr "_Ajouter au gestionnaire de versions" -#: ../geanyvc/src/geanyvc.c:2065 +#: ../geanyvc/src/geanyvc.c:2121 msgid "Add file to repository." msgstr "Ajouter le fichier au dépôt" #. remove current file -#: ../geanyvc/src/geanyvc.c:2071 +#: ../geanyvc/src/geanyvc.c:2127 msgid "_Remove from Version Control" msgstr "_Supprimer du gestionnaire de versions" -#: ../geanyvc/src/geanyvc.c:2073 +#: ../geanyvc/src/geanyvc.c:2129 msgid "Remove file from repository." msgstr "Supprimer le fichier du dépôt" -#: ../geanyvc/src/geanyvc.c:2088 +#: ../geanyvc/src/geanyvc.c:2144 msgid "_Directory" msgstr "_Dossier" -#: ../geanyvc/src/geanyvc.c:2094 +#: ../geanyvc/src/geanyvc.c:2150 msgid "Make a diff from the directory of the current active file" msgstr "Faire un diff depuis le dossier contenant le fichier courant" -#: ../geanyvc/src/geanyvc.c:2103 +#: ../geanyvc/src/geanyvc.c:2159 msgid "Restore original files in the current folder (undo local edits)." msgstr "" "Restaurer la copie originale des fichiers dans le dossier courant (annule " "les changements locaux)." -#: ../geanyvc/src/geanyvc.c:2113 +#: ../geanyvc/src/geanyvc.c:2169 msgid "Shows the log of the current directory" msgstr "Afficher l'historique du dossier courant" -#: ../geanyvc/src/geanyvc.c:2127 +#: ../geanyvc/src/geanyvc.c:2183 msgid "_Base Directory" msgstr "Dossier _racine" -#: ../geanyvc/src/geanyvc.c:2133 +#: ../geanyvc/src/geanyvc.c:2189 msgid "Make a diff from the top VC directory" msgstr "Faire un diff depuis le dossier racine du VCS" -#: ../geanyvc/src/geanyvc.c:2141 +#: ../geanyvc/src/geanyvc.c:2197 msgid "Revert any local edits." msgstr "Annuler les changement locaux." -#: ../geanyvc/src/geanyvc.c:2154 +#: ../geanyvc/src/geanyvc.c:2210 msgid "Shows the log of the top VC directory" msgstr "Afficher l'historique du dossier racine du VCS" -#: ../geanyvc/src/geanyvc.c:2180 +#: ../geanyvc/src/geanyvc.c:2236 msgid "VC _Commit" -msgstr "_Commit du VCS" +msgstr "Co_mmit du VCS" -#: ../geanyvc/src/geanyvc.c:2215 +#: ../geanyvc/src/geanyvc.c:2271 msgid "Show diff of file" msgstr "Afficher le diff du fichier" -#: ../geanyvc/src/geanyvc.c:2217 +#: ../geanyvc/src/geanyvc.c:2273 msgid "Show diff of directory" msgstr "Afficher le diff du dossier" -#: ../geanyvc/src/geanyvc.c:2219 +#: ../geanyvc/src/geanyvc.c:2275 msgid "Show diff of basedir" msgstr "Afficher le diff du dossier racine" -#: ../geanyvc/src/geanyvc.c:2222 +#: ../geanyvc/src/geanyvc.c:2278 msgid "Commit changes" msgstr "Commiter les changement" -#: ../geanyvc/src/geanyvc.c:2224 +#: ../geanyvc/src/geanyvc.c:2280 msgid "Show status" msgstr "Afficher le statut" -#: ../geanyvc/src/geanyvc.c:2226 +#: ../geanyvc/src/geanyvc.c:2282 msgid "Revert single file" msgstr "Rétablir un seul fichier" -#: ../geanyvc/src/geanyvc.c:2228 +#: ../geanyvc/src/geanyvc.c:2284 msgid "Revert directory" msgstr "Rétablir le dossier" -#: ../geanyvc/src/geanyvc.c:2230 +#: ../geanyvc/src/geanyvc.c:2286 msgid "Revert base directory" msgstr "Rétablir le dossier racine" -#: ../geanyvc/src/geanyvc.c:2232 +#: ../geanyvc/src/geanyvc.c:2288 msgid "Update file" msgstr "Mettre le fichier à jour" -#: ../geanyvc/src/geanyvc.c:2260 +#: ../geanyvc/src/geanyvc.c:2316 msgid "_VC" msgstr "Gestionnaire de _versions" -#: ../geanyvc/src/geanyvc.c:2266 +#: ../geanyvc/src/geanyvc.c:2322 msgid "_Version Control" msgstr "Gestionnaire de _versions" #. Status of basedir -#: ../geanyvc/src/geanyvc.c:2288 +#: ../geanyvc/src/geanyvc.c:2344 msgid "_Status" msgstr "_Statut" -#: ../geanyvc/src/geanyvc.c:2290 +#: ../geanyvc/src/geanyvc.c:2346 msgid "Show status." msgstr "Afficher le statut." -#: ../geanyvc/src/geanyvc.c:2297 +#: ../geanyvc/src/geanyvc.c:2353 msgid "Update from remote repository." msgstr "Mettre à jour depuis le dépôt distant." #. Commit all changes -#: ../geanyvc/src/geanyvc.c:2302 +#: ../geanyvc/src/geanyvc.c:2358 msgid "_Commit" msgstr "_Commit" -#: ../geanyvc/src/geanyvc.c:2304 +#: ../geanyvc/src/geanyvc.c:2360 msgid "Commit changes." msgstr "Commiter les changements." @@ -4759,7 +4858,7 @@ #: ../gproject/src/gproject-menu.c:382 msgid "Open Selected File (gproject)" -msgstr "" +msgstr "Ouvrir le fichier sélectionné (gproject)" #: ../gproject/src/gproject-project.c:406 msgid "Source patterns:" @@ -4819,80 +4918,79 @@ "Note : définissez les patterns des fichiers faisant partie du projet dans " "l'onglet Projet." -#: ../gproject/src/gproject-sidebar.c:81 -#: ../gproject/src/gproject-sidebar.c:792 +#: ../gproject/src/gproject-sidebar.c:90 +#: ../gproject/src/gproject-sidebar.c:838 msgid "Find File" msgstr "Rechercher un fichier" -#: ../gproject/src/gproject-sidebar.c:108 +#: ../gproject/src/gproject-sidebar.c:117 msgid "Search inside:" msgstr "Rechercher dans :" -#: ../gproject/src/gproject-sidebar.c:120 +#: ../gproject/src/gproject-sidebar.c:129 msgid "C_ase sensitive" msgstr "Sensible à la c_asse" -#: ../gproject/src/gproject-sidebar.c:123 +#: ../gproject/src/gproject-sidebar.c:132 msgid "Search in full path" msgstr "Rechercher dans le chemin complet" -#: ../gproject/src/gproject-sidebar.c:702 +#: ../gproject/src/gproject-sidebar.c:745 msgid "Reload all" msgstr "Tout recharger" -#: ../gproject/src/gproject-sidebar.c:711 -#: ../treebrowser/src/treebrowser.c:1282 +#: ../gproject/src/gproject-sidebar.c:754 +#: ../treebrowser/src/treebrowser.c:1281 msgid "Expand all" msgstr "Tout étendre" -#: ../gproject/src/gproject-sidebar.c:717 -#: ../treebrowser/src/treebrowser.c:1286 +#: ../gproject/src/gproject-sidebar.c:761 +#: ../treebrowser/src/treebrowser.c:1285 msgid "Collapse all" msgstr "Tout replier" -#: ../gproject/src/gproject-sidebar.c:726 +#: ../gproject/src/gproject-sidebar.c:771 msgid "Follow active editor" msgstr "Suivre l'éditeur actif" -#: ../gproject/src/gproject-sidebar.c:774 +#: ../gproject/src/gproject-sidebar.c:820 msgid "Expand All" msgstr "Tout déplier" -#: ../gproject/src/gproject-sidebar.c:783 -#: ../treebrowser/src/treebrowser.c:1234 +#: ../gproject/src/gproject-sidebar.c:829 msgid "Find in Files" msgstr "Rechercher dans les fichiers" #. POSITION OF VIEW -#: ../markdown/src/conf.c:572 +#: ../markdown/src/conf.c:567 msgid "Position:" msgstr "Position :" -#: ../markdown/src/conf.c:578 +#: ../markdown/src/conf.c:573 msgid "Sidebar" msgstr "Barre latérale" -#: ../markdown/src/conf.c:586 +#: ../markdown/src/conf.c:581 msgid "Message Window" msgstr "Fenêtre de messages" -#: ../markdown/src/conf.c:600 +#: ../markdown/src/conf.c:595 msgid "Font:" msgstr "Police :" -#: ../markdown/src/conf.c:618 +#: ../markdown/src/conf.c:612 msgid "Code Font:" msgstr "Police du code :" -#: ../markdown/src/conf.c:636 +#: ../markdown/src/conf.c:629 msgid "BG Color:" msgstr "Couleur d'avant-plan :" -#: ../markdown/src/conf.c:653 +#: ../markdown/src/conf.c:645 msgid "FG Color:" msgstr "Couleur d'arrière-plan :" -#: ../markdown/src/conf.c:672 +#: ../markdown/src/conf.c:663 msgid "Select Template File" msgstr "Sélectionner un modèle" @@ -4908,6 +5006,166 @@ msgid "The current document does not have a Markdown filetype." msgstr "Le type du fichier courant n'est pas définit à Markdown." +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:35 +msgid "Pair Tag Highlighter" +msgstr "" + +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:36 +#, fuzzy +msgid "Finds and highlights matching opening/closing HTML tag" +msgstr "" +"Trouve et met en évidence les balises HTML ouvrantes ou fermantes " +"correspondantes" + +#: ../pohelper/data/menus.ui.h:1 +msgid "_Translation Helper" +msgstr "Assistant de _traduction" + +#: ../pohelper/data/menus.ui.h:2 +msgid "_Previous String" +msgstr "Chaîne _précédente" + +#: ../pohelper/data/menus.ui.h:3 ../pohelper/src/gph-plugin.c:1031 +msgid "Go to previous string" +msgstr "Aller à la chaîne précédente" + +#: ../pohelper/data/menus.ui.h:4 +msgid "_Next String" +msgstr "Chaîne suiva_nte" + +#: ../pohelper/data/menus.ui.h:5 ../pohelper/src/gph-plugin.c:1034 +msgid "Go to next string" +msgstr "Aller à la chaîne suivante" + +#: ../pohelper/data/menus.ui.h:6 +msgid "Pre_vious Untranslated" +msgstr "Non-traduite pr_écédente" + +#: ../pohelper/data/menus.ui.h:7 ../pohelper/src/gph-plugin.c:1037 +msgid "Go to previous untranslated string" +msgstr "Aller à la chaîne non-traduite précédente" + +#: ../pohelper/data/menus.ui.h:8 +msgid "Next _Untranslated" +msgstr "Non-traduite s_uivante" + +#: ../pohelper/data/menus.ui.h:9 ../pohelper/src/gph-plugin.c:1040 +msgid "Go to next untranslated string" +msgstr "Aller à la chaîne non-traduite suivante" + +#: ../pohelper/data/menus.ui.h:10 +msgid "Previous Fu_zzy" +msgstr "Appro_ximative précédente" + +#: ../pohelper/data/menus.ui.h:11 ../pohelper/src/gph-plugin.c:1043 +msgid "Go to previous fuzzily translated string" +msgstr "Aller à la chaîne traduite approximativement précédente" + +#: ../pohelper/data/menus.ui.h:12 +msgid "Next _Fuzzy" +msgstr "Approximati_ve suivante" + +#: ../pohelper/data/menus.ui.h:13 ../pohelper/src/gph-plugin.c:1046 +msgid "Go to next fuzzily translated string" +msgstr "Aller la chaîne traduite approximativement suivante" + +#: ../pohelper/data/menus.ui.h:14 +msgid "Previous Untranslated or Fuzz_y" +msgstr "Non-traduite ou _approximative précédente" + +#: ../pohelper/data/menus.ui.h:15 ../pohelper/src/gph-plugin.c:1049 +msgid "Go to previous untranslated or fuzzy string" +msgstr "Aller la chaîne non-traduite ou approximative précédente" + +#: ../pohelper/data/menus.ui.h:16 +msgid "Next Untranslated _or Fuzzy" +msgstr "Non-traduite ou approximative _suivante" + +#: ../pohelper/data/menus.ui.h:17 ../pohelper/src/gph-plugin.c:1053 +msgid "Go to next untranslated or fuzzy string" +msgstr "Aller la chaîne non-traduite ou approximative suivante" + +#: ../pohelper/data/menus.ui.h:18 ../pohelper/src/gph-plugin.c:1064 +msgid "Toggle current translation fuzziness" +msgstr "Basculer l'état approximatif de la chaîne courante" + +#: ../pohelper/data/menus.ui.h:19 +msgid "_Toggle Fuzziness" +msgstr "Basculer l'état approxima_tif" + +#: ../pohelper/data/menus.ui.h:20 +msgid "Paste _Message as Translation" +msgstr "Copier le _message dans la traduction" + +#: ../pohelper/data/menus.ui.h:21 +msgid "Paste the original untranslated string to the translation" +msgstr "Copier la chaîne non-traduite originale dans la traduction" + +#: ../pohelper/data/menus.ui.h:22 ../pohelper/src/gph-plugin.c:1061 +msgid "Reflow the current translation string" +msgstr "Reformater la chaîne de traduction courante" + +#: ../pohelper/data/menus.ui.h:23 +msgid "_Reflow Translation" +msgstr "_Reformatter la traduction" + +#: ../pohelper/data/menus.ui.h:24 +msgid "" +"Whether to update the translation headers (author, revision date, ...) upon " +"file save" +msgstr "" +"Active ou désactive la mise-à-jour des en-têtes de traduction " +"(auteur, date de révision, etc.) lors de l'enregistrement du fichier" + +#: ../pohelper/data/menus.ui.h:25 +msgid "Update _Headers Upon Save" +msgstr "Mettre à _jour les en-têtes lors de l'enregistrement" + +#: ../pohelper/src/gph-plugin.c:41 +msgid "Translation Helper" +msgstr "Assistant de traduction" + +#: ../pohelper/src/gph-plugin.c:42 +msgid "Improves support for GetText translation files." +msgstr "Améliore la gestion des fichiers de traduction GetText." + +#: ../pohelper/src/gph-plugin.c:1057 +msgid "Paste original untranslated string to translation" +msgstr "Copier la chaîne non-traduite originale dans la traduction" + +#: ../pohelper/src/gph-plugin.c:1099 +#, c-format +msgid "Failed to load configuration file: %s" +msgstr "Impossible de charger le fichier de configuration : %s" + +#: ../pohelper/src/gph-plugin.c:1124 +#, c-format +msgid "Failed to create configuration directory \"%s\": %s" +msgstr "Impossible de créer le dossier de configuration « %s » : %s" + +#: ../pohelper/src/gph-plugin.c:1127 +#, c-format +msgid "Failed to save configuration file: %s" +msgstr "Impossible d'enregistrer le fichier de configuration : %s" + +#: ../pohelper/src/gph-plugin.c:1182 +#, c-format +msgid "" +"Failed to load UI definition, please check your installation. The error was: " +"%s" +msgstr "" +"Impossible de charger la définition d'interface, veuillez vérifier " +"votre installation. L'erreur était : %s" + +#: ../pohelper/src/gph-plugin.c:1222 +#, c-format +msgid "" +"Cannot find widget \"%s\" in the UI definition, please check your " +"installation." +msgstr "" +"Impossible de trouver le widget « %s » dans la définition d'interface," +" veuillez vérifier votre installation." + #: ../pretty-printer/src/PluginEntry.c:37 msgid "XML PrettyPrinter" msgstr "" @@ -4994,7 +5252,7 @@ #: ../scope/data/scope.glade.h:1 msgid "Debu_g" -msgstr "" +msgstr "Débo_guer" #: ../scope/data/scope.glade.h:2 msgid "_Setup Program" @@ -5002,22 +5260,22 @@ #: ../scope/data/scope.glade.h:3 msgid "Recent _Programs" -msgstr "" +msgstr "_Programmes récents" #: ../scope/data/scope.glade.h:4 #, fuzzy msgid "_Run/Continue" -msgstr "Exécuter / continuer" +msgstr "Exécute_r / continuer" #: ../scope/data/scope.glade.h:5 #, fuzzy msgid "Run to _Cursor" -msgstr "Exécuter jusqu'au curseur" +msgstr "Exécuter jusqu'au _curseur" #: ../scope/data/scope.glade.h:6 #, fuzzy msgid "Run to _Source" -msgstr "Exécuter jusqu'au curseur" +msgstr "Exécuter jusqu'à la _source" #: ../scope/data/scope.glade.h:7 msgid "Step _Into" @@ -5038,12 +5296,12 @@ #: ../scope/data/scope.glade.h:11 #, fuzzy msgid "Toggle _Breakpoint" -msgstr "Points d'arrêt" +msgstr "Basuler le point d'arrêt" #: ../scope/data/scope.glade.h:12 #, fuzzy msgid "_GDB Command" -msgstr "Insérer une commande" +msgstr "Commande _GDB" #: ../scope/data/scope.glade.h:13 #, fuzzy @@ -5056,12 +5314,14 @@ msgstr "Afficher le _terminal" #: ../scope/data/scope.glade.h:15 +#, fuzzy msgid "_Reset Markers" -msgstr "" +msgstr "_Réinitialiser les marqueurs" #: ../scope/data/scope.glade.h:16 +#, fuzzy msgid "_Cleanup Files" -msgstr "" +msgstr "Nettoyer les fichiers" #: ../scope/data/scope.glade.h:17 msgid "_Feed" @@ -5093,12 +5353,14 @@ msgstr "" #: ../scope/data/scope.glade.h:24 +#, fuzzy msgid "S_ynchronize" -msgstr "" +msgstr "S_ynchroniser" #: ../scope/data/scope.glade.h:25 +#, fuzzy msgid "_Interrupt" -msgstr "" +msgstr "_Interrompre" #: ../scope/data/scope.glade.h:26 #, fuzzy @@ -5106,9 +5368,8 @@ msgstr "Envoyer un _signal" #: ../scope/data/scope.glade.h:27 -#, fuzzy msgid "S_elect on" -msgstr "Sélectionner une police" +msgstr "" #: ../scope/data/scope.glade.h:28 msgid "_Running" @@ -5124,8 +5385,9 @@ msgstr "" #: ../scope/data/scope.glade.h:31 +#, fuzzy msgid "_Follow" -msgstr "" +msgstr "Suivre" #: ../scope/data/scope.glade.h:32 #, fuzzy @@ -5133,8 +5395,9 @@ msgstr "_Colonnes" #: ../scope/data/scope.glade.h:33 +#, fuzzy msgid "Show _Group" -msgstr "" +msgstr "Afficher le _group" #: ../scope/data/scope.glade.h:34 msgid "Show _Core" @@ -5145,9 +5408,8 @@ msgstr "" #: ../scope/data/scope.glade.h:36 -#, fuzzy msgid "Add _Watch" -msgstr "_Ajouter les deux" +msgstr "" #: ../scope/data/scope.glade.h:37 msgid "Apply on _Run" @@ -5160,19 +5422,21 @@ #: ../scope/data/scope.glade.h:39 #, fuzzy msgid "Show _Address" -msgstr "Adresse" +msgstr "Afficher l'adresse" #: ../scope/data/scope.glade.h:40 +#, fuzzy msgid "_Modify" -msgstr "" +msgstr "_Modifier" #: ../scope/data/scope.glade.h:41 msgid "_Watch" msgstr "" #: ../scope/data/scope.glade.h:42 +#, fuzzy msgid "_Inspect" -msgstr "" +msgstr "_Inspecter" #: ../scope/data/scope.glade.h:43 #, fuzzy @@ -5231,13 +5495,14 @@ msgstr "" #: ../scope/data/scope.glade.h:56 +#, fuzzy msgid "_Apply" -msgstr "" +msgstr "_Appliquer" #: ../scope/data/scope.glade.h:57 #, fuzzy msgid "_Expand" -msgstr "Tout déplier" +msgstr "_Étendre" #: ../scope/data/scope.glade.h:59 msgid "_Natural" @@ -5261,299 +5526,379 @@ msgstr "_Binaire" #: ../scope/data/scope.glade.h:64 -msgid "_Evaluate/Modify" -msgstr "" +#, fuzzy +msgid "_Raw" +msgstr "B_rut" #: ../scope/data/scope.glade.h:65 -msgid "_Watch Expression" +msgid "_Evaluate/Modify" msgstr "" #: ../scope/data/scope.glade.h:66 -#, fuzzy -msgid "_Inspect Variable" -msgstr "Variables d'environnement" +msgid "_Watch Expression" +msgstr "" #: ../scope/data/scope.glade.h:67 #, fuzzy -msgid "Program Terminal" -msgstr "Terminal de déboguage" +msgid "_Inspect Variable" +msgstr "_Inspecter les variables" #: ../scope/data/scope.glade.h:68 msgid "Threads" msgstr "Threads" -#: ../scope/data/scope.glade.h:70 +#: ../scope/data/scope.glade.h:69 #, fuzzy msgid "Stack" -msgstr "Pile d'appel" +msgstr "Pile" -#: ../scope/data/scope.glade.h:71 +#: ../scope/data/scope.glade.h:70 msgid "Locals" msgstr "" -#: ../scope/data/scope.glade.h:72 +#: ../scope/data/scope.glade.h:71 msgid "Watches" msgstr "" -#: ../scope/data/scope.glade.h:73 +#: ../scope/data/scope.glade.h:72 #, fuzzy msgid "Memory" msgstr "Mémoire" -#: ../scope/data/scope.glade.h:74 -msgid "Debug Console" -msgstr "" - -#: ../scope/data/scope.glade.h:75 +#: ../scope/data/scope.glade.h:73 #, fuzzy msgid "Enter gdb command:" -msgstr "Insérer une commande" +msgstr "Insérer une commande GDB :" -#: ../scope/data/scope.glade.h:76 -#, fuzzy +#: ../scope/data/scope.glade.h:74 msgid "Convert _UTF-8 to locale" -msgstr "Aligner la sélection à gauche" +msgstr "" -#: ../scope/data/scope.glade.h:77 +#: ../scope/data/scope.glade.h:75 msgid "_Thread" msgstr "_Thread" -#: ../scope/data/scope.glade.h:78 +#: ../scope/data/scope.glade.h:76 #, fuzzy msgid "_Group" msgstr "_Groupe" -#: ../scope/data/scope.glade.h:79 +#: ../scope/data/scope.glade.h:77 +#, fuzzy msgid "_Frame" -msgstr "" +msgstr "Page" -#: ../scope/data/scope.glade.h:80 +#: ../scope/data/scope.glade.h:78 msgid "Setup Program" msgstr "" -#: ../scope/data/scope.glade.h:81 +#: ../scope/data/scope.glade.h:79 +#, fuzzy msgid "_Executable:" -msgstr "" +msgstr "_Exécutable :" -#: ../scope/data/scope.glade.h:82 +#: ../scope/data/scope.glade.h:80 #, fuzzy msgid "_Arguments:" msgstr "_Arguments :" -#: ../scope/data/scope.glade.h:83 +#: ../scope/data/scope.glade.h:81 #, fuzzy msgid "En_vironment:" msgstr "En_vironnement :" -#: ../scope/data/scope.glade.h:84 +#: ../scope/data/scope.glade.h:82 +#, fuzzy msgid "_Working dir:" -msgstr "" +msgstr "Dossier de travail :" -#: ../scope/data/scope.glade.h:85 +#: ../scope/data/scope.glade.h:83 msgid "_Load script:" msgstr "" -#: ../scope/data/scope.glade.h:86 +#: ../scope/data/scope.glade.h:84 msgid "Auto _run program/exit gdb" msgstr "" -#: ../scope/data/scope.glade.h:87 +#: ../scope/data/scope.glade.h:85 msgid "_Non-stop mode" msgstr "" -#: ../scope/data/scope.glade.h:88 -msgid "_Temporary breakpoint at:" +#: ../scope/data/scope.glade.h:86 +msgid "_Temporary breakpoint on load at:" msgstr "" -#: ../scope/data/scope.glade.h:89 -msgid "_Delete all breakpoints, watches and inspects" +#: ../scope/data/scope.glade.h:87 +#, fuzzy +msgid "_Delete all breakpoints, watches, inspects and registers" msgstr "" +"Supprimer tous les points d'arrêt, watches (?), inspects (?) et " +"registres (?)" -#: ../scope/data/scope.glade.h:90 ../scope/src/prefs.c:337 +#: ../scope/data/scope.glade.h:88 ../scope/src/scope.c:522 +#, fuzzy msgid "Program" -msgstr "" +msgstr "Programme" -#: ../scope/data/scope.glade.h:91 +#: ../scope/data/scope.glade.h:89 #, fuzzy msgid "Open on" -msgstr "Ouvrir une URI" +msgstr "" -#: ../scope/data/scope.glade.h:92 +#: ../scope/data/scope.glade.h:90 msgid "g_db load" msgstr "" -#: ../scope/data/scope.glade.h:93 +#: ../scope/data/scope.glade.h:91 msgid "p_rogram start" msgstr "" -#: ../scope/data/scope.glade.h:94 +#: ../scope/data/scope.glade.h:92 #, fuzzy msgid "Update all _views" -msgstr "Mettre la liste de tâches à jour" +msgstr "Mettre à jour toutes les _vues" -#: ../scope/data/scope.glade.h:95 +#: ../scope/data/scope.glade.h:93 +#, fuzzy msgid "Panel" -msgstr "" +msgstr "Panneau" -#: ../scope/data/scope.glade.h:96 +#: ../scope/data/scope.glade.h:94 msgid "Default 8-bit text mode:" -msgstr "" +msgstr "Mode de texte 8-bit par défaut :" -#: ../scope/data/scope.glade.h:97 +#: ../scope/data/scope.glade.h:95 msgid "_7-bit \\nnn" msgstr "" -#: ../scope/data/scope.glade.h:98 +#: ../scope/data/scope.glade.h:96 +#, fuzzy msgid "Display" -msgstr "" +msgstr "Affichage" -#: ../scope/data/scope.glade.h:99 +#: ../scope/data/scope.glade.h:97 #, fuzzy msgid "_member" msgstr "_membre" -#: ../scope/data/scope.glade.h:100 +#: ../scope/data/scope.glade.h:98 #, fuzzy msgid "and" msgstr "et" -#: ../scope/data/scope.glade.h:101 +#: ../scope/data/scope.glade.h:99 #, fuzzy msgid "_argument" msgstr "_argument" -#: ../scope/data/scope.glade.h:102 +#: ../scope/data/scope.glade.h:100 #, fuzzy msgid "names" msgstr "noms" -#: ../scope/data/scope.glade.h:103 +#: ../scope/data/scope.glade.h:101 msgid "Values" msgstr "Valeurs" -#: ../scope/data/scope.glade.h:104 -#, fuzzy +#: ../scope/data/scope.glade.h:102 msgid "E_xpand on apply" -msgstr "Tout déplier" +msgstr "" -#: ../scope/data/scope.glade.h:105 +#: ../scope/data/scope.glade.h:103 +#, fuzzy msgid "S_how" -msgstr "" +msgstr "Affic_her" -#: ../scope/data/scope.glade.h:106 +#: ../scope/data/scope.glade.h:104 +#, fuzzy msgid "children" -msgstr "" +msgstr "enfants" -#: ../scope/data/scope.glade.h:107 +#: ../scope/data/scope.glade.h:105 +#, fuzzy msgid "Inspect" -msgstr "" +msgstr "Inspecter" -#: ../scope/data/scope.glade.h:108 +#: ../scope/data/scope.glade.h:106 #, fuzzy msgid "Show =li_brary messages" msgstr "Afficher les messages =li_brary" -#: ../scope/data/scope.glade.h:109 +#: ../scope/data/scope.glade.h:107 #, fuzzy msgid "Show _tooltips" -msgstr "Afficher les barres d'outils" +msgstr "Afficher les infobulles" -#: ../scope/data/scope.glade.h:110 +#: ../scope/data/scope.glade.h:108 #, fuzzy msgid "Others" msgstr "Autres" -#: ../scope/data/scope.glade.h:111 +#: ../scope/data/scope.glade.h:109 #, fuzzy msgid "Options" msgstr "Options" -#: ../scope/data/scope.glade.h:112 +#: ../scope/data/scope.glade.h:110 #, fuzzy msgid "_Import" -msgstr "_Import" +msgstr "_Importer" -#: ../scope/data/scope.glade.h:113 -#, fuzzy +#: ../scope/data/scope.glade.h:111 msgid "Enter assignment expression:" -msgstr "Impossible d'évaluer l'expression" +msgstr "" -#: ../scope/data/scope.glade.h:114 +#: ../scope/data/scope.glade.h:112 #, fuzzy msgid "Inspect" msgstr "Inspecter" -#: ../scope/data/scope.glade.h:115 +#: ../scope/data/scope.glade.h:113 #, fuzzy msgid "Object:" msgstr "Objet :" -#: ../scope/data/scope.glade.h:117 +#: ../scope/data/scope.glade.h:115 #, fuzzy msgid "-" msgstr "-" -#: ../scope/data/scope.glade.h:118 +#: ../scope/data/scope.glade.h:116 +#, fuzzy msgid "Frame:" -msgstr "" +msgstr "Page :" -#: ../scope/data/scope.glade.h:119 +#: ../scope/data/scope.glade.h:117 #, fuzzy msgid "@" msgstr "@" -#: ../scope/data/scope.glade.h:120 +#: ../scope/data/scope.glade.h:118 msgid "_Apply on run" msgstr "" -#: ../scope/data/scope.glade.h:121 +#: ../scope/data/scope.glade.h:119 #, fuzzy msgid "Expand" msgstr "Tout déplier" -#: ../scope/data/scope.glade.h:122 +#: ../scope/data/scope.glade.h:120 #, fuzzy msgid "Start:" msgstr "_Début :" -#: ../scope/data/scope.glade.h:123 +#: ../scope/data/scope.glade.h:121 msgid "Count:" msgstr "" -#: ../scope/data/scope.glade.h:124 -#, fuzzy +#: ../scope/data/scope.glade.h:122 msgid "_Expand on apply" -msgstr "Tout déplier" +msgstr "" -#: ../scope/src/break.c:947 -#, c-format +#: ../scope/data/scope.glade.h:123 ../scope/src/scope.c:522 +#, fuzzy +msgid "Program Terminal" +msgstr "Terminal de déboguage" + +#: ../scope/data/scope.glade.h:125 +msgid "Registers" +msgstr "Registres" + +#: ../scope/src/break.c:97 +#, fuzzy +msgid "breakpoint" +msgstr "points d'arrêt" + +#: ../scope/src/break.c:98 +#, fuzzy +msgid "hardware breakpoint" +msgstr "points d'arrêt matériels" + +#: ../scope/src/break.c:99 +msgid "tracepoint" +msgstr "" + +#: ../scope/src/break.c:100 +msgid "fast tracepoint" +msgstr "" + +#: ../scope/src/break.c:101 +msgid "write watchpoint" +msgstr "" + +#: ../scope/src/break.c:104 +msgid "access watchpoint" +msgstr "" + +#: ../scope/src/break.c:106 +msgid "read watchpoint" +msgstr "" + +#: ../scope/src/break.c:108 +msgid "catchpoint" +msgstr "" + +#: ../scope/src/break.c:135 ../scope/src/break.c:139 +msgid "CLI" +msgstr "" + +#: ../scope/src/break.c:136 +msgid "unsupported MI" +msgstr "" + +#: ../scope/src/break.c:141 +msgid "on load" +msgstr "" + +#: ../scope/src/break.c:142 +#, fuzzy +msgid "Run to Cursor" +msgstr "Exécuter jusqu'au curseur" + +#: ../scope/src/break.c:1013 +#, c-format, fuzzy msgid "" "There are two or more breakpoints at %s:%d.\n" +"\n" "Use the breakpoint list to remove the exact one." msgstr "" +"Il y a deux points d'arrêt ou plus à %s:%d.\n" +"\n" +"Utilisez la liste de points d'arrêt pour supprimer le bon." + +#: ../scope/src/break.c:1252 +#, c-format +msgid ", %s" +msgstr "" -#: ../scope/src/break.c:1200 +#: ../scope/src/break.c:1278 +#, c-format +msgid "func %s" +msgstr "" + +#: ../scope/src/break.c:1309 #, fuzzy msgid "Add Breakpoint" msgstr "Ajouter un point d'arrêt" -#: ../scope/src/break.c:1215 +#: ../scope/src/break.c:1324 msgid "Add Watchpoint" msgstr "" #: ../scope/src/conterm.c:106 -#, fuzzy msgid "Feed Terminal" -msgstr "Terminal de déboguage" +msgstr "" #: ../scope/src/conterm.c:106 +#, fuzzy msgid "Enter char # (0..255):" -msgstr "" +msgstr "Entrez le n° de caractère (0 à 255) :" -#: ../scope/src/conterm.c:466 ../scope/src/scope.c:502 -#, c-format +#: ../scope/src/conterm.c:509 ../scope/src/scope.c:550 +#: ../scope/src/scope.c:551 +#, c-format, fuzzy msgid "Scope: %s." -msgstr "" +msgstr "Portée : %s." #: ../scope/src/debug.c:115 ../scope/src/debug.c:120 ../scope/src/utils.c:37 #, c-format @@ -5569,65 +5914,66 @@ msgid "Program terminated." msgstr "" -#: ../scope/src/debug.c:468 +#: ../scope/src/debug.c:469 msgid "No breakpoints. Hanging." msgstr "" -#: ../scope/src/debug.c:596 ../scope/src/thread.c:97 +#: ../scope/src/debug.c:598 ../scope/src/thread.c:92 #, c-format msgid "%s." msgstr "%s." -#: ../scope/src/inspect.c:77 +#: ../scope/src/inspect.c:66 msgid "..." msgstr "…" -#: ../scope/src/inspect.c:324 +#: ../scope/src/inspect.c:339 #, fuzzy msgid "invalid data" -msgstr "Données invalides" +msgstr "données invalides" -#: ../scope/src/inspect.c:356 +#: ../scope/src/inspect.c:371 msgid "no children in range" msgstr "" -#: ../scope/src/inspect.c:440 +#: ../scope/src/inspect.c:454 msgid "out of scope" msgstr "" -#: ../scope/src/inspect.c:587 +#: ../scope/src/inspect.c:627 msgid "Duplicate inspect variable name." msgstr "" -#: ../scope/src/memory.c:299 +#: ../scope/src/memory.c:292 msgid "Read Memory" msgstr "" -#: ../scope/src/memory.c:408 -msgid "Scope: pointer size > 8, Data disabled." +#: ../scope/src/memory.c:396 +#, c-format +msgid "Scope: pointer size > %d, Data disabled." msgstr "" -#: ../scope/src/menu.c:380 +#: ../scope/src/menu.c:375 msgid "Modify" msgstr "" -#: ../scope/src/menu.c:490 +#: ../scope/src/menu.c:481 msgid "Evaluate/modify" msgstr "" -#: ../scope/src/menu.c:491 -#, fuzzy +#: ../scope/src/menu.c:482 msgid "Watch expression" -msgstr "Impossible d'évaluer l'expression" +msgstr "" -#: ../scope/src/menu.c:492 +#: ../scope/src/menu.c:483 #, fuzzy msgid "Inspect variable" -msgstr "Supprimer la variable ?" +msgstr "Inspecter la variable" -#: ../scope/src/parse.c:416 +#: ../scope/src/parse.c:437 +#, fuzzy msgid "Undefined GDB error." -msgstr "" +msgstr "Erreur GDB indéfinie." #: ../scope/src/plugme.c:81 #, fuzzy @@ -5639,36 +5985,27 @@ msgid "Select File" msgstr "Sélectionner un fichier" -#: ../scope/src/prefs.c:338 -#, fuzzy -msgid "Breaks" -msgstr "Points d'arrêt" - -#: ../scope/src/prefs.c:339 -msgid "Console" -msgstr "Console" - -#: ../scope/src/prefs.c:347 ../scope/src/utils.c:570 +#: ../scope/src/prefs.c:294 ../scope/src/utils.c:438 #, c-format msgid "Scope: %s: %s." msgstr "" -#: ../scope/src/prefs.c:352 +#: ../scope/src/prefs.c:299 #, fuzzy msgid "Scope: created configuration file." -msgstr "Forcer le rechargement des fichiers de configuration" +msgstr "Scope : fichier de configuration créé." -#: ../scope/src/program.c:231 +#: ../scope/src/program.c:251 #, c-format msgid "Loaded debug settings for %s." msgstr "" -#: ../scope/src/program.c:239 +#: ../scope/src/program.c:259 #, fuzzy, c-format msgid "Could not load debug settings file %s: %s." msgstr "Impossible de charger le fichier « %s » : %s" -#: ../scope/src/program.c:359 +#: ../scope/src/program.c:379 #, fuzzy, c-format msgid "" "%s: %s.\n" @@ -5679,15 +6016,16 @@ "\n" "Continuer ?" -#: ../scope/src/program.c:394 -msgid "Delete all breakpoints, watches and inspects?" -msgstr "" +#: ../scope/src/program.c:415 +#, fuzzy +msgid "Delete all breakpoints, watches et cetera?" +msgstr "Supprimer tous les points d'arrêt, watches (?), etc. ?" -#: ../scope/src/program.c:501 +#: ../scope/src/program.c:523 msgid "as _Name=value" msgstr "" -#: ../scope/src/program.c:502 +#: ../scope/src/program.c:524 msgid "as _Name = value" msgstr "" @@ -5697,171 +6035,184 @@ msgstr "Débogueur Scope" #: ../scope/src/scope.c:35 -msgid "Simple GDB front-end." -msgstr "" +msgid "Relatively simple GDB front-end." +msgstr "Interface relativement simple pour GDB." -#: ../scope/src/scope.c:63 +#: ../scope/src/scope.c:62 msgid "Setup program" msgstr "" -#: ../scope/src/scope.c:64 +#: ../scope/src/scope.c:63 #, fuzzy msgid "Run/continue" msgstr "Exécuter / continuer" -#: ../scope/src/scope.c:66 +#: ../scope/src/scope.c:65 #, fuzzy msgid "Run to source" -msgstr "Exécuter jusqu'au curseur" +msgstr "Exécuter jusqu'à la source" -#: ../scope/src/scope.c:70 +#: ../scope/src/scope.c:69 #, fuzzy msgid "Terminate" msgstr "Terminer" -#: ../scope/src/scope.c:71 +#: ../scope/src/scope.c:70 #, fuzzy msgid "Toggle breakpoint" msgstr "Ajouter / enlever un point d'arrêt" -#: ../scope/src/scope.c:73 ../scope/src/scope.c:76 +#: ../scope/src/scope.c:72 ../scope/src/scope.c:75 #, fuzzy msgid "GDB command" msgstr "Insérer une commande" -#: ../scope/src/scope.c:74 +#: ../scope/src/scope.c:73 #, fuzzy msgid "Show terminal" msgstr "Afficher le terminal" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 #, fuzzy msgid "Busy" msgstr "Occupé" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 #, fuzzy msgid "Ready" msgstr "Prêt" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Hang" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Assem" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Load" msgstr "" -#: ../scope/src/scope.c:394 +#: ../scope/src/scope.c:421 msgid "Build action activated. Terminate debugging?" msgstr "" -#: ../scope/src/thread.c:58 +#: ../scope/src/scope.c:524 +#, fuzzy +msgid "Breaks" +msgstr "Points d'arrêt" + +#: ../scope/src/scope.c:526 +msgid "Console" +msgstr "Console" + +#: ../scope/src/scope.c:526 +msgid "Debug Console" +msgstr "" + +#: ../scope/src/thread.c:48 #, c-format msgid "Thread group %s started." msgstr "" -#: ../scope/src/thread.c:76 +#: ../scope/src/thread.c:63 msgid "Thread group " msgstr "" -#: ../scope/src/thread.c:88 +#: ../scope/src/thread.c:83 msgid " exited" msgstr "" -#: ../scope/src/thread.c:91 +#: ../scope/src/thread.c:86 #, c-format msgid " with exit code %s" msgstr "" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 #, fuzzy msgid "Send Signal" msgstr "Envoyer un signal" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 #, fuzzy msgid "Enter signal #:" msgstr "Saisissez le numéro de signal :" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Terminate Process" msgstr "" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Enter exit code:" msgstr "" -#: ../scope/src/thread.c:937 +#: ../scope/src/thread.c:891 msgid "Running" msgstr "" -#: ../scope/src/thread.c:938 +#: ../scope/src/thread.c:892 #, fuzzy msgid "Stopped" msgstr "Stopper" -#: ../scope/src/utils.c:44 +#: ../scope/src/utils.c:45 #, fuzzy, c-format -msgid "%s: error %lu." -msgstr "%s : erreur %lu." +msgid "%s: %s" +msgstr "%s : %s." -#: ../scope/src/utils.c:358 +#: ../scope/src/utils.c:225 #, c-format msgid "Scope: error reading [%s]." msgstr "" -#: ../scope/src/views.c:505 +#: ../scope/src/views.c:526 msgid "…" msgstr "…" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 #, fuzzy msgid "_Send" msgstr "_Envoyer" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 #, fuzzy msgid "_Busy" msgstr "_Occupé" -#: ../scope/src/views.c:535 +#: ../scope/src/views.c:558 #, fuzzy msgid "GDB Command" msgstr "Insérer une commande" -#: ../spellcheck/src/speller.c:94 +#: ../spellcheck/src/speller.c:180 msgid "Try: " msgstr "Essayez : " -#: ../spellcheck/src/speller.c:173 +#: ../spellcheck/src/speller.c:252 msgid "Checking" msgstr "Vérification" -#: ../spellcheck/src/speller.c:186 +#: ../spellcheck/src/speller.c:265 #, c-format msgid "Checking file \"%s\" (lines %d to %d using %s):" msgstr "Vérification du fichier « %s » (lignes %d à %d en utilisant %s) :" -#: ../spellcheck/src/speller.c:196 +#: ../spellcheck/src/speller.c:275 #, c-format msgid "Checking file \"%s\" (using %s):" msgstr "Vérification du fichier « %s » (en utilisant %s) :" -#: ../spellcheck/src/speller.c:223 +#: ../spellcheck/src/speller.c:302 msgid "The checked text is spelled correctly." msgstr "Le texte vérifié est correctement orthographié." -#: ../spellcheck/src/speller.c:233 +#: ../spellcheck/src/speller.c:312 #, c-format msgid "The Enchant library couldn't be initialized (%s)." msgstr "La bibliothèque Enchant ne peut être initialisée (%s)." -#: ../spellcheck/src/speller.c:234 +#: ../spellcheck/src/speller.c:313 msgid "unknown error (maybe the chosen language is not available)" msgstr "" "erreur inconnue (la langue sélectionnée n'est peut-être pas disponible)" @@ -5958,19 +6309,19 @@ msgid "Ignore All" msgstr "Ignorer tout" -#: ../spellcheck/src/gui.c:521 +#: ../spellcheck/src/gui.c:526 #, c-format msgid "Default (%s)" msgstr "Par défaut (%s)" -#: ../spellcheck/src/gui.c:532 +#: ../spellcheck/src/gui.c:537 #, c-format msgid "Toggle spell check while typing (current language: %s)" msgstr "" "Basculer la vérification orthographique lors de la frappe (langue courante : " "%s)" -#: ../spellcheck/src/gui.c:587 +#: ../spellcheck/src/gui.c:592 msgid "Spelling Suggestions" msgstr "Suggestions d'orthographe" @@ -6001,28 +6352,28 @@ #. OK. Something went not as expected. #. * We did have a selection but cannot parse it into rows. #. * Aborting -#: ../tableconvert/src/tableconvert.c:236 +#: ../tableconvert/src/tableconvert.c:237 msgid "Something went wrong on parsing selection. Aborting" msgstr "Une erreur est survenue lors de l'analyse de la sélection. Arrêt" -#: ../tableconvert/src/tableconvert.c:268 +#: ../tableconvert/src/tableconvert.c:269 msgid "Convert selection to table" msgstr "Convertir la sélection en tableau" #. Build up menu entry -#: ../tableconvert/src/tableconvert.c:281 +#: ../tableconvert/src/tableconvert.c:282 msgid "_Convert to table" msgstr "_Convertir en tableau" -#: ../tableconvert/src/tableconvert.c:284 +#: ../tableconvert/src/tableconvert.c:285 msgid "Converts current marked list to a table." msgstr "Convertit la liste marquée actuellement en tableau." -#: ../treebrowser/src/treebrowser.c:122 +#: ../treebrowser/src/treebrowser.c:124 msgid "TreeBrowser" msgstr "" -#: ../treebrowser/src/treebrowser.c:123 +#: ../treebrowser/src/treebrowser.c:125 msgid "" "This plugin adds a tree browser to Geany, allowing the user to browse files " "using a tree view of the directory being browsed." @@ -6030,30 +6381,30 @@ "Ce plugin ajoute un navigateur de fichiers à Geany, permettant à " "l'utilisateur de naviguer dans les fichier avec une arborescence de dossiers." -#: ../treebrowser/src/treebrowser.c:432 +#: ../treebrowser/src/treebrowser.c:434 #, c-format msgid "%s: no such directory." msgstr "%s : aucun répertoire de ce type." -#: ../treebrowser/src/treebrowser.c:535 ../treebrowser/src/treebrowser.c:570 -#: ../treebrowser/src/treebrowser.c:672 +#: ../treebrowser/src/treebrowser.c:537 ../treebrowser/src/treebrowser.c:572 +#: ../treebrowser/src/treebrowser.c:670 msgid "(Empty)" msgstr "(Vide)" -#: ../treebrowser/src/treebrowser.c:974 +#: ../treebrowser/src/treebrowser.c:971 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Impossible d'exécuter la commande d'ouverture externe « %s » (%s)." -#: ../treebrowser/src/treebrowser.c:1045 +#: ../treebrowser/src/treebrowser.c:1042 msgid "NewDirectory" msgstr "NouveauDossier" -#: ../treebrowser/src/treebrowser.c:1047 +#: ../treebrowser/src/treebrowser.c:1044 msgid "NewFile" msgstr "NouveauFichier" -#: ../treebrowser/src/treebrowser.c:1052 +#: ../treebrowser/src/treebrowser.c:1049 #, c-format msgid "" "Target file '%s' exists\n" @@ -6062,119 +6413,122 @@ "Le fichier de destination « %s » existe, voulez-vous vraiment le remplacer " "par un fichier vide ?" -#: ../treebrowser/src/treebrowser.c:1096 +#: ../treebrowser/src/treebrowser.c:1095 #, c-format msgid "Do you really want to delete '%s' ?" msgstr "Voulez-vous vraiment supprimer « %s » ?" -#: ../treebrowser/src/treebrowser.c:1208 ../treebrowser/src/treebrowser.c:1695 +#: ../treebrowser/src/treebrowser.c:1207 ../treebrowser/src/treebrowser.c:1738 msgid "Go up" msgstr "Dossier parant" -#: ../treebrowser/src/treebrowser.c:1212 ../treebrowser/src/treebrowser.c:1710 +#: ../treebrowser/src/treebrowser.c:1211 ../treebrowser/src/treebrowser.c:1753 msgid "Set path from document" msgstr "Définir le chemin depuis le document" -#: ../treebrowser/src/treebrowser.c:1216 -msgid "Open externally" -msgstr "" +#: ../treebrowser/src/treebrowser.c:1215 +msgid "_Open externally" +msgstr "_Ouvrir dans un programme externe" -#: ../treebrowser/src/treebrowser.c:1221 +#: ../treebrowser/src/treebrowser.c:1220 msgid "Open Terminal" msgstr "Ouvrir dans un terminal" -#: ../treebrowser/src/treebrowser.c:1225 +#: ../treebrowser/src/treebrowser.c:1224 msgid "Set as root" msgstr "Définir comme racine" -#: ../treebrowser/src/treebrowser.c:1230 ../treebrowser/src/treebrowser.c:1700 -#: ../treebrowser/src/treebrowser.c:2063 +#: ../treebrowser/src/treebrowser.c:1229 ../treebrowser/src/treebrowser.c:1743 +#: ../treebrowser/src/treebrowser.c:2123 msgid "Refresh" msgstr "Rafraîchir" -#: ../treebrowser/src/treebrowser.c:1242 +#: ../treebrowser/src/treebrowser.c:1233 +msgid "_Find in Files" +msgstr "Rechercher dans les _fichiers" + +#: ../treebrowser/src/treebrowser.c:1241 msgid "Create new directory" msgstr "Créer un nouveau dossier" -#: ../treebrowser/src/treebrowser.c:1246 +#: ../treebrowser/src/treebrowser.c:1245 msgid "Create new file" msgstr "Créer un nouveau fichier" -#: ../treebrowser/src/treebrowser.c:1250 +#: ../treebrowser/src/treebrowser.c:1249 msgid "Rename" msgstr "Renommer" -#: ../treebrowser/src/treebrowser.c:1255 +#: ../treebrowser/src/treebrowser.c:1254 msgid "Delete" msgstr "Supprimer" -#: ../treebrowser/src/treebrowser.c:1263 +#: ../treebrowser/src/treebrowser.c:1262 #, c-format msgid "Close: %s" msgstr "Fermer « %s »" -#: ../treebrowser/src/treebrowser.c:1268 +#: ../treebrowser/src/treebrowser.c:1267 #, c-format msgid "Close Child Documents " msgstr "Fermer les documents enfants" -#: ../treebrowser/src/treebrowser.c:1273 -msgid "Copy full path to clipboard" -msgstr "Copier le chemin complet dans le presse-papier" +#: ../treebrowser/src/treebrowser.c:1272 +msgid "_Copy full path to clipboard" +msgstr "_Copier le chemin complet dans le presse-papier" -#: ../treebrowser/src/treebrowser.c:1293 ../treebrowser/src/treebrowser.c:1977 +#: ../treebrowser/src/treebrowser.c:1292 ../treebrowser/src/treebrowser.c:2032 msgid "Show bookmarks" msgstr "Afficher les marque-pages" -#: ../treebrowser/src/treebrowser.c:1298 ../treebrowser/src/treebrowser.c:1931 +#: ../treebrowser/src/treebrowser.c:1297 ../treebrowser/src/treebrowser.c:1981 msgid "Show hidden files" msgstr "Afficher les fichiers cachés" -#: ../treebrowser/src/treebrowser.c:1303 +#: ../treebrowser/src/treebrowser.c:1302 msgid "Show toolbars" msgstr "Afficher les barres d'outils" -#: ../treebrowser/src/treebrowser.c:1578 +#: ../treebrowser/src/treebrowser.c:1621 #, c-format msgid "Target file '%s' exists, do you really want to replace it?" msgstr "" "Le fichier de destination « %s » existe déjà, voulez vous vraiment le " "remplacer ?" -#: ../treebrowser/src/treebrowser.c:1705 +#: ../treebrowser/src/treebrowser.c:1748 msgid "Home" msgstr "Dossier personnel" # Qu'est-ce que ça fait en pratique ? -#: ../treebrowser/src/treebrowser.c:1715 -#, fuzzy +#: ../treebrowser/src/treebrowser.c:1758 msgid "Track path" msgstr "Suivre le chemin" -#: ../treebrowser/src/treebrowser.c:1720 +#: ../treebrowser/src/treebrowser.c:1763 msgid "Hide bars" msgstr "Cacher les barres d'outils" -#: ../treebrowser/src/treebrowser.c:1730 +#: ../treebrowser/src/treebrowser.c:1773 msgid "" "Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' " "reverse try for example this '!;*.c;*.h;*.cpp'" msgstr "" -#: ../treebrowser/src/treebrowser.c:1738 +#: ../treebrowser/src/treebrowser.c:1781 msgid "Addressbar for example '/projects/my-project'" msgstr "Barre de chemin, par exemple « /projets/mon-projet »" -#: ../treebrowser/src/treebrowser.c:1763 +#: ../treebrowser/src/treebrowser.c:1806 msgid "Tree Browser" msgstr "" -#: ../treebrowser/src/treebrowser.c:1895 +#: ../treebrowser/src/treebrowser.c:1945 msgid "External open command" -msgstr "Commande d'ouverture externe" +msgstr "Commande du programme externe" -#: ../treebrowser/src/treebrowser.c:1900 -#, fuzzy, c-format +#: ../treebrowser/src/treebrowser.c:1950 +#, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " "wildcards.\n" @@ -6182,58 +6536,59 @@ "%d will be replaced with the path name of the selected file without the " "filename" msgstr "" -"La commande à exécuter pour l'action « Ouvrir XXX » Vous pouvez utiliser " -"les marqueurs %f et %d.\n" +"La commande à exécuter pour l'action « Ouvrir dans un programme " +"externe » Vous pouvez utiliser les marqueurs %f et %d.\n" "%f sera remplacé par le chemin complet du fichier\n" -"%d sera remplacé par le chemin complet du dossier qui contient le fichier" +"%d sera remplacé par le chemin complet du dossier qui contient le " +"fichier" -#: ../treebrowser/src/treebrowser.c:1908 +#: ../treebrowser/src/treebrowser.c:1958 msgid "Toolbar" msgstr "Barre d'outils" -#: ../treebrowser/src/treebrowser.c:1910 +#: ../treebrowser/src/treebrowser.c:1960 msgid "Hidden" msgstr "Cachée" -#: ../treebrowser/src/treebrowser.c:1911 +#: ../treebrowser/src/treebrowser.c:1961 msgid "Top" msgstr "Au dessus" -#: ../treebrowser/src/treebrowser.c:1912 +#: ../treebrowser/src/treebrowser.c:1962 msgid "Bottom" msgstr "En dessous" -#: ../treebrowser/src/treebrowser.c:1917 +#: ../treebrowser/src/treebrowser.c:1967 msgid "If position is changed, the option require plugin restart." msgstr "Cette option nécessite un redémarrage du plugin." -#: ../treebrowser/src/treebrowser.c:1921 +#: ../treebrowser/src/treebrowser.c:1971 msgid "Show icons" msgstr "Afficher les icônes" -#: ../treebrowser/src/treebrowser.c:1923 +#: ../treebrowser/src/treebrowser.c:1973 msgid "None" msgstr "Aucunes" -#: ../treebrowser/src/treebrowser.c:1924 +#: ../treebrowser/src/treebrowser.c:1974 msgid "Base" msgstr "Basiques" -#: ../treebrowser/src/treebrowser.c:1925 +#: ../treebrowser/src/treebrowser.c:1975 msgid "Content-type" msgstr "Depuis le type de contenu" -#: ../treebrowser/src/treebrowser.c:1936 +#: ../treebrowser/src/treebrowser.c:1986 msgid "On Windows, this just hide files that are prefixed with '.' (dot)" msgstr "" "Sous Windows cette option ne cache que les fichiers dont le nom commence par " "un « . » (un point)" -#: ../treebrowser/src/treebrowser.c:1938 +#: ../treebrowser/src/treebrowser.c:1988 msgid "Hide object files" msgstr "Cacher les fichiers objets" -#: ../treebrowser/src/treebrowser.c:1943 +#: ../treebrowser/src/treebrowser.c:1993 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -6241,47 +6596,55 @@ "Ne pas afficher les objets auto-générés dans le navigateur de fichiers (*.o, " "*.obj. *.so, *.dll, *.a et *.lib entre autres)" -#: ../treebrowser/src/treebrowser.c:1945 +#: ../treebrowser/src/treebrowser.c:1995 msgid "Reverse filter" msgstr "Inverser le filtre" -#: ../treebrowser/src/treebrowser.c:1950 +#: ../treebrowser/src/treebrowser.c:2000 msgid "Follow current document" msgstr "Suivre le document courant" -#: ../treebrowser/src/treebrowser.c:1955 +#: ../treebrowser/src/treebrowser.c:2005 msgid "Single click, open document and focus it" msgstr "Un simple clic ouvre le document et lui donne le focus" -#: ../treebrowser/src/treebrowser.c:1960 +#: ../treebrowser/src/treebrowser.c:2010 msgid "Double click open directory" msgstr "Un double clic ouvre le dossier" -#: ../treebrowser/src/treebrowser.c:1965 +#: ../treebrowser/src/treebrowser.c:2015 msgid "On delete file, close it if is opened" msgstr "Fermer les fichiers lorsque ils sont supprimés" -#: ../treebrowser/src/treebrowser.c:1970 +#: ../treebrowser/src/treebrowser.c:2020 +msgid "Focus editor on file open" +msgstr "Donner le focus à l'éditeur lors de l'ouverture d'un fichier" + +#: ../treebrowser/src/treebrowser.c:2025 msgid "Show tree lines" msgstr "Afficher les guides d'arborescence" -#: ../treebrowser/src/treebrowser.c:2053 +#: ../treebrowser/src/treebrowser.c:2037 +msgid "Open new files" +msgstr "Ouvrir les nouveaux fichiers" + +#: ../treebrowser/src/treebrowser.c:2113 msgid "Focus File List" msgstr "Aller à la liste de fichiers" -#: ../treebrowser/src/treebrowser.c:2055 +#: ../treebrowser/src/treebrowser.c:2115 msgid "Focus Path Entry" msgstr "Aller au champ de chemin" -#: ../treebrowser/src/treebrowser.c:2057 +#: ../treebrowser/src/treebrowser.c:2117 msgid "Rename Object" msgstr "Renommer l'objet" -#: ../treebrowser/src/treebrowser.c:2059 +#: ../treebrowser/src/treebrowser.c:2119 msgid "Create New File" msgstr "Créer un nouveau fichier" -#: ../treebrowser/src/treebrowser.c:2061 +#: ../treebrowser/src/treebrowser.c:2121 msgid "Create New Directory" msgstr "Créer un nouveau dossier" @@ -6350,44 +6713,44 @@ msgid "utility" msgstr "utilitaire" -#: ../webhelper/src/gwh-settings.c:775 +#: ../webhelper/src/gwh-settings.c:782 #, c-format msgid "%s:" msgstr "%s :" -#: ../webhelper/src/gwh-browser.c:528 +#: ../webhelper/src/gwh-browser.c:534 msgid "_Zoom" msgstr "_Zoom" -#: ../webhelper/src/gwh-browser.c:550 +#: ../webhelper/src/gwh-browser.c:556 msgid "Full-_content zoom" msgstr "Zoom du _contenu" -#: ../webhelper/src/gwh-browser.c:561 +#: ../webhelper/src/gwh-browser.c:567 msgid "Flip panes orientation" msgstr "Inverser l'orientation des panneaux" -#: ../webhelper/src/gwh-browser.c:808 +#: ../webhelper/src/gwh-browser.c:814 msgid "Back" msgstr "Retour" -#: ../webhelper/src/gwh-browser.c:812 +#: ../webhelper/src/gwh-browser.c:818 msgid "Forward" msgstr "Suivant" -#: ../webhelper/src/gwh-browser.c:816 +#: ../webhelper/src/gwh-browser.c:822 msgid "Cancel loading" msgstr "Arrêter le chargement" -#: ../webhelper/src/gwh-browser.c:820 +#: ../webhelper/src/gwh-browser.c:826 msgid "Reload current page" msgstr "Recharger la page courante" -#: ../webhelper/src/gwh-browser.c:833 ../webhelper/src/gwh-browser.c:879 +#: ../webhelper/src/gwh-browser.c:839 ../webhelper/src/gwh-browser.c:885 msgid "Web inspector" msgstr "Inspecteur web" -#: ../webhelper/src/gwh-browser.c:834 +#: ../webhelper/src/gwh-browser.c:840 msgid "Toggle web inspector" msgstr "Basculer l'inspecteur web" @@ -6532,6 +6895,10 @@ msgid "Autocompletes XML/HTML tags using snippets." msgstr "" +#, fuzzy +#~ msgid "%s: error %lu." +#~ msgstr "%s : erreur %lu." + #~ msgid "Added breakpoint #%s in %s() at %s:%s\n" #~ msgstr "Ajout d'un point d'arrêt #%s dans %s() à %s:%s\n" @@ -6544,9 +6911,6 @@ #~ msgid "reason:" #~ msgstr "raison :" -#~ msgid "Directory %s not found!\n" -#~ msgstr "Répertoire %s introuvable !\n" - #~ msgid "Shutting down target program.\n" #~ msgstr "Fermeture du programme cible.\n" diff -Nru geany-plugins-1.23+dfsg/po/gl.po geany-plugins-1.24+dfsg/po/gl.po --- geany-plugins-1.23+dfsg/po/gl.po 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/po/gl.po 2014-04-12 14:28:39.000000000 +0000 @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Geany-plugins 1.23\n" +"Project-Id-Version: Geany-plugins 1.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-23 14:32+0100\n" +"POT-Creation-Date: 2014-03-30 19:33+0200\n" "PO-Revision-Date: 2010-06-06 06:26+0100\n" "Last-Translator: José Manuel Castroagudín Silva \n" "Language-Team: Galician\n" @@ -33,12 +33,12 @@ msgid "Contents" msgstr "Contidos" -#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:615 +#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:625 msgid "Bookmarks" msgstr "Marcadores" #. complete update -#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2295 +#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2351 msgid "_Update" msgstr "Act_ualizar" @@ -75,15 +75,15 @@ msgid "Context:" msgstr "Contexto" -#: ../addons/src/ao_xmltagging.c:56 +#: ../addons/src/ao_xmltagging.c:54 msgid "XML tagging" msgstr "Etiquetado XML" -#: ../addons/src/ao_xmltagging.c:67 +#: ../addons/src/ao_xmltagging.c:65 msgid "Tag name to be inserted:" msgstr "Nome da etiqueta a inserir:" -#: ../addons/src/ao_xmltagging.c:71 +#: ../addons/src/ao_xmltagging.c:69 #, c-format msgid "" "%s will be replaced with your current selection. Please keep care on your " @@ -154,11 +154,12 @@ msgid "Run XML tagging" msgstr "Executar o etiquetado XML" -#: ../addons/src/addons.c:417 ../geanylatex/src/geanylatex.c:241 -#: ../geanyprj/src/geanyprj.c:174 ../geanysendmail/src/geanysendmail.c:121 -#: ../geanysendmail/src/geanysendmail.c:287 ../geanyvc/src/geanyvc.c:1798 +#: ../addons/src/addons.c:417 ../autoclose/src/autoclose.c:871 +#: ../geanylatex/src/geanylatex.c:241 ../geanyprj/src/geanyprj.c:174 +#: ../geanysendmail/src/geanysendmail.c:123 +#: ../geanysendmail/src/geanysendmail.c:291 ../geanyvc/src/geanyvc.c:1854 #: ../geniuspaste/src/geniuspaste.c:140 ../spellcheck/src/scplugin.c:146 -#: ../treebrowser/src/treebrowser.c:1880 +#: ../treebrowser/src/treebrowser.c:1933 #: ../updatechecker/src/updatechecker.c:253 msgid "Plugin configuration directory could not be created." msgstr "Non foi posíbel crear o directorio de configuración do plugin." @@ -253,6 +254,14 @@ msgid "Enclose selection automatically (without having to press a keybinding)" msgstr "" +#: ../autoclose/src/autoclose.c:50 +msgid "Auto-close" +msgstr "" + +#: ../autoclose/src/autoclose.c:51 +msgid "Auto-close braces and brackets with lot of features" +msgstr "" + #: ../codenav/src/codenavigation.c:52 msgid "Code navigation" msgstr "Navegación polo código" @@ -323,8 +332,8 @@ msgid "Various debuggers integration." msgstr "" -#: ../debugger/src/plugin.c:131 ../debugger/src/keys.c:76 -#: ../scope/data/scope.glade.h:125 ../scope/src/scope.c:225 +#: ../debugger/src/plugin.c:133 ../debugger/src/keys.c:76 +#: ../scope/data/scope.glade.h:124 ../scope/src/scope.c:226 msgid "Debug" msgstr "Depurar" @@ -468,7 +477,7 @@ msgid "Target" msgstr "grande" -#: ../debugger/src/tabs.c:135 ../scope/data/scope.glade.h:69 +#: ../debugger/src/tabs.c:135 ../scope/src/scope.c:524 msgid "Breakpoints" msgstr "Puntos de interrupción" @@ -511,24 +520,24 @@ msgstr "Iniciando" #: ../debugger/src/keys.c:52 ../debugger/src/btnpanel.c:113 -#: ../scope/src/scope.c:67 +#: ../scope/src/scope.c:66 #, fuzzy msgid "Step into" msgstr "Só en %s: %s\n" #: ../debugger/src/keys.c:53 ../debugger/src/btnpanel.c:110 -#: ../scope/src/scope.c:68 +#: ../scope/src/scope.c:67 msgid "Step over" msgstr "" #: ../debugger/src/keys.c:54 ../debugger/src/btnpanel.c:122 -#: ../scope/src/scope.c:69 +#: ../scope/src/scope.c:68 #, fuzzy msgid "Step out" msgstr "Só en %s: %s\n" #: ../debugger/src/keys.c:55 ../debugger/src/btnpanel.c:125 -#: ../scope/src/scope.c:65 +#: ../scope/src/scope.c:64 #, fuzzy msgid "Run to cursor" msgstr "A conectar a %s" @@ -540,7 +549,7 @@ #: ../debugger/src/keys.c:57 #, fuzzy -msgid "Jump to the currect instruction" +msgid "Jump to the current instruction" msgstr "Completar a función actualmente en execución." #: ../debugger/src/watch_model.c:220 @@ -575,6 +584,14 @@ msgid "Save debug session data to a project" msgstr "" +#: ../defineformat/src/defineformat.c:56 +msgid "Define formatter" +msgstr "" + +#: ../defineformat/src/defineformat.c:57 +msgid "Automatically align backslash in multi-line defines" +msgstr "" + #. never search for more than this many chars #: ../devhelp/src/dhp.h:38 #, fuzzy @@ -689,7 +706,7 @@ msgstr "Libro" #. i18n: a documentation book -#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1760 +#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1759 msgid "Book" msgstr "Libro" @@ -820,12 +837,12 @@ msgid "A developers' help browser for GNOME" msgstr "" -#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2010 +#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2066 msgid "_File" msgstr "_Ficheiro" -#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1815 -#: ../geanymacro/src/geanymacro.c:2112 +#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1822 +#: ../geanymacro/src/geanymacro.c:2118 #, fuzzy msgid "_Edit" msgstr "Editor" @@ -1018,57 +1035,66 @@ msgid "Column mode, select to line / brace / anchor." msgstr "Modo de columna, seleccionar ata a liña ou chave correspondente." -#: ../geanyextrasel/src/extrasel.c:482 +#: ../geanyextrasel/src/extrasel.c:502 msgid "E_xtra Selection" msgstr "Selección e_xtra" -#: ../geanyextrasel/src/extrasel.c:489 +#: ../geanyextrasel/src/extrasel.c:509 msgid "_Column Mode" msgstr "Modo de _columna" -#: ../geanyextrasel/src/extrasel.c:494 +#: ../geanyextrasel/src/extrasel.c:514 msgid "Column mode" msgstr "Modo de columna" -#: ../geanyextrasel/src/extrasel.c:496 +#: ../geanyextrasel/src/extrasel.c:516 msgid "Select to _Line" msgstr "Seleccionar ata a _liña" -#: ../geanyextrasel/src/extrasel.c:500 +#: ../geanyextrasel/src/extrasel.c:520 msgid "Select to line" msgstr "Seleccionar ata a liña" -#: ../geanyextrasel/src/extrasel.c:502 +#: ../geanyextrasel/src/extrasel.c:522 msgid "Select to Matching _Brace" msgstr "Seleccionar ata a _chave correspondente" -#: ../geanyextrasel/src/extrasel.c:506 +#: ../geanyextrasel/src/extrasel.c:526 msgid "Select to matching brace" msgstr "Seleccionar ata a chave correspondente" -#: ../geanyextrasel/src/extrasel.c:510 +#: ../geanyextrasel/src/extrasel.c:528 +msgid "_Toggle Stream/Rectangular" +msgstr "" + +#: ../geanyextrasel/src/extrasel.c:532 +#, fuzzy +msgid "Convert selection" +msgstr "Formatar a selección aliñándoa á esquerda" + +#: ../geanyextrasel/src/extrasel.c:537 msgid "_Set Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:514 +#: ../geanyextrasel/src/extrasel.c:541 msgid "Set anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:516 +#: ../geanyextrasel/src/extrasel.c:543 #, fuzzy msgid "Select to _Anchor" msgstr "Seleccionar ata a _liña" -#: ../geanyextrasel/src/extrasel.c:520 +#: ../geanyextrasel/src/extrasel.c:547 #, fuzzy msgid "Select to anchor" msgstr "Seleccionar ata a liña" -#: ../geanyextrasel/src/extrasel.c:522 +#: ../geanyextrasel/src/extrasel.c:549 msgid "_Rectangle Select to Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:527 +#: ../geanyextrasel/src/extrasel.c:554 msgid "Rectangle select to anchor" msgstr "" @@ -1485,76 +1511,76 @@ msgstr "" "Tipo de documentación predefinido para linguaxes que non teñan un definido" -#: ../geanyinsertnum/src/insertnum.c:37 ../geanyinsertnum/src/insertnum.c:329 -#: ../geanyinsertnum/src/insertnum.c:461 +#: ../geanyinsertnum/src/insertnum.c:44 ../geanyinsertnum/src/insertnum.c:337 +#: ../geanyinsertnum/src/insertnum.c:484 msgid "Insert Numbers" msgstr "Inserir números" -#: ../geanyinsertnum/src/insertnum.c:37 +#: ../geanyinsertnum/src/insertnum.c:44 msgid "Insert/Fill columns with numbers." msgstr "Inserir ou encher columnas con números." -#: ../geanyinsertnum/src/insertnum.c:140 +#: ../geanyinsertnum/src/insertnum.c:146 msgid "Counting..." msgstr "Contando..." -#: ../geanyinsertnum/src/insertnum.c:188 +#: ../geanyinsertnum/src/insertnum.c:194 msgid "Preparing..." msgstr "Preparando..." -#: ../geanyinsertnum/src/insertnum.c:194 +#: ../geanyinsertnum/src/insertnum.c:200 msgid "Inserting..." msgstr "Inserindo..." -#: ../geanyinsertnum/src/insertnum.c:318 +#: ../geanyinsertnum/src/insertnum.c:333 msgid "For base 11 and above" msgstr "Para base 11 ou superior" -#: ../geanyinsertnum/src/insertnum.c:341 +#: ../geanyinsertnum/src/insertnum.c:353 msgid "_Start:" msgstr "_Comezo:" -#: ../geanyinsertnum/src/insertnum.c:346 +#: ../geanyinsertnum/src/insertnum.c:358 msgid "S_tep:" msgstr "_Paso:" -#: ../geanyinsertnum/src/insertnum.c:352 +#: ../geanyinsertnum/src/insertnum.c:364 msgid "_Base:" msgstr "_Base:" -#: ../geanyinsertnum/src/insertnum.c:363 +#: ../geanyinsertnum/src/insertnum.c:380 msgid "Letters:" msgstr "Letras:" -#: ../geanyinsertnum/src/insertnum.c:366 +#: ../geanyinsertnum/src/insertnum.c:383 msgid "_Upper" msgstr "Máis _alto" -#: ../geanyinsertnum/src/insertnum.c:371 +#: ../geanyinsertnum/src/insertnum.c:388 msgid "_Lower" msgstr "Máis _baixo" -#: ../geanyinsertnum/src/insertnum.c:376 +#: ../geanyinsertnum/src/insertnum.c:393 msgid "Base _prefix" msgstr "_Prefixo base" -#: ../geanyinsertnum/src/insertnum.c:378 +#: ../geanyinsertnum/src/insertnum.c:395 msgid "0 for octal, 0x for hex, + for positive decimal" msgstr "0 para octal, 0x para hex, + para decimal positivo" -#: ../geanyinsertnum/src/insertnum.c:380 +#: ../geanyinsertnum/src/insertnum.c:397 msgid "Padding:" msgstr "Recheo:" -#: ../geanyinsertnum/src/insertnum.c:382 +#: ../geanyinsertnum/src/insertnum.c:399 msgid "Sp_ace" msgstr "Esp_azo" -#: ../geanyinsertnum/src/insertnum.c:385 +#: ../geanyinsertnum/src/insertnum.c:402 msgid "_Zero" msgstr "_Cero" -#: ../geanyinsertnum/src/insertnum.c:454 +#: ../geanyinsertnum/src/insertnum.c:477 msgid "Insert _Numbers" msgstr "Inserir _números" @@ -1989,20 +2015,20 @@ msgid "BibTeX reference name:" msgstr "Nome da referencia:" -#: ../geanylatex/src/geanylatex.c:1680 +#: ../geanylatex/src/geanylatex.c:1679 msgid "Dear Sir or Madame" msgstr "Estimado señor ou señora" -#: ../geanylatex/src/geanylatex.c:1681 +#: ../geanylatex/src/geanylatex.c:1680 msgid "With kind regards" msgstr "Reciba un cordial saúdo" -#: ../geanylatex/src/geanylatex.c:1689 +#: ../geanylatex/src/geanylatex.c:1688 msgid "No template assigned. Aborting" msgstr "" #. Building the wizard-dialog and showing it -#: ../geanylatex/src/geanylatex.c:1716 +#: ../geanylatex/src/geanylatex.c:1715 msgid "LaTeX-Wizard" msgstr "Asistente de LaTeX" @@ -2010,69 +2036,69 @@ #. * Adds custom templates if there are any. If there are none just #. * adds default one #. TEMPLATE FILE -#: ../geanylatex/src/geanylatex.c:1731 ../markdown/src/conf.c:666 +#: ../geanylatex/src/geanylatex.c:1730 ../markdown/src/conf.c:659 msgid "Template:" msgstr "Modelo:" -#: ../geanylatex/src/geanylatex.c:1735 +#: ../geanylatex/src/geanylatex.c:1734 msgid "Set the template which should be used for creating the new document" msgstr "" -#: ../geanylatex/src/geanylatex.c:1744 +#: ../geanylatex/src/geanylatex.c:1743 msgid "Default" msgstr "Predeterminado" #. Documentclass -#: ../geanylatex/src/geanylatex.c:1755 +#: ../geanylatex/src/geanylatex.c:1754 msgid "Documentclass:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1758 +#: ../geanylatex/src/geanylatex.c:1757 msgid "Choose the kind of document you want to write" msgstr "Escolla o tipo de documento que quere escribir" -#: ../geanylatex/src/geanylatex.c:1762 +#: ../geanylatex/src/geanylatex.c:1761 msgid "Article" msgstr "Artigo" -#: ../geanylatex/src/geanylatex.c:1764 +#: ../geanylatex/src/geanylatex.c:1763 msgid "Report" msgstr "Informe" -#: ../geanylatex/src/geanylatex.c:1766 +#: ../geanylatex/src/geanylatex.c:1765 msgid "Letter" msgstr "Carta" -#: ../geanylatex/src/geanylatex.c:1768 +#: ../geanylatex/src/geanylatex.c:1767 msgid "Presentation" msgstr "Presentación" #. Encoding -#: ../geanylatex/src/geanylatex.c:1778 +#: ../geanylatex/src/geanylatex.c:1777 msgid "Encoding:" msgstr "Codificación:" -#: ../geanylatex/src/geanylatex.c:1782 +#: ../geanylatex/src/geanylatex.c:1781 msgid "Set the encoding for your new document" msgstr "Configure a codificación para o seu novo documento" #. fontsize -#: ../geanylatex/src/geanylatex.c:1798 +#: ../geanylatex/src/geanylatex.c:1797 #, fuzzy msgid "Font size" msgstr "Tamaño da tipografía:" -#: ../geanylatex/src/geanylatex.c:1804 +#: ../geanylatex/src/geanylatex.c:1803 msgid "Set the default font size of your new document" msgstr "" "Configure o tamaño da tipografía predeterminado para o seu novo documento" #. Author -#: ../geanylatex/src/geanylatex.c:1816 +#: ../geanylatex/src/geanylatex.c:1815 msgid "Author:" msgstr "Autor:" -#: ../geanylatex/src/geanylatex.c:1819 +#: ../geanylatex/src/geanylatex.c:1818 msgid "" "Sets the value of the \\author command. In most cases this should be your " "name" @@ -2081,11 +2107,11 @@ "seu nome" #. Date -#: ../geanylatex/src/geanylatex.c:1833 +#: ../geanylatex/src/geanylatex.c:1832 msgid "Date:" msgstr "Data:" -#: ../geanylatex/src/geanylatex.c:1836 +#: ../geanylatex/src/geanylatex.c:1835 msgid "" "Sets the value of the \\date command inside header of your new created LaTeX-" "document. Keeping it at \\today is a good decision if you don't need any " @@ -2093,143 +2119,143 @@ msgstr "" #. Title of the new document -#: ../geanylatex/src/geanylatex.c:1848 +#: ../geanylatex/src/geanylatex.c:1847 msgid "Title:" msgstr "Título:" -#: ../geanylatex/src/geanylatex.c:1851 +#: ../geanylatex/src/geanylatex.c:1850 msgid "Sets the title of your new document." msgstr "Configura o título do seu novo documento." #. Papersize -#: ../geanylatex/src/geanylatex.c:1860 +#: ../geanylatex/src/geanylatex.c:1859 msgid "Paper size:" msgstr "Tamaño do papel:" -#: ../geanylatex/src/geanylatex.c:1863 +#: ../geanylatex/src/geanylatex.c:1862 msgid "Choose the paper format for the newly created document" msgstr "Escolla o formato do papel para o documento novo creado" #. Paper direction -#: ../geanylatex/src/geanylatex.c:1876 +#: ../geanylatex/src/geanylatex.c:1875 msgid "Paper Orientation:" msgstr "Orientación do papel:" -#: ../geanylatex/src/geanylatex.c:1879 +#: ../geanylatex/src/geanylatex.c:1878 msgid "Choose the paper orientation for the newly created document" msgstr "Escolla a orientación do papel para o documento novo creado" -#: ../geanylatex/src/geanylatex.c:1900 +#: ../geanylatex/src/geanylatex.c:1899 msgid "Use KOMA-script classes if possible" msgstr "Usar clases de KOMA-script se é posíbel" -#: ../geanylatex/src/geanylatex.c:1902 +#: ../geanylatex/src/geanylatex.c:1901 msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" "Keep in mind: To compile your document these classes have to be installed " "before." msgstr "" -#: ../geanylatex/src/geanylatex.c:1909 +#: ../geanylatex/src/geanylatex.c:1908 msgid "Use draft mode" msgstr "Usar o modo de borrador" -#: ../geanylatex/src/geanylatex.c:1911 +#: ../geanylatex/src/geanylatex.c:1910 msgid "" "Set the draft flag inside new created documents to get documents with a " "number of debugging helpers" msgstr "" -#: ../geanylatex/src/geanylatex.c:1928 +#: ../geanylatex/src/geanylatex.c:1927 msgid "Run LaTeX-Wizard" msgstr "Executar o asistente de LaTeX" -#: ../geanylatex/src/geanylatex.c:1930 +#: ../geanylatex/src/geanylatex.c:1929 msgid "Insert \\label" msgstr "" -#: ../geanylatex/src/geanylatex.c:1932 +#: ../geanylatex/src/geanylatex.c:1931 msgid "Insert \\ref" msgstr "" -#: ../geanylatex/src/geanylatex.c:1934 +#: ../geanylatex/src/geanylatex.c:1933 msgid "Insert linebreak \\\\ " msgstr "" -#: ../geanylatex/src/geanylatex.c:1937 +#: ../geanylatex/src/geanylatex.c:1936 msgid "Insert command" msgstr "Inserir orde" -#: ../geanylatex/src/geanylatex.c:1939 +#: ../geanylatex/src/geanylatex.c:1938 msgid "Turn input replacement on/off" msgstr "Activar ou desactivar a substitución de entrada" -#: ../geanylatex/src/geanylatex.c:1943 +#: ../geanylatex/src/geanylatex.c:1942 msgid "Replace special characters" msgstr "Substituír caracteres especiais" -#: ../geanylatex/src/geanylatex.c:1946 +#: ../geanylatex/src/geanylatex.c:1945 msgid "Run insert environment dialog" msgstr "" -#: ../geanylatex/src/geanylatex.c:1948 +#: ../geanylatex/src/geanylatex.c:1947 msgid "Insert \\item" msgstr "" -#: ../geanylatex/src/geanylatex.c:1950 +#: ../geanylatex/src/geanylatex.c:1949 msgid "Format selection in bold font face" msgstr "Formatar a selección en negra" -#: ../geanylatex/src/geanylatex.c:1952 +#: ../geanylatex/src/geanylatex.c:1951 msgid "Format selection in italic font face" msgstr "Formatar a selección en cursiva" -#: ../geanylatex/src/geanylatex.c:1954 +#: ../geanylatex/src/geanylatex.c:1953 msgid "Format selection in typewriter font face" msgstr "Formatar a selección en letra de máquina de escribir" -#: ../geanylatex/src/geanylatex.c:1956 +#: ../geanylatex/src/geanylatex.c:1955 msgid "Format selection centered" msgstr "Formatar a selección centrada" -#: ../geanylatex/src/geanylatex.c:1958 +#: ../geanylatex/src/geanylatex.c:1957 msgid "Format selection left-aligned" msgstr "Formatar a selección aliñándoa á esquerda" -#: ../geanylatex/src/geanylatex.c:1960 +#: ../geanylatex/src/geanylatex.c:1959 msgid "Format selection right-aligned" msgstr "Formatar a selección aliñándoa á dereita" -#: ../geanylatex/src/geanylatex.c:1963 +#: ../geanylatex/src/geanylatex.c:1962 msgid "Insert description list" msgstr "Inserir lista de descricións" -#: ../geanylatex/src/geanylatex.c:1966 +#: ../geanylatex/src/geanylatex.c:1965 msgid "Insert itemize list" msgstr "Inserir unha lista de elementos" -#: ../geanylatex/src/geanylatex.c:1969 +#: ../geanylatex/src/geanylatex.c:1968 msgid "Insert enumerate list" msgstr "Inserir unha lista numerada" -#: ../geanylatex/src/geanylatex.c:1972 +#: ../geanylatex/src/geanylatex.c:1971 msgid "Set selection one level up" msgstr "" -#: ../geanylatex/src/geanylatex.c:1975 +#: ../geanylatex/src/geanylatex.c:1974 msgid "Set selection one level down" msgstr "" -#: ../geanylatex/src/geanylatex.c:1978 +#: ../geanylatex/src/geanylatex.c:1977 msgid "Insert \\usepackage{}" msgstr "" -#: ../geanylatex/src/geanylatex.c:1981 +#: ../geanylatex/src/geanylatex.c:1980 #, fuzzy msgid "Insert BibTeX reference dialog" msgstr "Inserir referencia" -#: ../geanylatex/src/geanylatex.c:1988 +#: ../geanylatex/src/geanylatex.c:1987 msgid "" "GeanyLaTeX is a plugin to improve support for LaTeX in Geany.\n" "\n" @@ -2240,124 +2266,124 @@ "Por favor, informe de todos os erros ou peticións de características a un " "dos autores." -#: ../geanylatex/src/geanylatex.c:2026 +#: ../geanylatex/src/geanylatex.c:2025 msgid "" "glatex_set_autocompletion_contextsize has been initialized with an invalid " "value. Default value taken. Please check your configuration file" msgstr "" -#: ../geanylatex/src/geanylatex.c:2048 ../geanylatex/src/geanylatex.c:2055 +#: ../geanylatex/src/geanylatex.c:2047 ../geanylatex/src/geanylatex.c:2054 msgid "page \\pageref{{{reference}}}" msgstr "" -#: ../geanylatex/src/geanylatex.c:2052 ../geanylatex/src/geanylatex.c:2059 +#: ../geanylatex/src/geanylatex.c:2051 ../geanylatex/src/geanylatex.c:2058 msgid "\\ref{{{reference}}}, page \\pageref{{{reference}}}" msgstr "" #. Build up menu for menubar -#: ../geanylatex/src/geanylatex.c:2107 +#: ../geanylatex/src/geanylatex.c:2106 msgid "_LaTeX" msgstr "_LaTeX" #. Filling up menubar menus #. LaTeX menu -#: ../geanylatex/src/geanylatex.c:2116 ../geanylatex/src/geanylatex.c:2328 +#: ../geanylatex/src/geanylatex.c:2115 ../geanylatex/src/geanylatex.c:2327 msgid "LaTeX-_Wizard" msgstr "_Asistente de LaTeX" -#: ../geanylatex/src/geanylatex.c:2119 ../geanylatex/src/geanylatex.c:2331 +#: ../geanylatex/src/geanylatex.c:2118 ../geanylatex/src/geanylatex.c:2330 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "Inicia un asistente para crear facilmente documentos LaTeX" -#: ../geanylatex/src/geanylatex.c:2124 +#: ../geanylatex/src/geanylatex.c:2123 msgid "I_nsert Special Character" msgstr "I_nserir un carácter especial" -#: ../geanylatex/src/geanylatex.c:2126 +#: ../geanylatex/src/geanylatex.c:2125 msgid "Helps to use some not very common letters and signs" msgstr "Axuda para usar algunhas letras e signos non moi comúns" -#: ../geanylatex/src/geanylatex.c:2136 +#: ../geanylatex/src/geanylatex.c:2135 msgid "Insert _Reference" msgstr "Inserir _referencia" -#: ../geanylatex/src/geanylatex.c:2138 +#: ../geanylatex/src/geanylatex.c:2137 msgid "Inserting references to the document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2143 +#: ../geanylatex/src/geanylatex.c:2142 msgid "Insert _Label" msgstr "Inserir _etiqueta" -#: ../geanylatex/src/geanylatex.c:2145 +#: ../geanylatex/src/geanylatex.c:2144 msgid "Helps at inserting labels to a document" msgstr "Axuda ao inserir etiquetas a un documento" -#: ../geanylatex/src/geanylatex.c:2151 +#: ../geanylatex/src/geanylatex.c:2150 msgid "Insert _Environment" msgstr "Inserir _contorno" -#: ../geanylatex/src/geanylatex.c:2153 +#: ../geanylatex/src/geanylatex.c:2152 msgid "Helps at inserting an environment a document" msgstr "Axuda ao inserir un contorno a un documento" -#: ../geanylatex/src/geanylatex.c:2159 +#: ../geanylatex/src/geanylatex.c:2158 msgid "Insert P_ackage" msgstr "Inserir p_aquete" -#: ../geanylatex/src/geanylatex.c:2161 +#: ../geanylatex/src/geanylatex.c:2160 msgid "A small dialog to insert \\usepackage{} into header of current file" msgstr "" -#: ../geanylatex/src/geanylatex.c:2166 ../scope/data/scope.glade.h:58 +#: ../geanylatex/src/geanylatex.c:2165 ../scope/data/scope.glade.h:58 msgid "_Format" msgstr "_Formato" #. Add font size menu -#: ../geanylatex/src/geanylatex.c:2183 +#: ../geanylatex/src/geanylatex.c:2182 msgid "F_ont size" msgstr "Tamaño da tip_ografía" -#: ../geanylatex/src/geanylatex.c:2201 +#: ../geanylatex/src/geanylatex.c:2200 msgid "_Special Character Replacement" msgstr "_Substitución de caracteres especiais" -#: ../geanylatex/src/geanylatex.c:2209 +#: ../geanylatex/src/geanylatex.c:2208 msgid "Bulk _Replace Special Characters" msgstr "Substituí_r en masa caracteres especiais" -#: ../geanylatex/src/geanylatex.c:2211 +#: ../geanylatex/src/geanylatex.c:2210 msgid "_Replace selected special characters with TeX substitutes" msgstr "" "Substituí_r os caracteres especiais seleccionados por substitutos de TeX" -#: ../geanylatex/src/geanylatex.c:2219 +#: ../geanylatex/src/geanylatex.c:2218 msgid "Toggle _Special Character Replacement" msgstr "" -#: ../geanylatex/src/geanylatex.c:2230 +#: ../geanylatex/src/geanylatex.c:2229 msgid "Insert _Command" msgstr "_Orde para inserir" -#: ../geanylatex/src/geanylatex.c:2232 +#: ../geanylatex/src/geanylatex.c:2231 msgid "Inserting costumized command to document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2257 +#: ../geanylatex/src/geanylatex.c:2256 #, fuzzy msgid "_BibTeX" msgstr "_BibTeX" -#: ../geanylatex/src/geanylatex.c:2265 +#: ../geanylatex/src/geanylatex.c:2264 #, fuzzy msgid "Insert B_ibTeX reference" msgstr "Inserir _referencia" -#: ../geanylatex/src/geanylatex.c:2267 +#: ../geanylatex/src/geanylatex.c:2266 msgid "Helps to insert a reference out of BibTeX files" msgstr "" -#: ../geanylatex/src/geanylatex.c:2272 +#: ../geanylatex/src/geanylatex.c:2271 #, fuzzy msgid "_BibTeX entries" msgstr "_BibTeX" @@ -2515,16 +2541,16 @@ msgid "Creating dummy text with Geany" msgstr "Creación de textos de proba con Geany" -#: ../geanylipsum/src/geanylipsum.c:86 +#: ../geanylipsum/src/geanylipsum.c:89 msgid "Lipsum-Generator" msgstr "Xerador de Lipsum" -#: ../geanylipsum/src/geanylipsum.c:87 +#: ../geanylipsum/src/geanylipsum.c:90 msgid "Enter the length of Lipsum text here" msgstr "Introduza a lonxitude do texto Lipsum aquí" #. Building menu entry -#: ../geanylipsum/src/geanylipsum.c:163 +#: ../geanylipsum/src/geanylipsum.c:164 msgid "_Lipsum" msgstr "_Lipsum" @@ -2662,19 +2688,19 @@ msgid "Browse..." msgstr "Examinar..." -#: ../geanylua/gsdlg.c:175 +#: ../geanylua/gsdlg.c:176 msgid "Select Color" msgstr "Seleccionar a cor" -#: ../geanylua/gsdlg.c:205 +#: ../geanylua/gsdlg.c:207 msgid "Choose..." msgstr "Seleccionar..." -#: ../geanylua/gsdlg.c:226 +#: ../geanylua/gsdlg.c:228 msgid "Select Font" msgstr "Seleccionar tipo de letra" -#: ../geanylua/gsdlg.c:253 +#: ../geanylua/gsdlg.c:255 msgid "Select..." msgstr "Seleccionar..." @@ -2705,7 +2731,7 @@ "Produciuse un erro no módulo \"%s\" na función %s():\n" "non hai argumentos suficientes para a orde \"%s\".\n" -#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:398 +#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:396 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2745,7 +2771,7 @@ msgid "Save file" msgstr "Gardar ficheiro" -#: ../geanylua/glspi_dlg.c:436 +#: ../geanylua/glspi_dlg.c:438 #, c-format msgid "" "Error in module \"%s\" at function pickfile():\n" @@ -2754,7 +2780,7 @@ "Produciuse un erro no módulo \"%s\" na función pickfile():\n" "produciuse un erro ao analizar a cadea de filtro no argumento #3.\n" -#: ../geanylua/glspi_dlg.c:486 +#: ../geanylua/glspi_dlg.c:489 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2800,7 +2826,7 @@ "O complemento %s non foi cargado adecuadamente.\n" "Comprobe a súa instalación." -#: ../geanylua/glspi_app.c:19 +#: ../geanylua/glspi_app.c:21 #, fuzzy, c-format msgid "" "%s %s: %s\n" @@ -2809,7 +2835,7 @@ "%s %s: %s\n" "Copyright (c) 2007-2008 " -#: ../geanylua/glspi_app.c:149 +#: ../geanylua/glspi_app.c:151 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2818,7 +2844,7 @@ "Produciuse un erro no módulo \"%s\" na función %s():\n" "non se atopou o widget \"%s\" para o argumento #1.\n" -#: ../geanylua/glspi_app.c:158 +#: ../geanylua/glspi_app.c:160 #, c-format msgid "" "Error in module \"%s\" at function %s() argument #2:\n" @@ -3196,6 +3222,21 @@ "duplicate line" msgstr "" +#: ../geanymacro/src/geanymacro.c:150 +#, fuzzy +msgid "Search for next \"\"" +msgstr "Elementos de busca:" + +#: ../geanymacro/src/geanymacro.c:151 +#, fuzzy +msgid "Search for previous \"\"" +msgstr "Elementos de busca:" + +#: ../geanymacro/src/geanymacro.c:152 +#, fuzzy +msgid "Set start of search to beginning of selection" +msgstr "Seleccionar ata a liña" + #: ../geanymacro/src/geanymacro.c:181 #, fuzzy msgid "Macros" @@ -3400,12 +3441,12 @@ #. create buttons #: ../geanymacro/src/geanymacro.c:1393 ../geanymacro/src/geanymacro.c:1536 -#: ../geanymacro/src/geanymacro.c:1819 ../geanymacro/src/geanymacro.c:2116 +#: ../geanymacro/src/geanymacro.c:1826 ../geanymacro/src/geanymacro.c:2122 msgid "_Ok" msgstr "" #: ../geanymacro/src/geanymacro.c:1394 ../geanymacro/src/geanymacro.c:1537 -#: ../geanymacro/src/geanymacro.c:1820 +#: ../geanymacro/src/geanymacro.c:1827 #, fuzzy msgid "_Cancel" msgstr "Codificación:" @@ -3426,7 +3467,7 @@ msgid "Search for contents of clipboard" msgstr "Copiar o camiño completo" -#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:92 +#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:101 #, fuzzy msgid "Search for:" msgstr "Elementos de busca:" @@ -3466,60 +3507,60 @@ msgid "Text:" msgstr "Contexto" -#: ../geanymacro/src/geanymacro.c:1571 ../geanymacro/src/geanymacro.c:1755 +#: ../geanymacro/src/geanymacro.c:1570 ../geanymacro/src/geanymacro.c:1758 #, c-format msgid "Insert/replace with \"%s\"" msgstr "" #. create dialog box -#: ../geanymacro/src/geanymacro.c:1731 +#: ../geanymacro/src/geanymacro.c:1735 #, fuzzy, c-format msgid "Edit: %s" msgstr "Editar o punto de vixilancia" #. add column -#: ../geanymacro/src/geanymacro.c:1794 +#: ../geanymacro/src/geanymacro.c:1801 msgid "Event" msgstr "" #. add buttons -#: ../geanymacro/src/geanymacro.c:1809 +#: ../geanymacro/src/geanymacro.c:1816 msgid "Move _Up" msgstr "" -#: ../geanymacro/src/geanymacro.c:1811 +#: ../geanymacro/src/geanymacro.c:1818 msgid "Move Do_wn" msgstr "" -#: ../geanymacro/src/geanymacro.c:1813 +#: ../geanymacro/src/geanymacro.c:1820 msgid "New _Above" msgstr "" -#: ../geanymacro/src/geanymacro.c:1814 +#: ../geanymacro/src/geanymacro.c:1821 msgid "New _Below" msgstr "" -#: ../geanymacro/src/geanymacro.c:1817 ../geanymacro/src/geanymacro.c:2114 +#: ../geanymacro/src/geanymacro.c:1824 ../geanymacro/src/geanymacro.c:2120 #, fuzzy msgid "_Delete" msgstr "Borrar" #. create dialog box -#: ../geanymacro/src/geanymacro.c:2059 +#: ../geanymacro/src/geanymacro.c:2065 #, fuzzy msgid "Edit Macros" msgstr "Editar o punto de vixilancia" -#: ../geanymacro/src/geanymacro.c:2089 +#: ../geanymacro/src/geanymacro.c:2095 msgid "Macro Name" msgstr "" -#: ../geanymacro/src/geanymacro.c:2095 +#: ../geanymacro/src/geanymacro.c:2101 msgid "Key Trigger" msgstr "" #. add buttons -#: ../geanymacro/src/geanymacro.c:2110 +#: ../geanymacro/src/geanymacro.c:2116 msgid "_Re-Record" msgstr "" @@ -3538,6 +3579,33 @@ msgid "_Edit Macros" msgstr "" +#. *< \brief It's the information message about geany mini script +#: ../geanyminiscript/src/gms_gui.c:129 +msgid "" +"GMS : Geany Mini-Script filter Plugin\n" +"This plugin is a tool to apply a script filter on:\n" +" o the text selection,\n" +" o the current document,\n" +" o all documents of the current session.\n" +"\n" +"The filter type can be:\n" +" o Unix shell script,\n" +" o perl script,\n" +" o python script,\n" +" o sed commands,\n" +" o awk script.\n" +"\n" +"AUTHOR\n" +" Written by Pascal BURLOT (December,2008)\n" +"\n" +"LICENSE:\n" +"This program is free software; you can redistribute\n" +"it and/or modify it under the terms of the GNU \n" +"General Public License as published by the Free\n" +"Software Foundation; either version 2 of the License,\n" +"or (at your option) any later version." +msgstr "" + #: ../geanyminiscript/src/gms_gui.c:253 msgid "Load Mini-Script File" msgstr "" @@ -3546,115 +3614,114 @@ msgid "Save Mini-Script File" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:418 +#: ../geanyminiscript/src/gms_gui.c:419 msgid "Mini-Script Filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:446 +#: ../geanyminiscript/src/gms_gui.c:445 msgid "Clear the mini-script window" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:451 +#: ../geanyminiscript/src/gms_gui.c:450 msgid "Load a mini-script into this window" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:456 +#: ../geanyminiscript/src/gms_gui.c:455 msgid "Save the mini-script into a file" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:461 +#: ../geanyminiscript/src/gms_gui.c:460 #, fuzzy msgid "Display a information about the mini-script plugin" msgstr "Mostrar información adicional sobre o elemento seleccionado." -#: ../geanyminiscript/src/gms_gui.c:469 +#: ../geanyminiscript/src/gms_gui.c:468 msgid "select the mini-script type" msgstr "" #. Hbox : Radio bouttons for choosing the input: #. * selection/current document/all documents of the current session -#: ../geanyminiscript/src/gms_gui.c:500 +#: ../geanyminiscript/src/gms_gui.c:499 msgid "filter input" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:502 +#: ../geanyminiscript/src/gms_gui.c:501 msgid "select the input of mini-script filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:508 +#: ../geanyminiscript/src/gms_gui.c:507 #, fuzzy msgid "selection" msgstr "Seleccionar tipo de letra" -#: ../geanyminiscript/src/gms_gui.c:509 +#: ../geanyminiscript/src/gms_gui.c:508 #, fuzzy msgid "document" msgstr "Enviar o docu_mento por correo" -#: ../geanyminiscript/src/gms_gui.c:510 +#: ../geanyminiscript/src/gms_gui.c:509 msgid "session" msgstr "" #. Hbox : Radio bouttons for choosing the output: #. * current document/ or new document -#: ../geanyminiscript/src/gms_gui.c:519 +#: ../geanyminiscript/src/gms_gui.c:518 msgid "filter output" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:521 +#: ../geanyminiscript/src/gms_gui.c:520 msgid "select the output of mini-script filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:527 +#: ../geanyminiscript/src/gms_gui.c:526 msgid "Current Doc." msgstr "" -#: ../geanyminiscript/src/gms_gui.c:528 +#: ../geanyminiscript/src/gms_gui.c:527 #, fuzzy msgid "New Doc." msgstr "Proxecto novo" -#: ../geanyminiscript/src/gms_gui.c:749 +#: ../geanyminiscript/src/gms_gui.c:748 #, fuzzy msgid "script configuration" msgstr "Produciuse un erro ao cargar a configuración: %s" -#. All plugins must set name, description, version and author. #: ../geanyminiscript/src/gms.c:58 #, fuzzy msgid "Mini Script" msgstr "Script Lua" -#: ../geanyminiscript/src/gms.c:58 +#: ../geanyminiscript/src/gms.c:59 msgid "" "A tool to apply a script filter on a text selection or current document(s)" msgstr "" -#: ../geanyminiscript/src/gms.c:59 +#: ../geanyminiscript/src/gms.c:60 msgid "Pascal BURLOT, a Geany user" msgstr "" #. Add an item to the Tools menu -#: ../geanyminiscript/src/gms.c:278 +#: ../geanyminiscript/src/gms.c:249 msgid "_Mini-Script" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:58 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:61 msgid "Numbered Bookmarks for Geany" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:923 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:927 #, c-format msgid "Unable to apply all markers to '%s' as all being used." msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:925 -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:969 -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1392 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:929 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:973 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1396 msgid "_Okay" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:967 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:971 #, c-format msgid "" "'%s' has been edited since it was last saved by geany. Marker positions may " @@ -3662,55 +3729,55 @@ "Press Ignore to try an load markers anyway." msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:970 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:974 #, fuzzy msgid "_Ignore" msgstr "Ignorar Todo" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1215 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1219 msgid "remember fold state" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1221 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1225 msgid "Center view when goto bookmark" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1228 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1232 #, fuzzy msgid "Move to start of line" msgstr "Formatar a selección aliñándoa á esquerda" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1229 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1233 msgid "Move to remembered position in line" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1230 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1234 msgid "Move to position in current line" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1231 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1235 #, fuzzy msgid "Move to End of line" msgstr "Formatar a selección aliñándoa á esquerda" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1237 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1241 msgid "Save file settings with program settings" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1238 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1242 msgid "Save file settings to filename with suffix" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1243 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1247 msgid "remember normal Bookmarks" msgstr "" #. create dialog box -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1263 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1267 msgid "Numbered Bookmarks help" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1270 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1274 msgid "" "This Plugin implements Numbered Bookmarks in Geany, as well as remembering " "the state of folds, and positions of standard non-numbered bookmarks when a " @@ -3726,7 +3793,7 @@ "previously set bookmark, press Ctrl+a number from 0 to 9." msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1391 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1395 msgid "Unable to apply markers as all being used." msgstr "" @@ -3810,36 +3877,36 @@ msgstr "Seleccionar ficheiro" #. shouldn't get here -#: ../geanypg/src/pinentry.c:107 +#: ../geanypg/src/pinentry.c:111 msgid "Could not use pinentry." msgstr "" -#: ../geanypg/src/pinentry.c:119 +#: ../geanypg/src/pinentry.c:123 msgid "Unexpected output from pinentry." msgstr "" #. read the rest of the first line after OK -#: ../geanypg/src/pinentry.c:127 +#: ../geanypg/src/pinentry.c:131 msgid "Passphrase entry" msgstr "" -#: ../geanypg/src/pinentry.c:131 +#: ../geanypg/src/pinentry.c:135 msgid "Passphrase" msgstr "" -#: ../geanypg/src/pinentry.c:136 +#: ../geanypg/src/pinentry.c:140 msgid "Enter passphrase for" msgstr "" -#: ../geanypg/src/pinentry.c:167 +#: ../geanypg/src/pinentry.c:171 msgid "pinentry gave error" msgstr "" -#: ../geanypg/src/pinentry.c:170 +#: ../geanypg/src/pinentry.c:174 msgid "Unexpected error from pinentry." msgstr "" -#: ../geanypg/src/pinentry.c:195 +#: ../geanypg/src/pinentry.c:199 msgid "" "Error, Passphrase input without using gpg-agent is not supported on Windows " "yet." @@ -3849,8 +3916,8 @@ msgid "a key with fingerprint" msgstr "" -#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:522 -#: ../spellcheck/src/gui.c:533 +#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:527 +#: ../spellcheck/src/gui.c:538 msgid "unknown" msgstr "descoñecido" @@ -4011,7 +4078,7 @@ msgstr "Abrir ficheiro" #: ../geanyprj/src/geanyprj.c:38 ../geanyprj/src/sidebar.c:456 -#: ../gproject/src/gproject-sidebar.c:822 +#: ../gproject/src/gproject-sidebar.c:870 msgid "Project" msgstr "Proxecto" @@ -4041,7 +4108,7 @@ msgid "C_reate" msgstr "C_rear" -#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:116 +#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:114 msgid "Name:" msgstr "Nome:" @@ -4119,7 +4186,7 @@ msgid "Remove File" msgstr "Eliminar ficheiro" -#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:803 +#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:849 msgid "H_ide Sidebar" msgstr "_Ocultar a barra lateral" @@ -4128,6 +4195,50 @@ msgid "Project \"%s\" opened." msgstr "Abriuse o proxecto \"%s\"." +#: ../geanypy/src/geanypy-plugin.c:34 +#, fuzzy +msgid "GeanyPy" +msgstr "GeanyGDB" + +#: ../geanypy/src/geanypy-plugin.c:35 +msgid "Python plugins support" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:77 +#, fuzzy, c-format +msgid "Unable to pre-load Python library: %s." +msgstr "Produciuse un erro ao gardar a configuración: %s" + +#: ../geanypy/src/geanypy-plugin.c:157 +msgid "Failed to import manager module" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:166 +msgid "Failed to retrieve PluginManager from manager module" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:182 +#, fuzzy +msgid "System plugin directory not found." +msgstr "Non se atopou o directorio temporal de tty!\n" + +#: ../geanypy/src/geanypy-plugin.c:211 +msgid "Unable to instantiate new PluginManager" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:227 +msgid "Unable to get show_all() method on plugin manager" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:255 +#, fuzzy, c-format +msgid "Unable to create Python plugins directory: %s: %s" +msgstr "Produciuse un erro ao gardar a configuración: %s" + +#: ../geanypy/src/geanypy-plugin.c:266 +msgid "Python Plugin Manager" +msgstr "" + #: ../geanysendmail/src/geanysendmail.c:43 msgid "GeanySendMail" msgstr "GeanySendMail" @@ -4149,13 +4260,13 @@ msgid "Enter the recipient's e-mail address:" msgstr "Introduza o enderezo de correo-e do destinatario:" -#: ../geanysendmail/src/geanysendmail.c:136 +#: ../geanysendmail/src/geanysendmail.c:138 msgid "Filename placeholder not found. The executed command might have failed." msgstr "" "Non se atopou o marcador de posición do ficheiro. A orde executada pode ter " "fallado." -#: ../geanysendmail/src/geanysendmail.c:142 +#: ../geanysendmail/src/geanysendmail.c:144 msgid "" "Recipient address placeholder not found. The executed command might have " "failed." @@ -4163,33 +4274,33 @@ "Non se atopou o marcador de posición do enderezo do destinatario. A orde " "executada pode ter fallado." -#: ../geanysendmail/src/geanysendmail.c:157 +#: ../geanysendmail/src/geanysendmail.c:159 msgid "Could not execute mailer. Please check your configuration." msgstr "" "Non foi posíbel executar o cliente de correo. Revise a súa configuración." -#: ../geanysendmail/src/geanysendmail.c:166 +#: ../geanysendmail/src/geanysendmail.c:168 msgid "Please define a mail client first." msgstr "Por favor, defina primeiro un cliente de correo ." -#: ../geanysendmail/src/geanysendmail.c:171 +#: ../geanysendmail/src/geanysendmail.c:173 msgid "File has to be saved before sending." msgstr "Débese gardar o ficheiro antes de envialo." -#: ../geanysendmail/src/geanysendmail.c:187 +#: ../geanysendmail/src/geanysendmail.c:191 msgid "Mail" msgstr "Correo" -#: ../geanysendmail/src/geanysendmail.c:218 +#: ../geanysendmail/src/geanysendmail.c:222 msgid "Send by mail" msgstr "Enviar por correo" #. add a label and a text entry to the dialog -#: ../geanysendmail/src/geanysendmail.c:308 +#: ../geanysendmail/src/geanysendmail.c:312 msgid "Path and options for the mail client:" msgstr "Camiño e opcións para o cliente de correo:" -#: ../geanysendmail/src/geanysendmail.c:316 +#: ../geanysendmail/src/geanysendmail.c:320 #, fuzzy msgid "" "Note: \n" @@ -4208,32 +4319,32 @@ "\tsylpheed --attach \"\\%f\" --compose \"\\%r\"\n" "\tmutt -s \"Enviando '\\%b'\" -a \"\\%f\" \"\\%r\"" -#: ../geanysendmail/src/geanysendmail.c:326 +#: ../geanysendmail/src/geanysendmail.c:330 #, fuzzy msgid "Show toolbar icon" msgstr "Mostrar as indicacións." -#: ../geanysendmail/src/geanysendmail.c:328 +#: ../geanysendmail/src/geanysendmail.c:332 msgid "Shows a icon in the toolbar to send file more easy." msgstr "" "Mostra unha icona na barra de ferramentas para enviar o ficheiro máis " "facilmente." -#: ../geanysendmail/src/geanysendmail.c:334 +#: ../geanysendmail/src/geanysendmail.c:338 #, fuzzy msgid "Use dialog for entering email address of recipients" msgstr "Usar un diálogo para introducir o enderezo de correo dos destinatarios" -#: ../geanysendmail/src/geanysendmail.c:356 +#: ../geanysendmail/src/geanysendmail.c:360 msgid "Send file by mail" msgstr "Enviar o ficheiro por correo" #. Build up menu entry -#: ../geanysendmail/src/geanysendmail.c:379 +#: ../geanysendmail/src/geanysendmail.c:383 msgid "_Mail document" msgstr "Enviar o docu_mento por correo" -#: ../geanysendmail/src/geanysendmail.c:382 +#: ../geanysendmail/src/geanysendmail.c:386 msgid "" "Sends the opened file as unzipped attachment by any mailer from your $PATH" msgstr "" @@ -4253,78 +4364,97 @@ msgid "geanyvc: s_spawn_sync error: %s" msgstr "" -#: ../geanyvc/src/geanyvc.c:609 ../geanyvc/src/geanyvc.c:620 +#: ../geanyvc/src/geanyvc.c:561 +#, c-format +msgid "File %s: action %s executed via %s." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:614 ../geanyvc/src/geanyvc.c:625 #, c-format msgid "geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'" msgstr "" -#: ../geanyvc/src/geanyvc.c:646 ../geanyvc/src/geanyvc.c:696 +#: ../geanyvc/src/geanyvc.c:651 ../geanyvc/src/geanyvc.c:701 msgid "No changes were made." msgstr "Non se realizaron cambios" -#: ../geanyvc/src/geanyvc.c:723 +#: ../geanyvc/src/geanyvc.c:728 #, fuzzy msgid "No history available" msgstr "Non hai historial dispoñíbel" -#: ../geanyvc/src/geanyvc.c:916 ../geanyvc/src/geanyvc.c:924 +#: ../geanyvc/src/geanyvc.c:921 ../geanyvc/src/geanyvc.c:929 #, c-format msgid "Do you really want to revert: %s?" msgstr "Está seguro de que desexa reverter: %s?" -#: ../geanyvc/src/geanyvc.c:932 +#: ../geanyvc/src/geanyvc.c:937 #, c-format msgid "Do you really want to add: %s?" msgstr "Está seguro de que quere engadir: %s?" -#: ../geanyvc/src/geanyvc.c:939 +#: ../geanyvc/src/geanyvc.c:944 #, c-format msgid "Do you really want to remove: %s?" msgstr "Está seguro de que quere eliminar: %s?" -#: ../geanyvc/src/geanyvc.c:962 +#: ../geanyvc/src/geanyvc.c:967 msgid "Do you really want to update?" msgstr "Está seguro de que desexa actualizar?" -#: ../geanyvc/src/geanyvc.c:1225 +#: ../geanyvc/src/geanyvc.c:1094 +msgid "" +"The resulting differences cannot be displayed because the changes are too " +"big to display here and would slow down the UI significantly.\n" +"\n" +"To view the differences, cancel this dialog and open the differences in " +"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:1243 msgid "Commit Y/N" msgstr "" -#: ../geanyvc/src/geanyvc.c:1235 +#: ../geanyvc/src/geanyvc.c:1253 msgid "Status" msgstr "Estado" -#: ../geanyvc/src/geanyvc.c:1242 +#: ../geanyvc/src/geanyvc.c:1260 msgid "Path" msgstr "Ruta" -#: ../geanyvc/src/geanyvc.c:1330 +#: ../geanyvc/src/geanyvc.c:1324 +#, c-format +msgid "Line: %d Column: %d" +msgstr "" + +#: ../geanyvc/src/geanyvc.c:1370 msgid "Commit" msgstr "" -#: ../geanyvc/src/geanyvc.c:1372 +#: ../geanyvc/src/geanyvc.c:1412 msgid "_De-/select all files" msgstr "(_De)Seleccionar tódolos ficheiros" -#: ../geanyvc/src/geanyvc.c:1413 +#: ../geanyvc/src/geanyvc.c:1456 msgid "Commit message:" msgstr "" -#: ../geanyvc/src/geanyvc.c:1426 +#: ../geanyvc/src/geanyvc.c:1475 msgid "C_ommit" msgstr "" -#: ../geanyvc/src/geanyvc.c:1500 +#: ../geanyvc/src/geanyvc.c:1556 #, fuzzy msgid "Nothing to commit." msgstr "Non hai nada que " -#: ../geanyvc/src/geanyvc.c:1546 +#: ../geanyvc/src/geanyvc.c:1602 #, c-format msgid "Error initializing spell checking: %s" msgstr "Produciuse un erro ao iniciar a corrección ortográfica: %s" -#: ../geanyvc/src/geanyvc.c:1558 +#: ../geanyvc/src/geanyvc.c:1614 #, c-format msgid "" "Error while setting up language for spellchecking. Please check " @@ -4333,11 +4463,11 @@ "Produciuse un erro ao configurar o idioma para a verificación ortográfica. " "Verifique a súa configuración. A mensaxe de erro foi: %s" -#: ../geanyvc/src/geanyvc.c:1834 +#: ../geanyvc/src/geanyvc.c:1890 msgid "Set Changed-flag for document tabs created by the plugin" msgstr "" -#: ../geanyvc/src/geanyvc.c:1837 +#: ../geanyvc/src/geanyvc.c:1893 msgid "" "If this option is activated, every new by the VC-plugin created document tab " "will be marked as changed. Even this option is useful in some cases, it " @@ -4348,262 +4478,262 @@ "opción ñe útil nalgúns casos, pode causar un gran número de diálogos do tipo " "\"Quere gardar... ?\"." -#: ../geanyvc/src/geanyvc.c:1845 +#: ../geanyvc/src/geanyvc.c:1901 msgid "Confirm adding new files to a VCS" msgstr "" "Confirmar a adición de novos ficheiros a un sistema de control de versións" -#: ../geanyvc/src/geanyvc.c:1848 +#: ../geanyvc/src/geanyvc.c:1904 msgid "Shows a confirmation dialog on adding a new (created) file to VCS." msgstr "" "Mostra un diálogo de confirmación ao engadir un ficheiro novo (creado) a un " "sistema de control de versións." -#: ../geanyvc/src/geanyvc.c:1854 +#: ../geanyvc/src/geanyvc.c:1910 msgid "Maximize commit dialog" msgstr "" -#: ../geanyvc/src/geanyvc.c:1855 +#: ../geanyvc/src/geanyvc.c:1911 msgid "Show commit dialog maximize." msgstr "" -#: ../geanyvc/src/geanyvc.c:1861 +#: ../geanyvc/src/geanyvc.c:1917 msgid "Use external diff viewer" msgstr "Uar un visor de diff externo" -#: ../geanyvc/src/geanyvc.c:1863 +#: ../geanyvc/src/geanyvc.c:1919 msgid "Use external diff viewer for file diff." msgstr "Usar un visor externo de diff para diffs de ficheiros." -#: ../geanyvc/src/geanyvc.c:1869 +#: ../geanyvc/src/geanyvc.c:1925 msgid "Show VC entries at editor menu" msgstr "Mostrar entradas de control de versións no menú do editor" -#: ../geanyvc/src/geanyvc.c:1871 +#: ../geanyvc/src/geanyvc.c:1927 msgid "Show entries for VC functions inside editor menu" msgstr "" "Mostra entradas para as funcións de control de versións dentro do menú do " "editor" -#: ../geanyvc/src/geanyvc.c:1876 +#: ../geanyvc/src/geanyvc.c:1932 msgid "Attach menu to menubar" msgstr "" -#: ../geanyvc/src/geanyvc.c:1878 +#: ../geanyvc/src/geanyvc.c:1934 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " "directly inside Geany's menubar.Will take in account after next start of " "GeanyVC" msgstr "" -#: ../geanyvc/src/geanyvc.c:1886 +#: ../geanyvc/src/geanyvc.c:1942 msgid "Enable CVS" msgstr "Habilitar CVS" -#: ../geanyvc/src/geanyvc.c:1891 +#: ../geanyvc/src/geanyvc.c:1947 msgid "Enable GIT" msgstr "Habilitar GIT" -#: ../geanyvc/src/geanyvc.c:1896 +#: ../geanyvc/src/geanyvc.c:1952 msgid "Enable SVN" msgstr "Habilitar SVN" -#: ../geanyvc/src/geanyvc.c:1901 +#: ../geanyvc/src/geanyvc.c:1957 msgid "Enable SVK" msgstr "Habilitar SVK" -#: ../geanyvc/src/geanyvc.c:1906 +#: ../geanyvc/src/geanyvc.c:1962 msgid "Enable Bazaar" msgstr "Habilitar Bazaar" -#: ../geanyvc/src/geanyvc.c:1911 +#: ../geanyvc/src/geanyvc.c:1967 msgid "Enable Mercurial" msgstr "Habilitar Mercurial" -#: ../geanyvc/src/geanyvc.c:1917 +#: ../geanyvc/src/geanyvc.c:1973 msgid "Spellcheck language" msgstr "Idioma para a revisión ortográfica" -#: ../geanyvc/src/geanyvc.c:2008 +#: ../geanyvc/src/geanyvc.c:2064 msgid "_VC file Actions" msgstr "" #. Diff of current file #. Diff of the current dir #. Complete diff of base directory -#: ../geanyvc/src/geanyvc.c:2014 ../geanyvc/src/geanyvc.c:2091 -#: ../geanyvc/src/geanyvc.c:2131 +#: ../geanyvc/src/geanyvc.c:2070 ../geanyvc/src/geanyvc.c:2147 +#: ../geanyvc/src/geanyvc.c:2187 msgid "_Diff" msgstr "_Diff" -#: ../geanyvc/src/geanyvc.c:2017 +#: ../geanyvc/src/geanyvc.c:2073 msgid "Make a diff from the current active file" msgstr "Fader un diff a partir do ficheiro activo actualmente" #. Revert current file #. Revert current dir #. Revert everything -#: ../geanyvc/src/geanyvc.c:2022 ../geanyvc/src/geanyvc.c:2100 -#: ../geanyvc/src/geanyvc.c:2139 +#: ../geanyvc/src/geanyvc.c:2078 ../geanyvc/src/geanyvc.c:2156 +#: ../geanyvc/src/geanyvc.c:2195 msgid "_Revert" msgstr "_Reverter" -#: ../geanyvc/src/geanyvc.c:2025 +#: ../geanyvc/src/geanyvc.c:2081 msgid "Restore pristine working copy file (undo local edits)." msgstr "" "Restaurar o ficheiro limpo da copia de traballo (desfacer edicións locais)." #. Blame for current file -#: ../geanyvc/src/geanyvc.c:2034 +#: ../geanyvc/src/geanyvc.c:2090 msgid "_Blame" msgstr "_Blame" -#: ../geanyvc/src/geanyvc.c:2037 +#: ../geanyvc/src/geanyvc.c:2093 msgid "Shows the changes made at one file per revision and author." msgstr "Mostra os cambios feitos nun ficheiro por revisión e autor." #. History/log of current file #. History/log of the current dir #. Complete History/Log of base directory -#: ../geanyvc/src/geanyvc.c:2044 ../geanyvc/src/geanyvc.c:2110 -#: ../geanyvc/src/geanyvc.c:2151 +#: ../geanyvc/src/geanyvc.c:2100 ../geanyvc/src/geanyvc.c:2166 +#: ../geanyvc/src/geanyvc.c:2207 msgid "_History (log)" msgstr "_Historial (rexistro)" -#: ../geanyvc/src/geanyvc.c:2047 +#: ../geanyvc/src/geanyvc.c:2103 msgid "Shows the log of the current file" msgstr "Mostra o rexistro do ficheiro actual" #. base version of the current file -#: ../geanyvc/src/geanyvc.c:2052 +#: ../geanyvc/src/geanyvc.c:2108 msgid "_Original" msgstr "_Orixinal" -#: ../geanyvc/src/geanyvc.c:2055 +#: ../geanyvc/src/geanyvc.c:2111 #, fuzzy msgid "Shows the original of the current file" msgstr "Mostra a versión orixinal do ficheiro actual" #. add current file -#: ../geanyvc/src/geanyvc.c:2063 +#: ../geanyvc/src/geanyvc.c:2119 msgid "_Add to Version Control" msgstr "Eng_adir ao control de versións" -#: ../geanyvc/src/geanyvc.c:2065 +#: ../geanyvc/src/geanyvc.c:2121 msgid "Add file to repository." msgstr "Engadir o ficheiro ao repositorio." #. remove current file -#: ../geanyvc/src/geanyvc.c:2071 +#: ../geanyvc/src/geanyvc.c:2127 msgid "_Remove from Version Control" msgstr "Elimina_r do control de versións" -#: ../geanyvc/src/geanyvc.c:2073 +#: ../geanyvc/src/geanyvc.c:2129 msgid "Remove file from repository." msgstr "Eliminar ficheiro do repositorio." -#: ../geanyvc/src/geanyvc.c:2088 +#: ../geanyvc/src/geanyvc.c:2144 msgid "_Directory" msgstr "_Directorio" -#: ../geanyvc/src/geanyvc.c:2094 +#: ../geanyvc/src/geanyvc.c:2150 msgid "Make a diff from the directory of the current active file" msgstr "Facer un diff a partir do directorio do ficheiro activo actual" -#: ../geanyvc/src/geanyvc.c:2103 +#: ../geanyvc/src/geanyvc.c:2159 msgid "Restore original files in the current folder (undo local edits)." msgstr "" "Restaurar os ficheiros orixinais no directorio actual (desfacer as edicións " "locais)." -#: ../geanyvc/src/geanyvc.c:2113 +#: ../geanyvc/src/geanyvc.c:2169 msgid "Shows the log of the current directory" msgstr "Mostra o rexistro do directorio actual" -#: ../geanyvc/src/geanyvc.c:2127 +#: ../geanyvc/src/geanyvc.c:2183 msgid "_Base Directory" msgstr "Directorio _base" -#: ../geanyvc/src/geanyvc.c:2133 +#: ../geanyvc/src/geanyvc.c:2189 msgid "Make a diff from the top VC directory" msgstr "Facer un diff a partir do directorio máis alto do control de versións" -#: ../geanyvc/src/geanyvc.c:2141 +#: ../geanyvc/src/geanyvc.c:2197 msgid "Revert any local edits." msgstr "REverter todas as edicións locais." -#: ../geanyvc/src/geanyvc.c:2154 +#: ../geanyvc/src/geanyvc.c:2210 msgid "Shows the log of the top VC directory" msgstr "Mostra o rexistro do directorio máis alto do control de versións" -#: ../geanyvc/src/geanyvc.c:2180 +#: ../geanyvc/src/geanyvc.c:2236 msgid "VC _Commit" msgstr "" -#: ../geanyvc/src/geanyvc.c:2215 +#: ../geanyvc/src/geanyvc.c:2271 msgid "Show diff of file" msgstr "Mostrar o diff do ficheiro" -#: ../geanyvc/src/geanyvc.c:2217 +#: ../geanyvc/src/geanyvc.c:2273 msgid "Show diff of directory" msgstr "Mostrar o diff do directorio" -#: ../geanyvc/src/geanyvc.c:2219 +#: ../geanyvc/src/geanyvc.c:2275 msgid "Show diff of basedir" msgstr "Mostrar un diff do directorio base" -#: ../geanyvc/src/geanyvc.c:2222 +#: ../geanyvc/src/geanyvc.c:2278 msgid "Commit changes" msgstr "" -#: ../geanyvc/src/geanyvc.c:2224 +#: ../geanyvc/src/geanyvc.c:2280 msgid "Show status" msgstr "Mostrar estado" -#: ../geanyvc/src/geanyvc.c:2226 +#: ../geanyvc/src/geanyvc.c:2282 msgid "Revert single file" msgstr "Reverter un único ficheiro" -#: ../geanyvc/src/geanyvc.c:2228 +#: ../geanyvc/src/geanyvc.c:2284 msgid "Revert directory" msgstr "Reverter o directorio" -#: ../geanyvc/src/geanyvc.c:2230 +#: ../geanyvc/src/geanyvc.c:2286 msgid "Revert base directory" msgstr "Reverter o directorio base" -#: ../geanyvc/src/geanyvc.c:2232 +#: ../geanyvc/src/geanyvc.c:2288 msgid "Update file" msgstr "Actualizar o ficheiro" -#: ../geanyvc/src/geanyvc.c:2260 +#: ../geanyvc/src/geanyvc.c:2316 msgid "_VC" msgstr "C_V" -#: ../geanyvc/src/geanyvc.c:2266 +#: ../geanyvc/src/geanyvc.c:2322 #, fuzzy msgid "_Version Control" msgstr "Eng_adir ao control de versións" #. Status of basedir -#: ../geanyvc/src/geanyvc.c:2288 +#: ../geanyvc/src/geanyvc.c:2344 msgid "_Status" msgstr "E_stado" -#: ../geanyvc/src/geanyvc.c:2290 +#: ../geanyvc/src/geanyvc.c:2346 msgid "Show status." msgstr "Mostrar estado." -#: ../geanyvc/src/geanyvc.c:2297 +#: ../geanyvc/src/geanyvc.c:2353 msgid "Update from remote repository." msgstr "Actualizar dende o repositorio remoto." #. Commit all changes -#: ../geanyvc/src/geanyvc.c:2302 +#: ../geanyvc/src/geanyvc.c:2358 msgid "_Commit" msgstr "" -#: ../geanyvc/src/geanyvc.c:2304 +#: ../geanyvc/src/geanyvc.c:2360 msgid "Commit changes." msgstr "" @@ -4752,104 +4882,261 @@ "tab." msgstr "" -#: ../gproject/src/gproject-sidebar.c:81 -#: ../gproject/src/gproject-sidebar.c:792 +#: ../gproject/src/gproject-sidebar.c:90 +#: ../gproject/src/gproject-sidebar.c:838 #, fuzzy msgid "Find File" msgstr "Engadir ficheiro" -#: ../gproject/src/gproject-sidebar.c:108 +#: ../gproject/src/gproject-sidebar.c:117 #, fuzzy msgid "Search inside:" msgstr "Elementos de busca:" -#: ../gproject/src/gproject-sidebar.c:120 +#: ../gproject/src/gproject-sidebar.c:129 msgid "C_ase sensitive" msgstr "" -#: ../gproject/src/gproject-sidebar.c:123 +#: ../gproject/src/gproject-sidebar.c:132 msgid "Search in full path" msgstr "" -#: ../gproject/src/gproject-sidebar.c:702 +#: ../gproject/src/gproject-sidebar.c:745 #, fuzzy msgid "Reload all" msgstr "Expandir todos" -#: ../gproject/src/gproject-sidebar.c:711 -#: ../treebrowser/src/treebrowser.c:1282 +#: ../gproject/src/gproject-sidebar.c:754 +#: ../treebrowser/src/treebrowser.c:1281 msgid "Expand all" msgstr "Expandir todos" -#: ../gproject/src/gproject-sidebar.c:717 -#: ../treebrowser/src/treebrowser.c:1286 +#: ../gproject/src/gproject-sidebar.c:761 +#: ../treebrowser/src/treebrowser.c:1285 msgid "Collapse all" msgstr "Contraer todos" -#: ../gproject/src/gproject-sidebar.c:726 +#: ../gproject/src/gproject-sidebar.c:771 msgid "Follow active editor" msgstr "" -#: ../gproject/src/gproject-sidebar.c:774 +#: ../gproject/src/gproject-sidebar.c:820 #, fuzzy msgid "Expand All" msgstr "Expandir todos" -#: ../gproject/src/gproject-sidebar.c:783 -#: ../treebrowser/src/treebrowser.c:1234 +#: ../gproject/src/gproject-sidebar.c:829 #, fuzzy msgid "Find in Files" msgstr "Procurar en todo o proxecto " #. POSITION OF VIEW -#: ../markdown/src/conf.c:570 +#: ../markdown/src/conf.c:567 #, fuzzy msgid "Position:" msgstr "Edición" -#: ../markdown/src/conf.c:576 +#: ../markdown/src/conf.c:573 #, fuzzy msgid "Sidebar" msgstr "_Ocultar a barra lateral" -#: ../markdown/src/conf.c:584 +#: ../markdown/src/conf.c:581 #, fuzzy msgid "Message Window" msgstr "_Ocultar a xanela de mensaxes" -#: ../markdown/src/conf.c:598 +#: ../markdown/src/conf.c:595 msgid "Font:" msgstr "" -#: ../markdown/src/conf.c:616 +#: ../markdown/src/conf.c:612 msgid "Code Font:" msgstr "" -#: ../markdown/src/conf.c:634 +#: ../markdown/src/conf.c:629 msgid "BG Color:" msgstr "" -#: ../markdown/src/conf.c:651 +#: ../markdown/src/conf.c:645 msgid "FG Color:" msgstr "" -#: ../markdown/src/conf.c:670 +#: ../markdown/src/conf.c:663 #, fuzzy msgid "Select Template File" msgstr "Seleccionar ata a liña" -#: ../markdown/src/plugin.c:33 +#: ../markdown/src/plugin.c:35 msgid "Real-time Markdown preview" msgstr "" -#: ../markdown/src/plugin.c:49 +#: ../markdown/src/plugin.c:51 msgid "Markdown Preview" msgstr "" -#: ../markdown/src/plugin.c:160 +#: ../markdown/src/plugin.c:162 msgid "The current document does not have a Markdown filetype." msgstr "" +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:35 +msgid "Pair Tag Highlighter" +msgstr "" + +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:36 +msgid "Finds and highlights matching opening/closing HTML tag" +msgstr "" + +#: ../pohelper/data/menus.ui.h:1 +msgid "_Translation Helper" +msgstr "" + +#: ../pohelper/data/menus.ui.h:2 +msgid "_Previous String" +msgstr "" + +#: ../pohelper/data/menus.ui.h:3 ../pohelper/src/gph-plugin.c:1031 +#, fuzzy +msgid "Go to previous string" +msgstr "Volver ó diálogo anterior" + +#: ../pohelper/data/menus.ui.h:4 +msgid "_Next String" +msgstr "" + +#: ../pohelper/data/menus.ui.h:5 ../pohelper/src/gph-plugin.c:1034 +#, fuzzy +msgid "Go to next string" +msgstr "Pasar á liña seguinte" + +#: ../pohelper/data/menus.ui.h:6 +msgid "Pre_vious Untranslated" +msgstr "" + +#: ../pohelper/data/menus.ui.h:7 ../pohelper/src/gph-plugin.c:1037 +msgid "Go to previous untranslated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:8 +msgid "Next _Untranslated" +msgstr "" + +#: ../pohelper/data/menus.ui.h:9 ../pohelper/src/gph-plugin.c:1040 +msgid "Go to next untranslated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:10 +msgid "Previous Fu_zzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:11 ../pohelper/src/gph-plugin.c:1043 +msgid "Go to previous fuzzily translated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:12 +msgid "Next _Fuzzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:13 ../pohelper/src/gph-plugin.c:1046 +msgid "Go to next fuzzily translated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:14 +msgid "Previous Untranslated or Fuzz_y" +msgstr "" + +#: ../pohelper/data/menus.ui.h:15 ../pohelper/src/gph-plugin.c:1049 +msgid "Go to previous untranslated or fuzzy string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:16 +msgid "Next Untranslated _or Fuzzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:17 ../pohelper/src/gph-plugin.c:1053 +msgid "Go to next untranslated or fuzzy string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:18 ../pohelper/src/gph-plugin.c:1064 +#, fuzzy +msgid "Toggle current translation fuzziness" +msgstr "Tipo de documentación" + +#: ../pohelper/data/menus.ui.h:19 +msgid "_Toggle Fuzziness" +msgstr "" + +#: ../pohelper/data/menus.ui.h:20 +msgid "Paste _Message as Translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:21 +msgid "Paste the original untranslated string to the translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:22 ../pohelper/src/gph-plugin.c:1061 +msgid "Reflow the current translation string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:23 +msgid "_Reflow Translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:24 +msgid "" +"Whether to update the translation headers (author, revision date, ...) upon " +"file save" +msgstr "" + +#: ../pohelper/data/menus.ui.h:25 +msgid "Update _Headers Upon Save" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:41 +msgid "Translation Helper" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:42 +msgid "Improves support for GetText translation files." +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1057 +msgid "Paste original untranslated string to translation" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1099 +#, fuzzy, c-format +msgid "Failed to load configuration file: %s" +msgstr "Produciuse un erro ao cargar a configuración: %s" + +#: ../pohelper/src/gph-plugin.c:1124 +#, fuzzy, c-format +msgid "Failed to create configuration directory \"%s\": %s" +msgstr "" +"Non foi posíbel atopar un ficheiro de configuración para o tipo de ficheiro " +"\"%s\": %s" + +#: ../pohelper/src/gph-plugin.c:1127 +#, fuzzy, c-format +msgid "Failed to save configuration file: %s" +msgstr "Produciuse un erro ao gardar a configuración: %s" + +#: ../pohelper/src/gph-plugin.c:1182 +#, fuzzy, c-format +msgid "" +"Failed to load UI definition, please check your installation. The error was: " +"%s" +msgstr "" +"O complemento %s non foi cargado adecuadamente.\n" +"Comprobe a súa instalación." + +#: ../pohelper/src/gph-plugin.c:1222 +#, c-format +msgid "" +"Cannot find widget \"%s\" in the UI definition, please check your " +"installation." +msgstr "" + #: ../pretty-printer/src/PluginEntry.c:37 msgid "XML PrettyPrinter" msgstr "" @@ -5211,283 +5498,355 @@ msgstr "" #: ../scope/data/scope.glade.h:64 -msgid "_Evaluate/Modify" +msgid "_Raw" msgstr "" #: ../scope/data/scope.glade.h:65 -msgid "_Watch Expression" +msgid "_Evaluate/Modify" msgstr "" #: ../scope/data/scope.glade.h:66 -#, fuzzy -msgid "_Inspect Variable" -msgstr "Contornos" +msgid "_Watch Expression" +msgstr "" #: ../scope/data/scope.glade.h:67 #, fuzzy -msgid "Program Terminal" -msgstr "Executar nun terminal" +msgid "_Inspect Variable" +msgstr "Contornos" #: ../scope/data/scope.glade.h:68 msgid "Threads" msgstr "" -#: ../scope/data/scope.glade.h:70 +#: ../scope/data/scope.glade.h:69 #, fuzzy msgid "Stack" msgstr "_Disposición" -#: ../scope/data/scope.glade.h:71 +#: ../scope/data/scope.glade.h:70 msgid "Locals" msgstr "" -#: ../scope/data/scope.glade.h:72 +#: ../scope/data/scope.glade.h:71 #, fuzzy msgid "Watches" msgstr "Puntos de vixilancia" -#: ../scope/data/scope.glade.h:73 +#: ../scope/data/scope.glade.h:72 msgid "Memory" msgstr "" -#: ../scope/data/scope.glade.h:74 -#, fuzzy -msgid "Debug Console" -msgstr "Consola:" - -#: ../scope/data/scope.glade.h:75 +#: ../scope/data/scope.glade.h:73 #, fuzzy msgid "Enter gdb command:" msgstr "Inserir orde" -#: ../scope/data/scope.glade.h:76 +#: ../scope/data/scope.glade.h:74 #, fuzzy msgid "Convert _UTF-8 to locale" msgstr "Formatar a selección aliñándoa á esquerda" -#: ../scope/data/scope.glade.h:77 +#: ../scope/data/scope.glade.h:75 msgid "_Thread" msgstr "" -#: ../scope/data/scope.glade.h:78 +#: ../scope/data/scope.glade.h:76 msgid "_Group" msgstr "" -#: ../scope/data/scope.glade.h:79 +#: ../scope/data/scope.glade.h:77 #, fuzzy msgid "_Frame" msgstr "Información do marco" -#: ../scope/data/scope.glade.h:80 +#: ../scope/data/scope.glade.h:78 #, fuzzy msgid "Setup Program" msgstr "sen programa" -#: ../scope/data/scope.glade.h:81 +#: ../scope/data/scope.glade.h:79 msgid "_Executable:" msgstr "" -#: ../scope/data/scope.glade.h:82 +#: ../scope/data/scope.glade.h:80 msgid "_Arguments:" msgstr "" -#: ../scope/data/scope.glade.h:83 +#: ../scope/data/scope.glade.h:81 #, fuzzy msgid "En_vironment:" msgstr "Contorno:" -#: ../scope/data/scope.glade.h:84 +#: ../scope/data/scope.glade.h:82 msgid "_Working dir:" msgstr "" -#: ../scope/data/scope.glade.h:85 +#: ../scope/data/scope.glade.h:83 #, fuzzy msgid "_Load script:" msgstr "Scripts _Lua" -#: ../scope/data/scope.glade.h:86 +#: ../scope/data/scope.glade.h:84 msgid "Auto _run program/exit gdb" msgstr "" -#: ../scope/data/scope.glade.h:87 +#: ../scope/data/scope.glade.h:85 msgid "_Non-stop mode" msgstr "" -#: ../scope/data/scope.glade.h:88 -msgid "_Temporary breakpoint at:" +#: ../scope/data/scope.glade.h:86 +msgid "_Temporary breakpoint on load at:" msgstr "" -#: ../scope/data/scope.glade.h:89 -msgid "_Delete all breakpoints, watches and inspects" +#: ../scope/data/scope.glade.h:87 +msgid "_Delete all breakpoints, watches, inspects and registers" msgstr "" -#: ../scope/data/scope.glade.h:90 ../scope/src/prefs.c:337 +#: ../scope/data/scope.glade.h:88 ../scope/src/scope.c:522 #, fuzzy msgid "Program" msgstr "sen programa" -#: ../scope/data/scope.glade.h:91 +#: ../scope/data/scope.glade.h:89 #, fuzzy msgid "Open on" msgstr "Abrir URI" -#: ../scope/data/scope.glade.h:92 +#: ../scope/data/scope.glade.h:90 #, fuzzy msgid "g_db load" msgstr "_Desactivar" -#: ../scope/data/scope.glade.h:93 +#: ../scope/data/scope.glade.h:91 msgid "p_rogram start" msgstr "" -#: ../scope/data/scope.glade.h:94 +#: ../scope/data/scope.glade.h:92 #, fuzzy msgid "Update all _views" msgstr "Actualizar a lista de tarefas" -#: ../scope/data/scope.glade.h:95 +#: ../scope/data/scope.glade.h:93 msgid "Panel" msgstr "" -#: ../scope/data/scope.glade.h:96 +#: ../scope/data/scope.glade.h:94 msgid "Default 8-bit text mode:" msgstr "" -#: ../scope/data/scope.glade.h:97 +#: ../scope/data/scope.glade.h:95 msgid "_7-bit \\nnn" msgstr "" -#: ../scope/data/scope.glade.h:98 +#: ../scope/data/scope.glade.h:96 msgid "Display" msgstr "" -#: ../scope/data/scope.glade.h:99 +#: ../scope/data/scope.glade.h:97 #, fuzzy msgid "_member" msgstr "Número" -#: ../scope/data/scope.glade.h:100 +#: ../scope/data/scope.glade.h:98 #, fuzzy msgid "and" msgstr "Tipo de letra inclinada" -#: ../scope/data/scope.glade.h:101 +#: ../scope/data/scope.glade.h:99 #, fuzzy msgid "_argument" msgstr "Enviar o docu_mento por correo" -#: ../scope/data/scope.glade.h:102 +#: ../scope/data/scope.glade.h:100 #, fuzzy msgid "names" msgstr "Renomear" -#: ../scope/data/scope.glade.h:103 +#: ../scope/data/scope.glade.h:101 msgid "Values" msgstr "" -#: ../scope/data/scope.glade.h:104 +#: ../scope/data/scope.glade.h:102 #, fuzzy msgid "E_xpand on apply" msgstr "Expandir todos" -#: ../scope/data/scope.glade.h:105 +#: ../scope/data/scope.glade.h:103 msgid "S_how" msgstr "" -#: ../scope/data/scope.glade.h:106 +#: ../scope/data/scope.glade.h:104 msgid "children" msgstr "" -#: ../scope/data/scope.glade.h:107 +#: ../scope/data/scope.glade.h:105 msgid "Inspect" msgstr "" -#: ../scope/data/scope.glade.h:108 +#: ../scope/data/scope.glade.h:106 msgid "Show =li_brary messages" msgstr "" -#: ../scope/data/scope.glade.h:109 +#: ../scope/data/scope.glade.h:107 #, fuzzy msgid "Show _tooltips" msgstr "Mostrar as indicacións." -#: ../scope/data/scope.glade.h:110 +#: ../scope/data/scope.glade.h:108 msgid "Others" msgstr "" -#: ../scope/data/scope.glade.h:111 +#: ../scope/data/scope.glade.h:109 #, fuzzy msgid "Options" msgstr "_Opcións" -#: ../scope/data/scope.glade.h:112 +#: ../scope/data/scope.glade.h:110 #, fuzzy msgid "_Import" msgstr "Informe" -#: ../scope/data/scope.glade.h:113 +#: ../scope/data/scope.glade.h:111 #, fuzzy msgid "Enter assignment expression:" msgstr "Expresión regular non válida: %s" -#: ../scope/data/scope.glade.h:114 +#: ../scope/data/scope.glade.h:112 msgid "Inspect" msgstr "" -#: ../scope/data/scope.glade.h:115 +#: ../scope/data/scope.glade.h:113 #, fuzzy msgid "Object:" msgstr "Información do obxecto" -#: ../scope/data/scope.glade.h:117 +#: ../scope/data/scope.glade.h:115 msgid "-" msgstr "" -#: ../scope/data/scope.glade.h:118 +#: ../scope/data/scope.glade.h:116 #, fuzzy msgid "Frame:" msgstr "Nome:" -#: ../scope/data/scope.glade.h:119 +#: ../scope/data/scope.glade.h:117 msgid "@" msgstr "" -#: ../scope/data/scope.glade.h:120 +#: ../scope/data/scope.glade.h:118 msgid "_Apply on run" msgstr "" -#: ../scope/data/scope.glade.h:121 +#: ../scope/data/scope.glade.h:119 #, fuzzy msgid "Expand" msgstr "Expandir todos" -#: ../scope/data/scope.glade.h:122 +#: ../scope/data/scope.glade.h:120 #, fuzzy msgid "Start:" msgstr "_Comezo:" -#: ../scope/data/scope.glade.h:123 +#: ../scope/data/scope.glade.h:121 msgid "Count:" msgstr "" -#: ../scope/data/scope.glade.h:124 +#: ../scope/data/scope.glade.h:122 #, fuzzy msgid "_Expand on apply" msgstr "Expandir todos" -#: ../scope/src/break.c:947 +#: ../scope/data/scope.glade.h:123 ../scope/src/scope.c:522 +#, fuzzy +msgid "Program Terminal" +msgstr "Executar nun terminal" + +#: ../scope/data/scope.glade.h:125 +msgid "Registers" +msgstr "" + +#: ../scope/src/break.c:97 +#, fuzzy +msgid "breakpoint" +msgstr "Puntos de interrupción" + +#: ../scope/src/break.c:98 +#, fuzzy +msgid "hardware breakpoint" +msgstr "Editar o punto de ruptura" + +#: ../scope/src/break.c:99 +#, fuzzy +msgid "tracepoint" +msgstr "punto de vixilancia" + +#: ../scope/src/break.c:100 +#, fuzzy +msgid "fast tracepoint" +msgstr "punto de vixilancia" + +#: ../scope/src/break.c:101 +#, fuzzy +msgid "write watchpoint" +msgstr "Editar o punto de vixilancia" + +#: ../scope/src/break.c:104 +#, fuzzy +msgid "access watchpoint" +msgstr "punto de vixilancia" + +#: ../scope/src/break.c:106 +#, fuzzy +msgid "read watchpoint" +msgstr "Editar o punto de vixilancia" + +#: ../scope/src/break.c:108 +#, fuzzy +msgid "catchpoint" +msgstr "punto de vixilancia" + +#: ../scope/src/break.c:135 ../scope/src/break.c:139 +msgid "CLI" +msgstr "" + +#: ../scope/src/break.c:136 +msgid "unsupported MI" +msgstr "" + +#: ../scope/src/break.c:141 +#, fuzzy +msgid "on load" +msgstr "_Desactivar" + +#: ../scope/src/break.c:142 +#, fuzzy +msgid "Run to Cursor" +msgstr "A conectar a %s" + +#: ../scope/src/break.c:1013 #, c-format msgid "" "There are two or more breakpoints at %s:%d.\n" +"\n" "Use the breakpoint list to remove the exact one." msgstr "" -#: ../scope/src/break.c:1200 +#: ../scope/src/break.c:1252 +#, c-format +msgid ", %s" +msgstr "" + +#: ../scope/src/break.c:1278 +#, c-format +msgid "func %s" +msgstr "" + +#: ../scope/src/break.c:1309 #, fuzzy msgid "Add Breakpoint" msgstr "Engadir punto de ruptura" -#: ../scope/src/break.c:1215 +#: ../scope/src/break.c:1324 #, fuzzy msgid "Add Watchpoint" msgstr "Engadir punto de vixilancia" @@ -5501,7 +5860,8 @@ msgid "Enter char # (0..255):" msgstr "" -#: ../scope/src/conterm.c:466 ../scope/src/scope.c:502 +#: ../scope/src/conterm.c:509 ../scope/src/scope.c:550 +#: ../scope/src/scope.c:551 #, fuzzy, c-format msgid "Scope: %s." msgstr "Pechar: %s" @@ -5521,65 +5881,66 @@ msgid "Program terminated." msgstr "Terminado" -#: ../scope/src/debug.c:468 +#: ../scope/src/debug.c:469 msgid "No breakpoints. Hanging." msgstr "" -#: ../scope/src/debug.c:596 ../scope/src/thread.c:97 +#: ../scope/src/debug.c:598 ../scope/src/thread.c:92 #, c-format msgid "%s." msgstr "" -#: ../scope/src/inspect.c:77 +#: ../scope/src/inspect.c:66 #, fuzzy msgid "..." msgstr "Máis..." -#: ../scope/src/inspect.c:324 +#: ../scope/src/inspect.c:339 #, fuzzy msgid "invalid data" msgstr "Etiqueta non válida" -#: ../scope/src/inspect.c:356 +#: ../scope/src/inspect.c:371 msgid "no children in range" msgstr "" -#: ../scope/src/inspect.c:440 +#: ../scope/src/inspect.c:454 #, fuzzy msgid "out of scope" msgstr "O punto de vixilancia #%s está fora de ámbito" -#: ../scope/src/inspect.c:587 +#: ../scope/src/inspect.c:627 msgid "Duplicate inspect variable name." msgstr "" -#: ../scope/src/memory.c:299 +#: ../scope/src/memory.c:292 msgid "Read Memory" msgstr "" -#: ../scope/src/memory.c:408 -msgid "Scope: pointer size > 8, Data disabled." +#: ../scope/src/memory.c:396 +#, c-format +msgid "Scope: pointer size > %d, Data disabled." msgstr "" -#: ../scope/src/menu.c:380 +#: ../scope/src/menu.c:375 msgid "Modify" msgstr "" -#: ../scope/src/menu.c:490 +#: ../scope/src/menu.c:481 msgid "Evaluate/modify" msgstr "" -#: ../scope/src/menu.c:491 +#: ../scope/src/menu.c:482 #, fuzzy msgid "Watch expression" msgstr "Expresión regular non válida: %s" -#: ../scope/src/menu.c:492 +#: ../scope/src/menu.c:483 #, fuzzy msgid "Inspect variable" msgstr "Variábeis locais" -#: ../scope/src/parse.c:416 +#: ../scope/src/parse.c:437 msgid "Undefined GDB error." msgstr "" @@ -5593,39 +5954,29 @@ msgid "Select File" msgstr "Seleccionar ficheiro" -#: ../scope/src/prefs.c:338 -#, fuzzy -msgid "Breaks" -msgstr "Puntos de interrupción" - -#: ../scope/src/prefs.c:339 -#, fuzzy -msgid "Console" -msgstr "Consola:" - -#: ../scope/src/prefs.c:347 ../scope/src/utils.c:570 +#: ../scope/src/prefs.c:294 ../scope/src/utils.c:438 #, c-format msgid "Scope: %s: %s." msgstr "" -#: ../scope/src/prefs.c:352 +#: ../scope/src/prefs.c:299 #, fuzzy msgid "Scope: created configuration file." msgstr "Forzar a recarga dos ficheiros de configuración" -#: ../scope/src/program.c:231 +#: ../scope/src/program.c:251 #, c-format msgid "Loaded debug settings for %s." msgstr "" -#: ../scope/src/program.c:239 +#: ../scope/src/program.c:259 #, fuzzy, c-format msgid "Could not load debug settings file %s: %s." msgstr "" "Produciuse un erro ao cargar o tipo de ficheiro \"%s\" dende o ficheiro \"%s" "\": %s" -#: ../scope/src/program.c:359 +#: ../scope/src/program.c:379 #, fuzzy, c-format msgid "" "%s: %s.\n" @@ -5633,15 +5984,15 @@ "Continue?" msgstr "Contando..." -#: ../scope/src/program.c:394 -msgid "Delete all breakpoints, watches and inspects?" +#: ../scope/src/program.c:415 +msgid "Delete all breakpoints, watches et cetera?" msgstr "" -#: ../scope/src/program.c:501 +#: ../scope/src/program.c:523 msgid "as _Name=value" msgstr "" -#: ../scope/src/program.c:502 +#: ../scope/src/program.c:524 msgid "as _Name = value" msgstr "" @@ -5651,169 +6002,184 @@ msgstr "Depurar" #: ../scope/src/scope.c:35 -msgid "Simple GDB front-end." +msgid "Relatively simple GDB front-end." msgstr "" -#: ../scope/src/scope.c:63 +#: ../scope/src/scope.c:62 #, fuzzy msgid "Setup program" msgstr "sen programa" -#: ../scope/src/scope.c:64 +#: ../scope/src/scope.c:63 #, fuzzy msgid "Run/continue" msgstr "Contando..." -#: ../scope/src/scope.c:66 +#: ../scope/src/scope.c:65 #, fuzzy msgid "Run to source" msgstr "A conectar a %s" -#: ../scope/src/scope.c:70 +#: ../scope/src/scope.c:69 #, fuzzy msgid "Terminate" msgstr "Terminado" -#: ../scope/src/scope.c:71 +#: ../scope/src/scope.c:70 #, fuzzy msgid "Toggle breakpoint" msgstr "punto de interrupción" -#: ../scope/src/scope.c:73 ../scope/src/scope.c:76 +#: ../scope/src/scope.c:72 ../scope/src/scope.c:75 #, fuzzy msgid "GDB command" msgstr "Inserir orde" -#: ../scope/src/scope.c:74 +#: ../scope/src/scope.c:73 #, fuzzy msgid "Show terminal" msgstr "Executar nun terminal" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Busy" msgstr "" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Ready" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Hang" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Assem" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 #, fuzzy msgid "Load" msgstr "_Carga" -#: ../scope/src/scope.c:394 +#: ../scope/src/scope.c:421 msgid "Build action activated. Terminate debugging?" msgstr "" -#: ../scope/src/thread.c:58 +#: ../scope/src/scope.c:524 +#, fuzzy +msgid "Breaks" +msgstr "Puntos de interrupción" + +#: ../scope/src/scope.c:526 +#, fuzzy +msgid "Console" +msgstr "Consola:" + +#: ../scope/src/scope.c:526 +#, fuzzy +msgid "Debug Console" +msgstr "Consola:" + +#: ../scope/src/thread.c:48 #, c-format msgid "Thread group %s started." msgstr "" -#: ../scope/src/thread.c:76 +#: ../scope/src/thread.c:63 msgid "Thread group " msgstr "" -#: ../scope/src/thread.c:88 +#: ../scope/src/thread.c:83 msgid " exited" msgstr "" -#: ../scope/src/thread.c:91 +#: ../scope/src/thread.c:86 #, c-format msgid " with exit code %s" msgstr "" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 #, fuzzy msgid "Send Signal" msgstr "Enviar por correo" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 msgid "Enter signal #:" msgstr "" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Terminate Process" msgstr "" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Enter exit code:" msgstr "" -#: ../scope/src/thread.c:937 +#: ../scope/src/thread.c:891 #, fuzzy msgid "Running" msgstr "Executando" -#: ../scope/src/thread.c:938 +#: ../scope/src/thread.c:892 #, fuzzy msgid "Stopped" msgstr "Detido" -#: ../scope/src/utils.c:44 -#, c-format -msgid "%s: error %lu." -msgstr "" +#: ../scope/src/utils.c:45 +#, fuzzy, c-format +msgid "%s: %s" +msgstr "%s:%u:%u: %s" -#: ../scope/src/utils.c:358 +#: ../scope/src/utils.c:225 #, c-format msgid "Scope: error reading [%s]." msgstr "" -#: ../scope/src/views.c:505 +#: ../scope/src/views.c:526 msgid "…" msgstr "" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Send" msgstr "" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Busy" msgstr "" -#: ../scope/src/views.c:535 +#: ../scope/src/views.c:558 #, fuzzy msgid "GDB Command" msgstr "Orde 0:" -#: ../spellcheck/src/speller.c:94 +#: ../spellcheck/src/speller.c:180 msgid "Try: " msgstr "Probe:" -#: ../spellcheck/src/speller.c:173 +#: ../spellcheck/src/speller.c:252 msgid "Checking" msgstr "Verificando..." -#: ../spellcheck/src/speller.c:186 +#: ../spellcheck/src/speller.c:265 #, c-format msgid "Checking file \"%s\" (lines %d to %d using %s):" msgstr "Verificando o ficheiro\"%s\" (liñas %d a %d, usando %s):" -#: ../spellcheck/src/speller.c:196 +#: ../spellcheck/src/speller.c:275 #, c-format msgid "Checking file \"%s\" (using %s):" msgstr "Verificando o ficheiro \"%s\" (usando %s):" -#: ../spellcheck/src/speller.c:223 +#: ../spellcheck/src/speller.c:302 msgid "The checked text is spelled correctly." msgstr "O texto verificado non ten erros ortográficos" -#: ../spellcheck/src/speller.c:233 +#: ../spellcheck/src/speller.c:312 #, c-format msgid "The Enchant library couldn't be initialized (%s)." msgstr "Non se puido iniciar a biblioteca Enchant (%s)." -#: ../spellcheck/src/speller.c:234 +#: ../spellcheck/src/speller.c:313 msgid "unknown error (maybe the chosen language is not available)" msgstr "" "Produciuse un erro descoñecido (poida que o idioma escollido non estea " @@ -5912,19 +6278,19 @@ msgid "Ignore All" msgstr "Ignorar Todo" -#: ../spellcheck/src/gui.c:521 +#: ../spellcheck/src/gui.c:526 #, c-format msgid "Default (%s)" msgstr "Predeterminado (%s)" -#: ../spellcheck/src/gui.c:532 +#: ../spellcheck/src/gui.c:537 #, c-format msgid "Toggle spell check while typing (current language: %s)" msgstr "" "Intercambiar a verificación ortográfica mentres se escribe (o idioma actual " "é: %s)" -#: ../spellcheck/src/gui.c:587 +#: ../spellcheck/src/gui.c:592 msgid "Spelling Suggestions" msgstr "Recomendacións de Ortografía" @@ -5955,158 +6321,164 @@ #. OK. Something went not as expected. #. * We did have a selection but cannot parse it into rows. #. * Aborting -#: ../tableconvert/src/tableconvert.c:236 +#: ../tableconvert/src/tableconvert.c:237 msgid "Something went wrong on parsing selection. Aborting" msgstr "" -#: ../tableconvert/src/tableconvert.c:268 +#: ../tableconvert/src/tableconvert.c:269 #, fuzzy msgid "Convert selection to table" msgstr "Formatar a selección aliñándoa á esquerda" #. Build up menu entry -#: ../tableconvert/src/tableconvert.c:281 +#: ../tableconvert/src/tableconvert.c:282 msgid "_Convert to table" msgstr "" -#: ../tableconvert/src/tableconvert.c:284 +#: ../tableconvert/src/tableconvert.c:285 msgid "Converts current marked list to a table." msgstr "" -#: ../treebrowser/src/treebrowser.c:120 +#: ../treebrowser/src/treebrowser.c:124 #, fuzzy msgid "TreeBrowser" msgstr "Explorador en árbore" -#: ../treebrowser/src/treebrowser.c:121 +#: ../treebrowser/src/treebrowser.c:125 msgid "" "This plugin adds a tree browser to Geany, allowing the user to browse files " "using a tree view of the directory being browsed." msgstr "" -#: ../treebrowser/src/treebrowser.c:430 +#: ../treebrowser/src/treebrowser.c:434 #, fuzzy, c-format msgid "%s: no such directory." msgstr "%s: non hai tal ficheiro ou directorio" -#: ../treebrowser/src/treebrowser.c:526 ../treebrowser/src/treebrowser.c:561 -#: ../treebrowser/src/treebrowser.c:663 +#: ../treebrowser/src/treebrowser.c:537 ../treebrowser/src/treebrowser.c:572 +#: ../treebrowser/src/treebrowser.c:670 #, fuzzy msgid "(Empty)" msgstr "Baleiro" -#: ../treebrowser/src/treebrowser.c:966 +#: ../treebrowser/src/treebrowser.c:971 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Non foi posíbel executar a orde externa configurada '%s' (%s)" -#: ../treebrowser/src/treebrowser.c:1037 +#: ../treebrowser/src/treebrowser.c:1042 msgid "NewDirectory" msgstr "NovoDirectorio" -#: ../treebrowser/src/treebrowser.c:1039 +#: ../treebrowser/src/treebrowser.c:1044 msgid "NewFile" msgstr "NovoFicheiro" -#: ../treebrowser/src/treebrowser.c:1044 +#: ../treebrowser/src/treebrowser.c:1049 #, c-format msgid "" "Target file '%s' exists\n" ", do you really want to replace it with empty file?" msgstr "" -#: ../treebrowser/src/treebrowser.c:1089 +#: ../treebrowser/src/treebrowser.c:1095 #, c-format msgid "Do you really want to delete '%s' ?" msgstr "Está seguro de que desexa borrar '%s' ?" -#: ../treebrowser/src/treebrowser.c:1208 ../treebrowser/src/treebrowser.c:1692 +#: ../treebrowser/src/treebrowser.c:1207 ../treebrowser/src/treebrowser.c:1738 msgid "Go up" msgstr "Subir" -#: ../treebrowser/src/treebrowser.c:1212 ../treebrowser/src/treebrowser.c:1707 +#: ../treebrowser/src/treebrowser.c:1211 ../treebrowser/src/treebrowser.c:1753 msgid "Set path from document" msgstr "Definir camiño a partir de documento" -#: ../treebrowser/src/treebrowser.c:1216 -msgid "Open externally" +#: ../treebrowser/src/treebrowser.c:1215 +#, fuzzy +msgid "_Open externally" msgstr "Abrir externamente" -#: ../treebrowser/src/treebrowser.c:1221 +#: ../treebrowser/src/treebrowser.c:1220 msgid "Open Terminal" msgstr "Abrir terminal" -#: ../treebrowser/src/treebrowser.c:1225 +#: ../treebrowser/src/treebrowser.c:1224 msgid "Set as root" msgstr "Definir como raíz" -#: ../treebrowser/src/treebrowser.c:1230 ../treebrowser/src/treebrowser.c:1697 -#: ../treebrowser/src/treebrowser.c:2060 +#: ../treebrowser/src/treebrowser.c:1229 ../treebrowser/src/treebrowser.c:1743 +#: ../treebrowser/src/treebrowser.c:2123 msgid "Refresh" msgstr "Actualizar" -#: ../treebrowser/src/treebrowser.c:1242 +#: ../treebrowser/src/treebrowser.c:1233 +#, fuzzy +msgid "_Find in Files" +msgstr "Procurar en todo o proxecto " + +#: ../treebrowser/src/treebrowser.c:1241 msgid "Create new directory" msgstr "Crear un directorio novo" -#: ../treebrowser/src/treebrowser.c:1246 +#: ../treebrowser/src/treebrowser.c:1245 msgid "Create new file" msgstr "Crear un ficheiro novo" -#: ../treebrowser/src/treebrowser.c:1250 +#: ../treebrowser/src/treebrowser.c:1249 msgid "Rename" msgstr "Renomear" -#: ../treebrowser/src/treebrowser.c:1255 +#: ../treebrowser/src/treebrowser.c:1254 msgid "Delete" msgstr "Borrar" -#: ../treebrowser/src/treebrowser.c:1263 +#: ../treebrowser/src/treebrowser.c:1262 #, c-format msgid "Close: %s" msgstr "Pechar: %s" -#: ../treebrowser/src/treebrowser.c:1268 +#: ../treebrowser/src/treebrowser.c:1267 #, fuzzy, c-format msgid "Close Child Documents " msgstr "Pec_har os outros documentos" -#: ../treebrowser/src/treebrowser.c:1273 +#: ../treebrowser/src/treebrowser.c:1272 #, fuzzy -msgid "Copy full path to clipboard" +msgid "_Copy full path to clipboard" msgstr "Copiar o camiño completo" -#: ../treebrowser/src/treebrowser.c:1293 ../treebrowser/src/treebrowser.c:1974 +#: ../treebrowser/src/treebrowser.c:1292 ../treebrowser/src/treebrowser.c:2032 msgid "Show bookmarks" msgstr "Mostrar marcadores" -#: ../treebrowser/src/treebrowser.c:1298 ../treebrowser/src/treebrowser.c:1928 +#: ../treebrowser/src/treebrowser.c:1297 ../treebrowser/src/treebrowser.c:1981 msgid "Show hidden files" msgstr "Mostrar os ficheiros ocultos" -#: ../treebrowser/src/treebrowser.c:1303 +#: ../treebrowser/src/treebrowser.c:1302 #, fuzzy msgid "Show toolbars" msgstr "Mostrar barras" -#: ../treebrowser/src/treebrowser.c:1574 +#: ../treebrowser/src/treebrowser.c:1621 #, c-format msgid "Target file '%s' exists, do you really want to replace it?" msgstr "" -#: ../treebrowser/src/treebrowser.c:1702 +#: ../treebrowser/src/treebrowser.c:1748 msgid "Home" msgstr "Inicio" -#: ../treebrowser/src/treebrowser.c:1712 +#: ../treebrowser/src/treebrowser.c:1758 msgid "Track path" msgstr "RExistrar camiño" -#: ../treebrowser/src/treebrowser.c:1717 +#: ../treebrowser/src/treebrowser.c:1763 msgid "Hide bars" msgstr "Ocultar barras" -#: ../treebrowser/src/treebrowser.c:1727 +#: ../treebrowser/src/treebrowser.c:1773 msgid "" "Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' " "reverse try for example this '!;*.c;*.h;*.cpp'" @@ -6114,19 +6486,19 @@ "Filtrar (*.c;*.h;*.cpp), e se quere filtrar temporalmente usando o '!' " "inverso. Por exemplo pode probar o seguinte: '!;*.c;*.h;*.cpp'" -#: ../treebrowser/src/treebrowser.c:1735 +#: ../treebrowser/src/treebrowser.c:1781 msgid "Addressbar for example '/projects/my-project'" msgstr "Barra de enderezo, por exemplo '/proxectos/o-meu-proxecto'" -#: ../treebrowser/src/treebrowser.c:1760 +#: ../treebrowser/src/treebrowser.c:1806 msgid "Tree Browser" msgstr "Explorador en árbore" -#: ../treebrowser/src/treebrowser.c:1892 +#: ../treebrowser/src/treebrowser.c:1945 msgid "External open command" msgstr "Orde externa para abrir" -#: ../treebrowser/src/treebrowser.c:1897 +#: ../treebrowser/src/treebrowser.c:1950 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -6140,57 +6512,57 @@ "%f substituirase polo nome do ficheiro incluíndo o camiño completo\n" "%d substiruirase polo camiño ao ficheiro seleccionado, sen o nome de ficheiro" -#: ../treebrowser/src/treebrowser.c:1905 +#: ../treebrowser/src/treebrowser.c:1958 msgid "Toolbar" msgstr "" -#: ../treebrowser/src/treebrowser.c:1907 +#: ../treebrowser/src/treebrowser.c:1960 msgid "Hidden" msgstr "" -#: ../treebrowser/src/treebrowser.c:1908 +#: ../treebrowser/src/treebrowser.c:1961 msgid "Top" msgstr "" -#: ../treebrowser/src/treebrowser.c:1909 +#: ../treebrowser/src/treebrowser.c:1962 msgid "Bottom" msgstr "" -#: ../treebrowser/src/treebrowser.c:1914 +#: ../treebrowser/src/treebrowser.c:1967 #, fuzzy msgid "If position is changed, the option require plugin restart." msgstr "Mostrar barras no alto (require o reinicio do complemento)" -#: ../treebrowser/src/treebrowser.c:1918 +#: ../treebrowser/src/treebrowser.c:1971 #, fuzzy msgid "Show icons" msgstr "Mostrar iconas." -#: ../treebrowser/src/treebrowser.c:1920 +#: ../treebrowser/src/treebrowser.c:1973 msgid "None" msgstr "" -#: ../treebrowser/src/treebrowser.c:1921 +#: ../treebrowser/src/treebrowser.c:1974 #, fuzzy msgid "Base" msgstr "_Base:" -#: ../treebrowser/src/treebrowser.c:1922 +#: ../treebrowser/src/treebrowser.c:1975 #, fuzzy msgid "Content-type" msgstr "Contidos" -#: ../treebrowser/src/treebrowser.c:1933 +#: ../treebrowser/src/treebrowser.c:1986 msgid "On Windows, this just hide files that are prefixed with '.' (dot)" msgstr "" "En windows, isto simplemente oculta os ficheiros que leven por prefixo un " "punto ('.')" -#: ../treebrowser/src/treebrowser.c:1935 +#: ../treebrowser/src/treebrowser.c:1988 msgid "Hide object files" msgstr "Ocultar ficheiros obxecto" -#: ../treebrowser/src/treebrowser.c:1940 +#: ../treebrowser/src/treebrowser.c:1993 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -6198,50 +6570,59 @@ "Non mostrar ficheiros obxecto no navegador de ficheiros. Isto inclúe *.o, *." "obj. *.so, *.dll, *.a, *.lib" -#: ../treebrowser/src/treebrowser.c:1942 +#: ../treebrowser/src/treebrowser.c:1995 msgid "Reverse filter" msgstr "Inverter o filtro" -#: ../treebrowser/src/treebrowser.c:1947 +#: ../treebrowser/src/treebrowser.c:2000 msgid "Follow current document" msgstr "Seguir o documento actual" -#: ../treebrowser/src/treebrowser.c:1952 +#: ../treebrowser/src/treebrowser.c:2005 msgid "Single click, open document and focus it" msgstr "Un só click abre o documento e enfñocase nel" -#: ../treebrowser/src/treebrowser.c:1957 +#: ../treebrowser/src/treebrowser.c:2010 msgid "Double click open directory" msgstr "Premer dúas veces para abrir directorio" -#: ../treebrowser/src/treebrowser.c:1962 +#: ../treebrowser/src/treebrowser.c:2015 msgid "On delete file, close it if is opened" msgstr "Ao borrar un ficheiro, pechalo se está aberto" -#: ../treebrowser/src/treebrowser.c:1967 +#: ../treebrowser/src/treebrowser.c:2020 +msgid "Focus editor on file open" +msgstr "" + +#: ../treebrowser/src/treebrowser.c:2025 msgid "Show tree lines" msgstr "Mostrar as liñas da árbore" -#: ../treebrowser/src/treebrowser.c:2050 +#: ../treebrowser/src/treebrowser.c:2037 +#, fuzzy +msgid "Open new files" +msgstr "Abrir ficheiro" + +#: ../treebrowser/src/treebrowser.c:2113 #, fuzzy msgid "Focus File List" msgstr "Enfocar na lista de tarefas" -#: ../treebrowser/src/treebrowser.c:2052 +#: ../treebrowser/src/treebrowser.c:2115 msgid "Focus Path Entry" msgstr "" -#: ../treebrowser/src/treebrowser.c:2054 +#: ../treebrowser/src/treebrowser.c:2117 #, fuzzy msgid "Rename Object" msgstr "Renomear" -#: ../treebrowser/src/treebrowser.c:2056 +#: ../treebrowser/src/treebrowser.c:2119 #, fuzzy msgid "Create New File" msgstr "Crear un ficheiro novo" -#: ../treebrowser/src/treebrowser.c:2058 +#: ../treebrowser/src/treebrowser.c:2121 #, fuzzy msgid "Create New Directory" msgstr "Crear un directorio novo" @@ -6312,46 +6693,46 @@ msgid "utility" msgstr "" -#: ../webhelper/src/gwh-settings.c:775 +#: ../webhelper/src/gwh-settings.c:782 #, c-format msgid "%s:" msgstr "" -#: ../webhelper/src/gwh-browser.c:528 +#: ../webhelper/src/gwh-browser.c:534 msgid "_Zoom" msgstr "" -#: ../webhelper/src/gwh-browser.c:550 +#: ../webhelper/src/gwh-browser.c:556 msgid "Full-_content zoom" msgstr "" -#: ../webhelper/src/gwh-browser.c:561 +#: ../webhelper/src/gwh-browser.c:567 #, fuzzy msgid "Flip panes orientation" msgstr "Orientación do papel:" -#: ../webhelper/src/gwh-browser.c:808 +#: ../webhelper/src/gwh-browser.c:814 msgid "Back" msgstr "" -#: ../webhelper/src/gwh-browser.c:812 +#: ../webhelper/src/gwh-browser.c:818 msgid "Forward" msgstr "" -#: ../webhelper/src/gwh-browser.c:816 +#: ../webhelper/src/gwh-browser.c:822 #, fuzzy msgid "Cancel loading" msgstr "Codificación:" -#: ../webhelper/src/gwh-browser.c:820 +#: ../webhelper/src/gwh-browser.c:826 msgid "Reload current page" msgstr "" -#: ../webhelper/src/gwh-browser.c:833 ../webhelper/src/gwh-browser.c:879 +#: ../webhelper/src/gwh-browser.c:839 ../webhelper/src/gwh-browser.c:885 msgid "Web inspector" msgstr "" -#: ../webhelper/src/gwh-browser.c:834 +#: ../webhelper/src/gwh-browser.c:840 msgid "Toggle web inspector" msgstr "" @@ -6566,9 +6947,6 @@ #~ msgid "tty temporary directory not specified!\n" #~ msgstr "Non se especificou o directorio temporal de tty!\n" -#~ msgid "tty temporary directory not found!\n" -#~ msgstr "Non se atopou o directorio temporal de tty!\n" - #~ msgid "tty helper program not specified!\n" #~ msgstr "Non se especificou o programa de axuda de tty!\n" @@ -6635,21 +7013,12 @@ #~ msgid "No %s selected" #~ msgstr "Non hai ningún %s seleccionado" -#~ msgid "watchpoint" -#~ msgstr "punto de vixilancia" - #~ msgid "Delete selected watchpoint?" #~ msgstr "Borrar o punto de vixilancia seleccionado?" #~ msgid "Delete selected breakpoint?" #~ msgstr "Borrar o punto de ruptura seleccionado?" -#~ msgid "Edit watchpoint" -#~ msgstr "Editar o punto de vixilancia" - -#~ msgid "Edit breakpoint" -#~ msgstr "Editar o punto de ruptura" - #~ msgid "Enabled" #~ msgstr "Activado" @@ -6842,10 +7211,6 @@ #~ msgid "Couldn't create tempfile" #~ msgstr "Crear un ficheiro novo" -#, fuzzy -#~ msgid "GeanyPG" -#~ msgstr "GeanyGDB" - #~ msgid "Lionel Fuentes" #~ msgstr "Lionel Fuentes" diff -Nru geany-plugins-1.23+dfsg/po/it.po geany-plugins-1.24+dfsg/po/it.po --- geany-plugins-1.23+dfsg/po/it.po 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/po/it.po 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,6752 @@ +# Italian translations for geany-plugins package. +# Copyright (C) 2014 THE geany-plugins'S COPYRIGHT HOLDER +# This file is distributed under the same license as the geany-plugins package. +# Federico Reghenzani , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: geany-plugins 1.24\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-03-30 20:34+0200\n" +"PO-Revision-Date: 2014-04-09 07:23+0200\n" +"Last-Translator: Federico Reghenzani \n" +"Language-Team: Italian\n" +"Language: it\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" + +#: ../addons/src/ao_bookmarklist.c:182 +msgid "(Empty Line)" +msgstr "(Linea vuota)" + +#: ../addons/src/ao_bookmarklist.c:307 +msgid "_Remove Bookmark" +msgstr "_Rimuovi segnalibro" + +#: ../addons/src/ao_bookmarklist.c:333 +msgid "No." +msgstr "N°" + +#: ../addons/src/ao_bookmarklist.c:341 ../devhelp/src/dhp-object.c:494 +#: ../devhelp/devhelp/dh-window.c:1142 +msgid "Contents" +msgstr "Contenuti" + +#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:625 +msgid "Bookmarks" +msgstr "Segnalibri" + +#. complete update +#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2351 +msgid "_Update" +msgstr "_Aggiorna" + +#: ../addons/src/ao_tasks.c:382 +msgid "_Hide Message Window" +msgstr "_Nascondi la finestra dei messaggi" + +#: ../addons/src/ao_tasks.c:412 ../debugger/src/stree.c:387 +msgid "File" +msgstr "File" + +#: ../addons/src/ao_tasks.c:423 ../debugger/src/bptree.c:702 +#: ../debugger/src/stree.c:394 +msgid "Line" +msgstr "Linea" + +#. i18n: in the programming language context, if you don't +#. * have an ESTABLISHED term for it, leave it +#. * untranslated. +#: ../addons/src/ao_tasks.c:434 ../debugger/src/vtree.c:204 +#: ../devhelp/devhelp/dh-link.c:287 ../geanylatex/src/bibtexlabels.c:68 +msgid "Type" +msgstr "Type" + +#: ../addons/src/ao_tasks.c:445 +msgid "Task" +msgstr "Task" + +#: ../addons/src/ao_tasks.c:478 +msgid "Tasks" +msgstr "Task" + +#: ../addons/src/ao_tasks.c:542 +msgid "Context:" +msgstr "Contesto:" + +#: ../addons/src/ao_xmltagging.c:54 +msgid "XML tagging" +msgstr "XML tagging" + +#: ../addons/src/ao_xmltagging.c:65 +msgid "Tag name to be inserted:" +msgstr "Nome del Tag da inserire:" + +#: ../addons/src/ao_xmltagging.c:69 +#, c-format +msgid "" +"%s will be replaced with your current selection. Please keep care on your " +"selection" +msgstr "" +"%s sarà sostituito con la tua selezione correte. Prestare attenzione alla " +"tua selezione" + +#: ../addons/src/ao_openuri.c:165 +msgid "Open URI" +msgstr "Apri URI" + +#: ../addons/src/ao_openuri.c:171 +msgid "Copy URI" +msgstr "Copia URI" + +#: ../addons/src/ao_wrapwords.c:249 +msgid "Enclose Characters" +msgstr "Enclose caratteri" + +#: ../addons/src/ao_wrapwords.c:260 +#, c-format +msgid "Enclose combo %d" +msgstr "Enclose combo %d" + +#: ../addons/src/ao_wrapwords.c:276 +msgid "Opening Character" +msgstr "Carattere di apertura" + +#: ../addons/src/ao_wrapwords.c:283 +msgid "Closing Character" +msgstr "Carattere di chiusura" + +#: ../addons/src/ao_doclist.c:207 +msgid "Close Ot_her Documents" +msgstr "C_hiudi gli altri Documenti" + +#: ../addons/src/ao_doclist.c:212 +msgid "C_lose All" +msgstr "Chiudi _tutto" + +#: ../addons/src/ao_doclist.c:242 +msgid "Show Document List" +msgstr "Visualizza lista Documenti" + +#: ../addons/src/addons.c:52 +msgid "Addons" +msgstr "Addons" + +#: ../addons/src/addons.c:53 +msgid "Various small addons for Geany." +msgstr "Alcuni piccoli addon per Geany." + +#: ../addons/src/addons.c:296 +msgid "Focus Bookmark List" +msgstr "Imposta il focus sulla lista dei Segnalibri" + +#: ../addons/src/addons.c:298 +msgid "Focus Tasks List" +msgstr "Imposta il focus sulla lista dei Task" + +#: ../addons/src/addons.c:300 +msgid "Update Tasks List" +msgstr "Aggiorna la lista dei Task" + +#: ../addons/src/addons.c:302 +msgid "Run XML tagging" +msgstr "Esegui XML tagging" + +#: ../addons/src/addons.c:417 ../autoclose/src/autoclose.c:871 +#: ../geanylatex/src/geanylatex.c:241 ../geanyprj/src/geanyprj.c:174 +#: ../geanysendmail/src/geanysendmail.c:123 +#: ../geanysendmail/src/geanysendmail.c:291 ../geanyvc/src/geanyvc.c:1854 +#: ../geniuspaste/src/geniuspaste.c:140 ../spellcheck/src/scplugin.c:146 +#: ../treebrowser/src/treebrowser.c:1933 +#: ../updatechecker/src/updatechecker.c:253 +msgid "Plugin configuration directory could not be created." +msgstr "La cartella della configurazione dei plugin non può essere creata." + +#: ../addons/src/addons.c:445 +msgid "Show toolbar item to show a list of currently open documents" +msgstr "Mostra un'icona nella toolbar per visualizzare la lista dei documenti " +"aperti" + +#: ../addons/src/addons.c:449 +msgid "Sort documents by _name" +msgstr "Ordina i documenti in base al _nome" + +#: ../addons/src/addons.c:451 +msgid "Sort the documents in the list by their filename" +msgstr "Ordina tutti ti documenti nella lista in base al nome del file" + +#: ../addons/src/addons.c:454 +msgid "Sort documents by _occurrence" +msgstr "Ordina i documenti in base alle _occorrenze" + +#: ../addons/src/addons.c:456 +msgid "Sort the documents in the order of the document tabs" +msgstr "Ordina i documenti in base all'ordine dei tab" + +#: ../addons/src/addons.c:459 +msgid "Sort documents by _occurrence (reversed)" +msgstr "Ordina i documenti in base alle _occorrerze (invertito)" + +#: ../addons/src/addons.c:461 +msgid "Sort the documents in the order of the document tabs (reversed)" +msgstr "Ordina i documenti in base all'ordine dei tab (invertito)" + +#: ../addons/src/addons.c:488 +msgid "Show an 'Open URI' item in the editor menu" +msgstr "Visualizza un 'Apri URI' nel menù dell'editor" + +#: ../addons/src/addons.c:494 +msgid "Show available Tasks in the Messages Window" +msgstr "Visualizza i Task disponibili nella finestra Messaggi" + +#: ../addons/src/addons.c:500 +msgid "Show tasks of all documents" +msgstr "Visualizza i Task di tutti i documenti" + +#: ../addons/src/addons.c:504 +msgid "" +"Whether to show the tasks of all open documents in the list or only those of " +"the current document." +msgstr "" +"Mostrare i task di tutti i documenti aperti o solo quelli del documento corrente" + +#: ../addons/src/addons.c:511 +msgid "Specify a semicolon separated list of search tokens." +msgstr "Specifica una lista di token di ricerca, separata da punti e virgola." + +#: ../addons/src/addons.c:513 +msgid "Search tokens:" +msgstr "Token di ricerca:" + +#: ../addons/src/addons.c:530 +msgid "Show status icon in the Notification Area" +msgstr "Visualizza icona status nell'area notifiche" + +#: ../addons/src/addons.c:536 +msgid "Show defined bookmarks (marked lines) in the sidebar" +msgstr "Visualizza i segnalibri (linee contrassegnate) nella barra laterale" + +#: ../addons/src/addons.c:542 +msgid "Mark all occurrences of a word when double-clicking it" +msgstr "Evidenzia tutte le occorrenze di una parola effettuando doppio-click " +"su di essa." + +#: ../addons/src/addons.c:548 +msgid "Strip trailing blank lines" +msgstr "Elimina linee vuote finali" + +#: ../addons/src/addons.c:554 +msgid "XML tagging for selection" +msgstr "XML tagging per selezione" + +#: ../addons/src/addons.c:560 +msgid "Enclose selection on configurable keybindings" +msgstr "Racchiudi selezione con combinazione di tasti" + +#: ../addons/src/addons.c:572 +msgid "Enclose selection automatically (without having to press a keybinding)" +msgstr "Racchiudi selezione automaticamente (senza premere una combinazione)" + +#: ../autoclose/src/autoclose.c:50 +msgid "Auto-close" +msgstr "Auto-chiusura" + +#: ../autoclose/src/autoclose.c:51 +msgid "Auto-close braces and brackets with lot of features" +msgstr "Auto-chiudi parentesi con molte funzioni" + +#: ../codenav/src/codenavigation.c:52 +msgid "Code navigation" +msgstr "Naviazione codice" + +#: ../codenav/src/codenavigation.c:53 +msgid "" +"This plugin adds features to facilitate navigation between source files.\n" +"As for the moment, it implements :\n" +"- switching between a .cpp file and the corresponding .h file\n" +"- [opening a file by typing its name -> TODO]" +msgstr "" +"Questo plugin aggiunge funzionalità per semplificare la navigazione tra\n" +"file sorgenti. Per il momento sono implementate:\n" +"- scambia un file .cpp con il suo corrispondente .h\n" +"- [apri file digitando il suo nome -> TODO]" + + +#. Add the menu item, sensitive only when a document is opened +#: ../codenav/src/goto_file.c:57 ../codenav/src/goto_file.c:71 +msgid "Goto file" +msgstr "Vai al file" + +#: ../codenav/src/goto_file.c:109 +#, c-format +msgid "(From the %s plugin)" +msgstr "(Dal plugin %s)" + +#. Add the menu item and make it sensitive only when a document is opened +#. Frame, which is the returned widget +#: ../codenav/src/switch_head_impl.c:85 ../codenav/src/switch_head_impl.c:99 +#: ../codenav/src/switch_head_impl.c:461 +msgid "Switch header/implementation" +msgstr "Passa a intestazione/sorgente" + +#: ../codenav/src/switch_head_impl.c:369 +#, c-format +msgid "%s not found, create it?" +msgstr "%s non trovato, crearlo?" + +#: ../codenav/src/switch_head_impl.c:485 +msgid "Headers extensions" +msgstr "Estensioni delle intestazioni" + +#: ../codenav/src/switch_head_impl.c:494 +msgid "Implementations extensions" +msgstr "Estensioni implementate" + +#: ../commander/src/commander-plugin.c:39 +msgid "Commander" +msgstr "Comandante" + +#: ../commander/src/commander-plugin.c:40 +msgid "Provides a command panel for quick access to actions, files and more" +msgstr "Fornisce un pannello comandi per un veloce accesso a azioni, file e altro" + +#: ../commander/src/commander-plugin.c:686 +msgid "Show Command Panel" +msgstr "Visualizza pannello comandi" + +#: ../debugger/src/plugin.c:56 +msgid "Debugger" +msgstr "Debugger" + +#: ../debugger/src/plugin.c:57 +msgid "Various debuggers integration." +msgstr "Diverse integrazioni con i debuggers." + +#: ../debugger/src/plugin.c:133 ../debugger/src/keys.c:76 +#: ../scope/data/scope.glade.h:124 ../scope/src/scope.c:226 +msgid "Debug" +msgstr "Debug" + +#: ../debugger/src/vtree.c:173 ../debugger/src/envtree.c:417 +msgid "Name" +msgstr "Nome" + +#: ../debugger/src/vtree.c:196 ../debugger/src/envtree.c:422 +msgid "Value" +msgstr "Valore" + +#: ../debugger/src/tpage.c:105 +msgid "Choose target file" +msgstr "Scegli il file target" + +#. target +#: ../debugger/src/tpage.c:251 +msgid "Target:" +msgstr "Target:" + +#: ../debugger/src/tpage.c:254 +msgid "Browse" +msgstr "Sfoglia" + +#. debugger +#: ../debugger/src/tpage.c:259 +msgid "Debugger:" +msgstr "Debugger:" + +#. arguments +#: ../debugger/src/tpage.c:270 +msgid "Command Line Arguments" +msgstr "Parametri linea di comando" + +#. environment +#: ../debugger/src/tpage.c:281 +msgid "Environment Variables" +msgstr "Variabili d'ambiente" + +#. if name is empty - offer to delete variable +#: ../debugger/src/envtree.c:260 ../debugger/src/envtree.c:364 +#: ../debugger/src/debug.c:254 +msgid "Delete variable?" +msgstr "Elimina variabile?" + +#: ../debugger/src/bptree.c:676 +msgid "Location" +msgstr "Posizione" + +#: ../debugger/src/bptree.c:685 +msgid "Condition" +msgstr "Condizione" + +#: ../debugger/src/bptree.c:696 +msgid "Hit count" +msgstr "Conteggio Hit" + +#: ../debugger/src/bptree.c:861 +#, c-format +msgid "line %i" +msgstr "linea %i" + +#: ../debugger/src/dbm_gdb.c:547 +msgid "Program received a signal" +msgstr "Il programma ha ricevuto un segnale" + +#: ../debugger/src/dbm_gdb.c:563 +#, c-format +msgid "Program exited with code \"%i\"" +msgstr "Programma terminato con codice \"%i\"" + +#: ../debugger/src/dbm_gdb.c:735 +msgid "Failed to spawn gdb process" +msgstr "Impossibile avviare il processo gdb" + +#: ../debugger/src/dbm_gdb.c:782 +msgid "~\"Loading target file.\\n\"" +msgstr "~\"Caricamento file target.\\n\"" + +#: ../debugger/src/dbm_gdb.c:782 +msgid "Error loading file" +msgstr "Impossibile caricare il file" + +#. setting asyncronous mode +#. setting null-stop array printing +#. enable pretty printing +#: ../debugger/src/dbm_gdb.c:786 ../debugger/src/dbm_gdb.c:789 +#: ../debugger/src/dbm_gdb.c:792 +msgid "Error configuring GDB" +msgstr "Errore nella configurazione di GDB" + +#: ../debugger/src/dbm_gdb.c:835 +#, c-format +msgid "" +"Breakpoint at %s:%i cannot be set\n" +"Debugger message: %s" +msgstr "" +"Impossibile settare Breakpoint a %s:%i\n" +"Messaggio del debugger: %s" + +#: ../debugger/src/utils.c:68 +#, c-format +msgid "Can't find a source file \"%s\"" +msgstr "Impossibile trovare il file sorgente \"%s\"" + +#: ../debugger/src/stree.c:140 +msgid "Active frame" +msgstr "Frame attivo" + +#: ../debugger/src/stree.c:140 +msgid "Click an arrow to switch to a frame" +msgstr "Clicca una freccia per cambiare a un frame" + +#: ../debugger/src/stree.c:363 ../geanylatex/src/bibtexlabels.c:46 +msgid "Address" +msgstr "Indirizzo" + +#. i18n: in the programming language context, if you don't +#. * have an ESTABLISHED term for it, leave it +#. * untranslated. +#: ../debugger/src/stree.c:381 ../devhelp/devhelp/dh-link.c:267 +msgid "Function" +msgstr "Funzione" + +#: ../debugger/src/stree.c:533 +#, c-format +msgid "Thread %i" +msgstr "Thread %i" + +#: ../debugger/src/tabs.c:132 +msgid "Target" +msgstr "Target" + +#: ../debugger/src/tabs.c:135 ../scope/src/scope.c:524 +msgid "Breakpoints" +msgstr "Breakpoint" + +#: ../debugger/src/tabs.c:138 +msgid "Watch" +msgstr "Watch" + +#: ../debugger/src/tabs.c:141 +msgid "Autos" +msgstr "Auto" + +#: ../debugger/src/tabs.c:144 +msgid "Call Stack" +msgstr "Stack di chiamata" + +#: ../debugger/src/tabs.c:147 +msgid "Debug Terminal" +msgstr "Terminale di Debug" + +#: ../debugger/src/tabs.c:150 +msgid "Debugger Messages" +msgstr "Messaggi dal debugger" + +#: ../debugger/src/keys.c:49 +msgid "Run / Continue" +msgstr "Esegui / Continua" + +#: ../debugger/src/keys.c:50 ../debugger/src/btnpanel.c:101 +msgid "Stop" +msgstr "Ferma" + +#: ../debugger/src/keys.c:51 ../debugger/src/btnpanel.c:98 +msgid "Restart" +msgstr "Riavvia" + +#: ../debugger/src/keys.c:52 ../debugger/src/btnpanel.c:113 +#: ../scope/src/scope.c:66 +msgid "Step into" +msgstr "Entra (step into)" + +#: ../debugger/src/keys.c:53 ../debugger/src/btnpanel.c:110 +#: ../scope/src/scope.c:67 +msgid "Step over" +msgstr "Scavalca (step over)" + +#: ../debugger/src/keys.c:54 ../debugger/src/btnpanel.c:122 +#: ../scope/src/scope.c:68 +msgid "Step out" +msgstr "Esci (step out)" + +#: ../debugger/src/keys.c:55 ../debugger/src/btnpanel.c:125 +#: ../scope/src/scope.c:64 +msgid "Run to cursor" +msgstr "Esegui al cursore" + +#: ../debugger/src/keys.c:56 +msgid "Add / Remove breakpoint" +msgstr "Aggiungi / Rimuovi breakpoint" + +#: ../debugger/src/keys.c:57 +msgid "Jump to the current instruction" +msgstr "Salta all'istruzione corrente" + +#: ../debugger/src/watch_model.c:220 +msgid "Can't evaluate expression" +msgstr "Impossibile valutare l'espressione" + +#: ../debugger/src/callbacks.c:249 +msgid "To edit source files stop debugging session" +msgstr "Per modificare i file sorgenti interrompi la sessione di debug corrente" + +#: ../debugger/src/btnpanel.c:90 ../debugger/src/btnpanel.c:159 +msgid "Run" +msgstr "Esegui" + +#: ../debugger/src/btnpanel.c:132 +msgid "Settings" +msgstr "Impostazioni" + +#: ../debugger/src/btnpanel.c:136 +msgid "Two panel mode" +msgstr "Modalità due pannelli" + +#: ../debugger/src/btnpanel.c:154 +msgid "Continue" +msgstr "Continua" + +#: ../debugger/src/dconfig.c:675 +msgid "Save debug session data to a project" +msgstr "Salva i dati della sessione debug ad un progetto" + +#: ../defineformat/src/defineformat.c:56 +msgid "Define formatter" +msgstr "Define formatter" + +#: ../defineformat/src/defineformat.c:57 +msgid "Automatically align backslash in multi-line defines" +msgstr "Allinea automaticamente le backslash nelle define multi-linea" + +#. never search for more than this many chars +#: ../devhelp/src/dhp.h:38 +msgid "Documentation" +msgstr "Documentazione" + +#: ../devhelp/src/dhp.h:39 +msgid "Code" +msgstr "Codice" + +#: ../devhelp/src/dhp-object.c:387 +msgid "Search for 'Tag' Documentation in" +msgstr "Cerca nella documentazione per 'Tag'" + +#. i18n: Please don't translate "Devhelp" (it's marked as translatable +#. * for transliteration only) +#: ../devhelp/src/dhp-object.c:390 ../devhelp/src/dhp-object.c:503 +#: ../devhelp/devhelp/dh-window.c:727 ../devhelp/devhelp/dh-window.c:1034 +#: ../devhelp/devhelp/dh-window.c:1863 +msgid "Devhelp" +msgstr "Devhelp" + +#: ../devhelp/src/dhp-object.c:397 +msgid "Manual Pages" +msgstr "Pagine del manuale" + +#: ../devhelp/src/dhp-object.c:443 +msgid "Go back one page" +msgstr "Indieto di una pagina" + +#: ../devhelp/src/dhp-object.c:444 +msgid "Go forward one page" +msgstr "Avanti di una pagina" + +#: ../devhelp/src/dhp-object.c:445 +msgid "Zoom in" +msgstr "Zoom in" + +#: ../devhelp/src/dhp-object.c:446 +msgid "Zoom out" +msgstr "Zoom out" + +#: ../devhelp/src/dhp-object.c:497 ../devhelp/devhelp/dh-window.c:1152 +msgid "Search" +msgstr "Cerca" + +#: ../devhelp/src/dhp-object.c:1305 +#, c-format +msgid "Search for '%s' Documentation in" +msgstr "Cerca per '%s' nella documentazione" + +#: ../devhelp/src/dhp-plugin.c:42 +msgid "Devhelp Plugin" +msgstr "Devhelp Plugin" + +#: ../devhelp/src/dhp-plugin.c:43 +msgid "" +"Adds support for looking up documentation in Devhelp, manual pages, and " +"Google Code Search in the integrated viewer." +msgstr "" +"Aggiunge supporto per la ricerca nella documentazione in Devhelp, pagine" +"del manuale e Google Code Search in una finestra integrata." + +#: ../devhelp/src/dhp-plugin.c:119 +#, c-format +msgid "Unable to create config dir at '%s'" +msgstr "Impossibile creare la directory di configurazione '%s'" + +#: ../devhelp/src/dhp-plugin.c:134 +#, c-format +msgid "Unable to get default configuration: %s" +msgstr "Impossibile leggere la configurazione di default: %s" + +#: ../devhelp/src/dhp-plugin.c:142 +#, c-format +msgid "Unable to write default configuration: %s" +msgstr "Impossibile scrivere la configurazione di default: %s" + +#: ../devhelp/src/dhp-plugin.c:172 +msgid "Toggle sidebar contents tab" +msgstr "Mostra/Nascondi il tab contenuti nella barra laterale" + +#: ../devhelp/src/dhp-plugin.c:174 +msgid "Toggle sidebar search tab" +msgstr "Mostra/Nascondi il tab ricerca nella barra laterale" + +#: ../devhelp/src/dhp-plugin.c:176 +msgid "Toggle documentation tab" +msgstr "Mostra/Nascondi il tab dcoumentazione nella barra laterale" + +#: ../devhelp/src/dhp-plugin.c:178 +msgid "Activate all tabs" +msgstr "Attiva tutti i tab" + +#: ../devhelp/src/dhp-plugin.c:180 +msgid "Search for current tag in Devhelp" +msgstr "Cerca per il tag corrente in Devhelp" + +#: ../devhelp/src/dhp-plugin.c:184 +msgid "Search for current tag in Manual Pages" +msgstr "Cerca per il tag corrente nelle pagine del Manuale" + +#. i18n: Please don't translate "Devhelp". +#: ../devhelp/devhelp/dh-assistant.c:74 +msgid "Devhelp — Assistant" +msgstr "Devhelp — Assistente" + +#: ../devhelp/devhelp/dh-assistant-view.c:336 +msgid "Book:" +msgstr "Libro:" + +#. i18n: a documentation book +#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1759 +msgid "Book" +msgstr "Libro" + +#. i18n: a "page" in a documentation book +#: ../devhelp/devhelp/dh-link.c:258 +msgid "Page" +msgstr "Pagina" + +#. i18n: a search hit in the documentation, could be a +#. * function, macro, struct, etc +#: ../devhelp/devhelp/dh-link.c:262 +msgid "Keyword" +msgstr "Parola chiave" + +#. i18n: in the programming language context, if you don't +#. * have an ESTABLISHED term for it, leave it +#. * untranslated. +#: ../devhelp/devhelp/dh-link.c:272 +msgid "Struct" +msgstr "Struct" + +#. i18n: in the programming language context, if you don't +#. * have an ESTABLISHED term for it, leave it +#. * untranslated. +#: ../devhelp/devhelp/dh-link.c:277 +msgid "Macro" +msgstr "Macro" + +#. i18n: in the programming language context, if you don't +#. * have an ESTABLISHED term for it, leave it +#. * untranslated. +#: ../devhelp/devhelp/dh-link.c:282 +msgid "Enum" +msgstr "Enum" + +#: ../devhelp/devhelp/dh-parser.c:91 ../devhelp/devhelp/dh-parser.c:185 +#: ../devhelp/devhelp/dh-parser.c:249 ../devhelp/devhelp/dh-parser.c:259 +#, c-format +msgid "Expected '%s', got '%s' at line %d, column %d" +msgstr "Previsto '%s', trovato '%s' alla linea %d, colonna %d" + +#: ../devhelp/devhelp/dh-parser.c:108 +#, c-format +msgid "Invalid namespace '%s' at line %d, column %d" +msgstr "Namesapce invalido '%s' alla linea %d, colonna %d" + +#: ../devhelp/devhelp/dh-parser.c:136 +#, c-format +msgid "" +"\"title\", \"name\" and \"link\" elements are required at line %d, column %d" +msgstr "" +"Gli elementi \"title\", \"name\" e \"link\" sono richiesti alla linea %d, colonna %d" + +#: ../devhelp/devhelp/dh-parser.c:204 +#, c-format +msgid "" +"\"name\" and \"link\" elements are required inside on line %d, column " +"%d" +msgstr "" +"Gli elementi \"name\" e \"link\" sono richiesti all'interno di " +"alla linea %d, colonna %d" + +#: ../devhelp/devhelp/dh-parser.c:284 +#, c-format +msgid "" +"\"name\" and \"link\" elements are required inside '%s' on line %d, column %d" +msgstr "" +"Gli elementi \"name\" e \"link\" sono richiesti dentro '%s' alla linea " +"%d, colonna %d" + +#: ../devhelp/devhelp/dh-parser.c:297 +#, c-format +msgid "\"type\" element is required inside on line %d, column %d" +msgstr "L'elemento \"type\" è richiesto dentro alla linea %d, " +"colonna %d" + +#: ../devhelp/devhelp/dh-parser.c:500 +#, c-format +msgid "Cannot uncompress book '%s': %s" +msgstr "Impossibile decomprimere libro '%s': %s" + +#: ../devhelp/devhelp/dh-search.c:498 +msgid "All books" +msgstr "Tutti i libri" + +#: ../devhelp/devhelp/dh-search.c:620 +msgid "Search in:" +msgstr "Cerca in:" + +#: ../devhelp/devhelp/dh-window.c:98 +msgid "50%" +msgstr "50%" + +#: ../devhelp/devhelp/dh-window.c:99 +msgid "75%" +msgstr "75%" + +#: ../devhelp/devhelp/dh-window.c:100 +msgid "100%" +msgstr "100%" + +#: ../devhelp/devhelp/dh-window.c:101 +msgid "125%" +msgstr "125%" + +#: ../devhelp/devhelp/dh-window.c:102 +msgid "150%" +msgstr "150%" + +#: ../devhelp/devhelp/dh-window.c:103 +msgid "175%" +msgstr "175%" + +#: ../devhelp/devhelp/dh-window.c:104 +msgid "200%" +msgstr "200%" + +#: ../devhelp/devhelp/dh-window.c:105 +msgid "300%" +msgstr "300%" + +#: ../devhelp/devhelp/dh-window.c:106 +msgid "400%" +msgstr "400%" + +#: ../devhelp/devhelp/dh-window.c:722 +msgid "translator_credits" +msgstr "translator_credits" + +#: ../devhelp/devhelp/dh-window.c:729 +msgid "A developers' help browser for GNOME" +msgstr "Un help-browser degli sviluppatori per GNOME" + +#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2066 +msgid "_File" +msgstr "_File" + +#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1822 +#: ../geanymacro/src/geanymacro.c:2118 +msgid "_Edit" +msgstr "_Modifica" + +#: ../devhelp/devhelp/dh-window.c:761 +msgid "_View" +msgstr "V_isualizza" + +#: ../devhelp/devhelp/dh-window.c:762 +msgid "_Go" +msgstr "_Vai" + +#: ../devhelp/devhelp/dh-window.c:763 +msgid "_Help" +msgstr "_Aiuto" + +#. File menu +#: ../devhelp/devhelp/dh-window.c:766 +msgid "_New Window" +msgstr "Nuova _Finestra" + +#: ../devhelp/devhelp/dh-window.c:768 +msgid "New _Tab" +msgstr "Nuovo _Tab" + +#: ../devhelp/devhelp/dh-window.c:770 +msgid "_Print…" +msgstr "_Stampa" + +#: ../devhelp/devhelp/dh-window.c:782 ../devhelp/devhelp/eggfindbar.c:342 +msgid "Find Next" +msgstr "Trova successivo" + +#: ../devhelp/devhelp/dh-window.c:784 ../devhelp/devhelp/eggfindbar.c:329 +msgid "Find Previous" +msgstr "Trova precedente" + +#: ../devhelp/devhelp/dh-window.c:791 +msgid "Go to the previous page" +msgstr "Vai alla pagina precedente" + +#: ../devhelp/devhelp/dh-window.c:794 +msgid "Go to the next page" +msgstr "Vai alla pagina successiva" + +#: ../devhelp/devhelp/dh-window.c:797 +msgid "_Contents Tab" +msgstr "Tab _Contenuto" + +#: ../devhelp/devhelp/dh-window.c:800 +msgid "_Search Tab" +msgstr "Tab _Ricerca" + +#. View menu +#: ../devhelp/devhelp/dh-window.c:804 +msgid "_Larger Text" +msgstr "Testo più _grande" + +#: ../devhelp/devhelp/dh-window.c:805 +msgid "Increase the text size" +msgstr "Aumenta la dimensione del testo" + +#: ../devhelp/devhelp/dh-window.c:807 +msgid "S_maller Text" +msgstr "Testo più _piccolo" + +#: ../devhelp/devhelp/dh-window.c:808 +msgid "Decrease the text size" +msgstr "Diminuisce la dimensione del testo" + +#: ../devhelp/devhelp/dh-window.c:810 +msgid "_Normal Size" +msgstr "Dimensioni _normali" + +#: ../devhelp/devhelp/dh-window.c:811 +msgid "Use the normal text size" +msgstr "Usa la dimensione normale del testo" + +#: ../devhelp/devhelp/dh-window.c:820 +msgid "Leave fullscreen mode" +msgstr "Chiudi schermo intero" + +#: ../devhelp/devhelp/dh-window.c:827 +msgid "Display in full screen" +msgstr "Visualizza a schermo intero" + +#. Translators: This refers to text size +#: ../devhelp/devhelp/dh-window.c:947 +msgid "Larger" +msgstr "Più grande" + +#. Translators: This refers to text size +#: ../devhelp/devhelp/dh-window.c:950 +msgid "Smaller" +msgstr "Più piccolo" + +#. i18n: please don't translate +#. * "Devhelp", it's a name, not a +#. * generic word. +#: ../devhelp/devhelp/dh-window.c:1095 +msgid "About Devhelp" +msgstr "Informazioni su Devhelp" + +#: ../devhelp/devhelp/dh-window.c:1100 +msgid "Preferences…" +msgstr "Preferenze…" + +#: ../devhelp/devhelp/dh-window.c:1330 +msgid "Error opening the requested link." +msgstr "Errore nell'apertura del link richiesto." + +#: ../devhelp/devhelp/dh-window.c:1649 ../devhelp/devhelp/dh-window.c:1891 +msgid "Empty Page" +msgstr "Pagina vuota" + +#: ../devhelp/devhelp/eggfindbar.c:320 +msgid "Find:" +msgstr "Cerca:" + +#: ../devhelp/devhelp/eggfindbar.c:333 ../devhelp/devhelp/eggfindbar.c:336 +msgid "Find previous occurrence of the search string" +msgstr "Cerca occorrenze precedenti della stringa" + +#: ../devhelp/devhelp/eggfindbar.c:346 ../devhelp/devhelp/eggfindbar.c:349 +msgid "Find next occurrence of the search string" +msgstr "Cerca occorrenze successive della stringa" + +#: ../devhelp/devhelp/eggfindbar.c:358 +msgid "C_ase Sensitive" +msgstr "C_ase Sensitive" + +#: ../devhelp/devhelp/eggfindbar.c:362 ../devhelp/devhelp/eggfindbar.c:365 +msgid "Toggle case sensitive search" +msgstr "Commuta la ricerca case-sensitive" + +#. All plugins must set name, description, version and author. +#: ../geanydoc/src/geanydoc.c:50 ../geanydoc/src/geanydoc.c:347 +msgid "Doc" +msgstr "Doc" + +#: ../geanydoc/src/geanydoc.c:50 +msgid "Call documentation viewer on current symbol." +msgstr "Apri visualizzatore documentazione sul simbolo corrente." + +#: ../geanydoc/src/geanydoc.c:170 ../geanyvc/src/geanyvc.c:416 +msgid "Could not parse the output of command" +msgstr "Impossibile analizzare l'output del comando" + +#: ../geanydoc/src/geanydoc.c:357 +msgid "Put output in buffer" +msgstr "Metti l'output nel buffer" + +#: ../geanydoc/src/geanydoc.c:369 +msgid "Command 0:" +msgstr "Comando 0:" + +#: ../geanydoc/src/geanydoc.c:375 +msgid "Command 1:" +msgstr "Comando 1:" + +#: ../geanydoc/src/geanydoc.c:393 +msgid "%w will be replaced with current word\n" +msgstr "%w sarà sostituito dalla parola corrente\n" + +#: ../geanydoc/src/geanydoc.c:440 +msgid "Document current word" +msgstr "Parola corrente del documento" + +#: ../geanydoc/src/geanydoc.c:441 +msgid "Document interactive" +msgstr "Documento interattivo" + +#: ../geanyextrasel/src/extrasel.c:34 +msgid "Extra Selection" +msgstr "Selezione extra" + +#: ../geanyextrasel/src/extrasel.c:34 +msgid "Column mode, select to line / brace / anchor." +msgstr "Modalità Colonna, selezione linea / parentesi / ancora." + +#: ../geanyextrasel/src/extrasel.c:502 +msgid "E_xtra Selection" +msgstr "Selezione e_xtra" + +#: ../geanyextrasel/src/extrasel.c:509 +msgid "_Column Mode" +msgstr "Modalità _Colonna" + +#: ../geanyextrasel/src/extrasel.c:514 +msgid "Column mode" +msgstr "Modalità Colonna" + +#: ../geanyextrasel/src/extrasel.c:516 +msgid "Select to _Line" +msgstr "Seleziona alla _linea" + +#: ../geanyextrasel/src/extrasel.c:520 +msgid "Select to line" +msgstr "Seleziona alla linea" + +#: ../geanyextrasel/src/extrasel.c:522 +msgid "Select to Matching _Brace" +msgstr "Seleziona alla _parentesi corrispondente" + +#: ../geanyextrasel/src/extrasel.c:526 +msgid "Select to matching brace" +msgstr "Seleziona alla parentesi corrispondente" + +#: ../geanyextrasel/src/extrasel.c:528 +msgid "_Toggle Stream/Rectangular" +msgstr "_Commuta Flusso/Rettangolare" + +#: ../geanyextrasel/src/extrasel.c:532 +msgid "Convert selection" +msgstr "Converti selezione" + +#: ../geanyextrasel/src/extrasel.c:537 +msgid "_Set Anchor" +msgstr "Impo_sta Àncora" + +#: ../geanyextrasel/src/extrasel.c:541 +msgid "Set anchor" +msgstr "Imposta Àncora" + +#: ../geanyextrasel/src/extrasel.c:543 +msgid "Select to _Anchor" +msgstr "Seleziona all'_Àncora" + +#: ../geanyextrasel/src/extrasel.c:547 +msgid "Select to anchor" +msgstr "Seleziona all'Àncora" + +#: ../geanyextrasel/src/extrasel.c:549 +msgid "_Rectangle Select to Anchor" +msgstr "Selezione _Rettangolare all'Ancora" + +#: ../geanyextrasel/src/extrasel.c:554 +msgid "Rectangle select to anchor" +msgstr "Selezione rettangolare all'Àncora" + +#: ../geanygendoc/src/ggd-file-type-loader.c:117 +msgid "boolean value" +msgstr "valore booleano" + +#: ../geanygendoc/src/ggd-file-type-loader.c:130 +#, c-format +msgid "invalid boolean value \"%s\"" +msgstr "valore booleano non valido \"%s\"" + +#: ../geanygendoc/src/ggd-file-type-loader.c:157 +#, c-format +msgid "invalid template: %s" +msgstr "template non valido: %s" + +#: ../geanygendoc/src/ggd-file-type-loader.c:178 +msgid "position name" +msgstr "nome posizione" + +#: ../geanygendoc/src/ggd-file-type-loader.c:185 +#, c-format +msgid "invalid position \"%s\"" +msgstr "posizione non valida \"%s\"" + +#: ../geanygendoc/src/ggd-file-type-loader.c:204 +msgid "policy name" +msgstr "nome policy" + +#: ../geanygendoc/src/ggd-file-type-loader.c:211 +#, c-format +msgid "invalid policy \"%s\"" +msgstr "policy non valida \"%s\"" + +#: ../geanygendoc/src/ggd-file-type-loader.c:230 +msgid "merge policy" +msgstr "unisci polizza" + +#: ../geanygendoc/src/ggd-file-type-loader.c:237 +#, c-format +msgid "invalid merge policy \"%s\"" +msgstr "polizza di unione non valida \"%s\"" + +#: ../geanygendoc/src/ggd-file-type-loader.c:259 +msgid "type" +msgstr "tipo" + +#: ../geanygendoc/src/ggd-file-type-loader.c:266 +#, c-format +msgid "invalid type \"%s\"" +msgstr "tipo non valido \"%s\"" + +#: ../geanygendoc/src/ggd-file-type-loader.c:328 +#: ../geanygendoc/src/ggd-file-type-loader.c:779 +#, c-format +msgid "invalid setting name \"%s\"" +msgstr "nome impostazione non valida \"%s\"" + +#: ../geanygendoc/src/ggd-file-type-loader.c:349 +#: ../geanygendoc/src/ggd-file-type-loader.c:360 +#: ../geanygendoc/src/ggd-file-type-loader.c:385 +msgid "setting identifier" +msgstr "identificatore impostazione" + +#: ../geanygendoc/src/ggd-file-type-loader.c:431 +#, c-format +msgid "Unknown type \"%s\", is it a typo?" +msgstr "Tipo \"%s\" sconosciuto, è un tipo?" + +#: ../geanygendoc/src/ggd-file-type-loader.c:446 +#: ../geanygendoc/src/ggd-file-type-loader.c:490 +#: ../geanygendoc/src/ggd-file-type-loader.c:502 +#: ../geanygendoc/src/ggd-file-type-loader.c:540 +msgid "match identifier" +msgstr "identificatore match" + +#: ../geanygendoc/src/ggd-file-type-loader.c:454 +#, c-format +msgid "match identifier is empty" +msgstr "l'identificatore match è vuoto" + +#: ../geanygendoc/src/ggd-file-type-loader.c:472 +msgid "documentation type identifier" +msgstr "identificatore tipo documentazione" + +#: ../geanygendoc/src/ggd-file-type-loader.c:576 +#: ../geanygendoc/src/ggd-file-type-loader.c:588 +#: ../geanygendoc/src/ggd-file-type-loader.c:610 +msgid "documentation type" +msgstr "tipo documentazione" + +#: ../geanygendoc/src/ggd-file-type-loader.c:645 +#, c-format +msgid "invalid regular expression: %s" +msgstr "regular-expression non valida: %s" + +#: ../geanygendoc/src/ggd-file-type-loader.c:702 +#, c-format +msgid "invalid environment description: %s" +msgstr "descrizione ambiente non valida: %s" + +#: ../geanygendoc/src/ggd-file-type-loader.c:739 +#: ../geanygendoc/src/ggd-file-type-loader.c:750 +#: ../geanygendoc/src/ggd-file-type-loader.c:789 +msgid "setting" +msgstr "impostazione" + +#: ../geanygendoc/src/ggd-file-type-loader.c:817 +msgid "section name" +msgstr "nome sezione" + +#: ../geanygendoc/src/ggd-file-type-loader.c:828 +#, c-format +msgid "duplicated section \"%s\"" +msgstr "sezione duplicata \"%s\"" + +#: ../geanygendoc/src/ggd-file-type-loader.c:837 +#, c-format +msgid "invalid section name \"%s\"" +msgstr "nome sezione non valido \"%s\"" + +#: ../geanygendoc/src/ggd-file-type-loader.c:850 +#: ../geanygendoc/src/ggd-file-type-loader.c:902 +#, c-format +msgid "input is empty" +msgstr "l'input è vuoto" + +#: ../geanygendoc/src/ggd-file-type-loader.c:864 +#, c-format +msgid "Parser warning: %s:%u:%u: %s" +msgstr "Parser warning: %s:%u:%u: %s" + +#: ../geanygendoc/src/ggd-file-type-loader.c:867 +#, c-format +msgid "Parser error: %s:%u:%u: %s" +msgstr "Parser error: %s:%u:%u: %s" + +#: ../geanygendoc/src/ggd-file-type-loader.c:871 +#, c-format +msgid "%s:%u:%u: %s" +msgstr "%s:%u:%u: %s" + +#: ../geanygendoc/src/ggd-tag-utils.c:370 +msgid "Invalid tag" +msgstr "Tag non valido" + +#: ../geanygendoc/src/ggd-file-type-manager.c:181 +#, c-format +msgid "File type configuration file for language \"%s\" not found: %s" +msgstr "File configurazionazione tipo per il linguaggio \"%s\" non trovato: %s" + +#: ../geanygendoc/src/ggd-file-type-manager.c:191 +#, c-format +msgid "Failed to load file type \"%s\" from file \"%s\": %s" +msgstr "Impossibile caricare il file \"%s\" dal file \"%s\": %s" + +#: ../geanygendoc/src/ggd-plugin.c:57 +msgid "Documentation Generator" +msgstr "Documentation Generator" + +#: ../geanygendoc/src/ggd-plugin.c:58 +msgid "Generates documentation basis from source code" +msgstr "Genera la documentazione basandosi sul codice" + +#: ../geanygendoc/src/ggd-plugin.c:224 +#, c-format +msgid "Failed to load configuration: %s" +msgstr "Impossibile caricare la configurazione: %s" + +#: ../geanygendoc/src/ggd-plugin.c:245 +#, c-format +msgid "Failed to save configuration: %s" +msgstr "Impossibile salvare la configurazione: %s" + +#: ../geanygendoc/src/ggd-plugin.c:318 +#, c-format +msgid "Failed to find configuration file for file type \"%s\": %s" +msgstr "Impossibile trovare un file di configurazione per il tipo \"%s\": %s" + +#: ../geanygendoc/src/ggd-plugin.c:330 +msgid "" +"# Configuration for this file type doesn't exist yet.\n" +"# To create it, just write it in this file and save it. For the description\n" +"# of the syntax of this file, please refer to the manual.\n" +msgstr "" +"# La configurazione per questo tipo di fine non esiste ancora.\n" +"# Per crearla, scrivila in questo file e salvata. Per la descrizione\n" +"# della sintassi di questo file, controlla il manuale.\n" + +#: ../geanygendoc/src/ggd-plugin.c:342 +#, c-format +msgid "Failed to load file \"%s\": %s" +msgstr "Impossibile caricare il file \"%s\": %s" + +#: ../geanygendoc/src/ggd-plugin.c:415 ../geanygendoc/src/ggd-plugin.c:426 +msgid "Insert Documentation Comment" +msgstr "Inserisci commento di documentazione" + +#: ../geanygendoc/src/ggd-plugin.c:480 +msgid "_Document Current Symbol" +msgstr "Inserisci _documentazione al simbolo corrente" + +#: ../geanygendoc/src/ggd-plugin.c:481 +msgid "Generate documentation for the current symbol" +msgstr "Genera documentazione per il simbolo corrente" + +#: ../geanygendoc/src/ggd-plugin.c:487 +msgid "Document _All Symbols" +msgstr "Documenta _tutti i simboli" + +#: ../geanygendoc/src/ggd-plugin.c:488 +msgid "Generate documentation for all symbols in the current document" +msgstr "Genera la documentazione per tutti i simboli nel documento corrente" + +#: ../geanygendoc/src/ggd-plugin.c:498 +msgid "_Reload Configuration Files" +msgstr "_Ricarica il file di configurazione" + +#: ../geanygendoc/src/ggd-plugin.c:499 +msgid "Force reloading of the configuration files" +msgstr "Forza il reloading dei file di configurazione" + +#: ../geanygendoc/src/ggd-plugin.c:504 +msgid "_Edit Current Language Configuration" +msgstr "_Modifica la configurazione del linguaggio corrente" + +#: ../geanygendoc/src/ggd-plugin.c:505 +msgid "Open the current language configuration file for editing" +msgstr "Apri la configurazione del linguaggio corrente per la modifica" + +#: ../geanygendoc/src/ggd-plugin.c:515 +msgid "Open _Manual" +msgstr "Apri _manuale" + +#: ../geanygendoc/src/ggd-plugin.c:516 +msgid "Open the manual in a browser" +msgstr "Apri il manuale nel browser" + +#. build tools menu item +#: ../geanygendoc/src/ggd-plugin.c:520 +msgid "_Documentation Generator" +msgstr "_Documentation Generator" + +#. General +#: ../geanygendoc/src/ggd-plugin.c:619 +msgid "General" +msgstr "Generale" + +#. auto-save +#: ../geanygendoc/src/ggd-plugin.c:624 +msgid "_Save file before generating documentation" +msgstr "_Salva il file prima di generare la documentazione" + +#: ../geanygendoc/src/ggd-plugin.c:627 +msgid "" +"Whether the current document should be saved to disc before generating the " +"documentation. This is a technical detail, but it is currently needed to " +"have an up-to-date tag list. If you disable this option and ask for " +"documentation generation on a modified document, the behavior may be " +"surprising since the comment will be generated for the last saved state of " +"this document and not the current one." +msgstr "" +"Salva il documento corrente su disco prima di generare la documentazione." +"E' un dettaglio tecnico, ma è attualmente richiesto per avere una lista tag" +"corretta. Se disabiliti questa opzione e avvii la generazione della documentazione" +"su un documento modificato, il comportamento può sorprendere dato che il commento" +"sarà generato per l'ultimo stato salvato di questo documento e non il corrente." + +#. indent +#: ../geanygendoc/src/ggd-plugin.c:637 +msgid "_Indent inserted documentation" +msgstr "_Indenta la documentazione inserita" + +#: ../geanygendoc/src/ggd-plugin.c:639 +msgid "" +"Whether the inserted documentation should be indented to fit the indentation " +"at the insertion position." +msgstr "" +"Indenta la documentazione inserita per raggiungere l'indentazione" +"alla posizione di inserimento." + +#. Documentation type +#: ../geanygendoc/src/ggd-plugin.c:646 +#: ../geanygendoc/src/ggd-widget-doctype-selector.c:144 +msgid "Documentation type" +msgstr "Tipo di documentazione" + +#: ../geanygendoc/src/ggd-plugin.c:656 +msgid "" +"Choose the documentation type to use with each file type. The special " +"language \"All\" on top of the list is used to choose the default " +"documentation type, used for all languages that haven't one set." +msgstr "" +"Scegli il tipo di documentazione per usarlo con ogni tipo di file. " +"Il linguaggio speciale \"Tutti\" in cima alla lista è usato per scegliere " +"il tipo di documentazione di default, utilizzato da tutti i linguaggi " +"che non ne hanno uno." + +#. Environ editor +#: ../geanygendoc/src/ggd-plugin.c:662 +msgid "Global environment" +msgstr "Ambiente globale" + +#: ../geanygendoc/src/ggd-plugin.c:664 +msgid "" +"Global environment overrides and additions. This environment will be merged " +"with the file-type-specific ones." +msgstr "" +"Ambiente globale sovrascrive e aggiunge. Questo ambiente sarà unito con " +"quello specifico del tipo di file." + +#: ../geanygendoc/src/ggd-utils.c:184 ../geanygendoc/src/ggd-utils.c:195 +#, c-format +msgid "File \"%s\" exists but is not a regular file" +msgstr "Il file \"%s\" esiste ma non è un file regolare" + +#: ../geanygendoc/src/ggd-utils.c:204 +#, c-format +msgid "%s: no such file or directory" +msgstr "%s: impossibile trovare file o directory" + +#: ../geanygendoc/src/ggd.c:85 +#, c-format +msgid "Failed to resize memory output stream" +msgstr "Impossibile ridimensionare la memoria di output stream" + +#: ../geanygendoc/src/ggd.c:114 +#, c-format +msgid "" +"Argument parsing regular expression did not match (argument list was: \"%s\")" +msgstr "" +"Il parsing regular-expression dell'argomento non corrisponde (la lista " +"argomenti era: \"%s\")" + +#: ../geanygendoc/src/ggd.c:248 +#, c-format +msgid "Failed to add global environment, skipping: %s" +msgstr "Impossibile aggiungere un ambiente globale, salto: %s" + +#: ../geanygendoc/src/ggd.c:254 +#, c-format +msgid "Failed to build comment: %s" +msgstr "Impossibile generare il commento: %s" + +#: ../geanygendoc/src/ggd.c:432 +#, c-format +msgid "Documentation type \"%s\" does not exist for language \"%s\"." +msgstr "Il tipo di documentazione \"%s\" non esiste per il linguaggio \"%s\"." + +#: ../geanygendoc/src/ggd.c:487 +#, c-format +msgid "No setting applies to symbol \"%s\" of type \"%s\" at line %lu." +msgstr "Nessuna impostazione si applica al simbolo \"%s\" del tipo \"%s\" " +"alla linea %lu." + +#: ../geanygendoc/src/ggd.c:533 +#, c-format +msgid "No valid tag at line %d." +msgstr "Tag non valido alla linea %d." + +#: ../geanygendoc/src/ggd.c:582 +msgid "No tags in the document" +msgstr "Nessun tag nel documento" + +#: ../geanygendoc/src/ggd-options.c:326 +msgid "Unknown option" +msgstr "Opzione non conosciuta" + +#: ../geanygendoc/src/ggd-options.c:335 +msgid "" +"Invalid option or proxy: either the proxy's property or the option type is " +"incompatible." +msgstr "" +"Opzione o proxy non valido: o la proprietà del proxy o il tipo dell'opzione " +"sono incompatibili" + +#: ../geanygendoc/src/ggd-options.c:512 +#, c-format +msgid "Unknown value type for keyfile entry %s::%s" +msgstr "value-type non conosciuto per il file chiave %s::%s" + +#: ../geanygendoc/src/ggd-options.c:516 +#, c-format +msgid "Error retrieving keyfile entry %s::%s: %s" +msgstr "Impossibile ottenere il file chiave %s::%s: %s" + +#: ../geanygendoc/src/ggd-widget-doctype-selector.c:135 +msgid "Language" +msgstr "Linguaggio" + +#: ../geanygendoc/src/ggd-widget-doctype-selector.c:155 +msgid "_Change associated documentation type" +msgstr "_Cambia associazione tipo documentazione" + +#: ../geanygendoc/src/ggd-widget-doctype-selector.c:163 +msgid "_Disassociate documentation type" +msgstr "_Disassocia tipo documentazione" + +#: ../geanygendoc/src/ggd-widget-doctype-selector.c:194 +msgid "All" +msgstr "Tutti" + +#: ../geanygendoc/src/ggd-widget-doctype-selector.c:195 +msgid "Default documentation type for languages that does not have one set" +msgstr "Tipo di documentazione di default per i linguaggi che non ne hanno uno" + +#: ../geanyinsertnum/src/insertnum.c:44 ../geanyinsertnum/src/insertnum.c:337 +#: ../geanyinsertnum/src/insertnum.c:484 +msgid "Insert Numbers" +msgstr "Inserisci numeri" + +#: ../geanyinsertnum/src/insertnum.c:44 +msgid "Insert/Fill columns with numbers." +msgstr "Inserisci/Riempi colonne con numeri." + +#: ../geanyinsertnum/src/insertnum.c:146 +msgid "Counting..." +msgstr "Conteggio..." + +#: ../geanyinsertnum/src/insertnum.c:194 +msgid "Preparing..." +msgstr "Preparazione..." + +#: ../geanyinsertnum/src/insertnum.c:200 +msgid "Inserting..." +msgstr "Inserimento..." + +#: ../geanyinsertnum/src/insertnum.c:333 +msgid "For base 11 and above" +msgstr "Per base 11 e superiori" + +#: ../geanyinsertnum/src/insertnum.c:353 +msgid "_Start:" +msgstr "_Avvia:" + +#: ../geanyinsertnum/src/insertnum.c:358 +msgid "S_tep:" +msgstr "S_tep:" + +#: ../geanyinsertnum/src/insertnum.c:364 +msgid "_Base:" +msgstr "_Base:" + +#: ../geanyinsertnum/src/insertnum.c:380 +msgid "Letters:" +msgstr "Lettere:" + +#: ../geanyinsertnum/src/insertnum.c:383 +msgid "_Upper" +msgstr "_Alto" + +#: ../geanyinsertnum/src/insertnum.c:388 +msgid "_Lower" +msgstr "_Basso" + +#: ../geanyinsertnum/src/insertnum.c:393 +msgid "Base _prefix" +msgstr "_Prefisso base" + +#: ../geanyinsertnum/src/insertnum.c:395 +msgid "0 for octal, 0x for hex, + for positive decimal" +msgstr "0 per ottale, 0x per esadecimale, + per decimali positivi" + +#: ../geanyinsertnum/src/insertnum.c:397 +msgid "Padding:" +msgstr "Padding:" + +#: ../geanyinsertnum/src/insertnum.c:399 +msgid "Sp_ace" +msgstr "Sp_azio" + +#: ../geanyinsertnum/src/insertnum.c:402 +msgid "_Zero" +msgstr "_Zero" + +#: ../geanyinsertnum/src/insertnum.c:477 +msgid "Insert _Numbers" +msgstr "Inserisci _Numeri" + +#: ../geanylatex/src/latexenvironments.c:25 +msgid "Environments" +msgstr "Ambienti" + +#: ../geanylatex/src/latexenvironments.c:26 +msgid "Formating" +msgstr "Formattazione" + +#: ../geanylatex/src/latexenvironments.c:27 +msgid "Document Structure" +msgstr "Struttura documento" + +#: ../geanylatex/src/latexenvironments.c:28 +msgid "Lists" +msgstr "Liste" + +#: ../geanylatex/src/latexenvironments.c:29 +msgid "Math" +msgstr "Matematica" + +#: ../geanylatex/src/latexenvironments.c:194 +msgid "Insert Environment" +msgstr "Inserisci Ambiente" + +#: ../geanylatex/src/latexenvironments.c:208 +msgid "Environment:" +msgstr "Ambiente:" + +#: ../geanylatex/src/latexutils.c:87 +#, c-format +msgid "" +"Could not determine where to insert package: %s\n" +"Please try insert package manually" +msgstr "" +"Impossibile determinare dove inserire il package: %s\n" +"Prova a inserire il package manualmente" + +#: ../geanylatex/src/latexutils.c:89 +#, c-format +msgid "Could not determine where to insert package: %s" +msgstr "Impossibile determinare dove inserire il package: %s" + +#: ../geanylatex/src/bibtexlabels.c:27 +msgid "Article (@Article)" +msgstr "Articolo (@Article)" + +#: ../geanylatex/src/bibtexlabels.c:28 +msgid "Book (@Book)" +msgstr "Libro (@Book)" + +#: ../geanylatex/src/bibtexlabels.c:29 +msgid "Booklet (@Booklet)" +msgstr "Libretto (@Booklet)" + +#: ../geanylatex/src/bibtexlabels.c:30 +msgid "Conference (@Conference)" +msgstr "Conferenza (@Conference)" + +#: ../geanylatex/src/bibtexlabels.c:31 +msgid "Inbook (@Inbook)" +msgstr "Inbook (@Inbook)" + +#: ../geanylatex/src/bibtexlabels.c:32 +msgid "Incollection (@Incollection)" +msgstr "Incollection (@Incollection)" + +#: ../geanylatex/src/bibtexlabels.c:33 +msgid "Inproceedings (@Inproceedings)" +msgstr "Inproceedings (@Inproceedings)" + +#: ../geanylatex/src/bibtexlabels.c:34 +msgid "Manual (@Manual)" +msgstr "Manuale (@Manual)" + +#: ../geanylatex/src/bibtexlabels.c:35 +msgid "Mastersthesis (@Mastersthesis)" +msgstr "Mastersthesis (@Mastersthesis)" + +#: ../geanylatex/src/bibtexlabels.c:36 +msgid "Misc (@Misc)" +msgstr "Misc (@Misc)" + +#: ../geanylatex/src/bibtexlabels.c:37 +msgid "PhdThesis (@PhdThesis)" +msgstr "PhdThesis (@PhdThesis)" + +#: ../geanylatex/src/bibtexlabels.c:38 +msgid "Proceedings (@Proceedings)" +msgstr "Proceedings (@Proceedings)" + +#: ../geanylatex/src/bibtexlabels.c:39 +msgid "Techreport (@Techreport)" +msgstr "Report tecnico (@Techreport)" + +#: ../geanylatex/src/bibtexlabels.c:40 +msgid "Unpublished (@Unpublished)" +msgstr "Unpublished (@Unpublished)" + +#: ../geanylatex/src/bibtexlabels.c:47 +msgid "Annote" +msgstr "Annotazione" + +#: ../geanylatex/src/bibtexlabels.c:48 +msgid "Author" +msgstr "Autore" + +#: ../geanylatex/src/bibtexlabels.c:49 +msgid "Booktitle" +msgstr "Titolo libro" + +#: ../geanylatex/src/bibtexlabels.c:50 +msgid "Chapter" +msgstr "Capitolo" + +#: ../geanylatex/src/bibtexlabels.c:51 +msgid "Crossref" +msgstr "Crossref" + +#: ../geanylatex/src/bibtexlabels.c:52 +msgid "Edition" +msgstr "Edizione" + +#: ../geanylatex/src/bibtexlabels.c:53 +msgid "Editor" +msgstr "Editor" + +#: ../geanylatex/src/bibtexlabels.c:54 +msgid "E-print" +msgstr "E-print" + +#: ../geanylatex/src/bibtexlabels.c:55 +msgid "HowPublished" +msgstr "HowPublished" + +#: ../geanylatex/src/bibtexlabels.c:56 +msgid "Institution" +msgstr "Istitutzione" + +#: ../geanylatex/src/bibtexlabels.c:57 +msgid "Journal" +msgstr "Giornale" + +#: ../geanylatex/src/bibtexlabels.c:58 +msgid "Key" +msgstr "Chiave" + +#: ../geanylatex/src/bibtexlabels.c:59 +msgid "Month" +msgstr "Mese" + +#: ../geanylatex/src/bibtexlabels.c:60 +msgid "Note" +msgstr "Nota" + +#: ../geanylatex/src/bibtexlabels.c:61 +msgid "Number" +msgstr "Numbero" + +#: ../geanylatex/src/bibtexlabels.c:62 +msgid "Organization" +msgstr "Organizzazione" + +#: ../geanylatex/src/bibtexlabels.c:63 +msgid "Pages" +msgstr "Pagine" + +#: ../geanylatex/src/bibtexlabels.c:64 +msgid "Publisher" +msgstr "Editore" + +#: ../geanylatex/src/bibtexlabels.c:65 +msgid "School" +msgstr "Scuola" + +#: ../geanylatex/src/bibtexlabels.c:66 +msgid "Series" +msgstr "Serie" + +#: ../geanylatex/src/bibtexlabels.c:67 +msgid "Title" +msgstr "Titolo" + +#: ../geanylatex/src/bibtexlabels.c:69 +msgid "URL" +msgstr "URL" + +#: ../geanylatex/src/bibtexlabels.c:70 +msgid "Volume" +msgstr "Volume" + +#: ../geanylatex/src/bibtexlabels.c:71 +msgid "Year" +msgstr "Anno" + +#: ../geanylatex/src/bibtexlabels.c:103 +msgid "Address of publisher" +msgstr "Indirizzo dell'editore" + +#: ../geanylatex/src/bibtexlabels.c:104 +msgid "Annotation for annotated bibliography styles" +msgstr "Annotazione per stili bibliografici" + +#: ../geanylatex/src/bibtexlabels.c:105 +msgid "Name(s) of the author(s), separated by 'and' if more than one" +msgstr "Nome/i dell'autore/i, separati da 'e' se più di uno" + +#: ../geanylatex/src/bibtexlabels.c:106 +msgid "Title of the book, if only part of it is being cited" +msgstr "Titolo del libro, solo se una parte di esso viene citata" + +#: ../geanylatex/src/bibtexlabels.c:107 +msgid "Chapter number" +msgstr "Numero capitolo" + +#: ../geanylatex/src/bibtexlabels.c:108 +msgid "Citation key of the cross-referenced entry" +msgstr "Chiave di citazione della voce cross-referenced" + +#: ../geanylatex/src/bibtexlabels.c:109 +msgid "Edition of the book (such as \"first\" or \"second\")" +msgstr "Edizione del libro (come \"prima\" o \"seconda\")" + +#: ../geanylatex/src/bibtexlabels.c:110 +msgid "Name(s) of the editor(s), separated by 'and' if more than one" +msgstr "Nome/i dell'editore/i, separati da 'e' se più di uno" + +#: ../geanylatex/src/bibtexlabels.c:111 +msgid "Specification of electronic publication" +msgstr "Specifica di pubblicazione elettronica" + +#: ../geanylatex/src/bibtexlabels.c:112 +msgid "Publishing method if the method is nonstandard" +msgstr "Metodo di pubblicazione se il metodo non è standard" + +#: ../geanylatex/src/bibtexlabels.c:113 +msgid "Institution that was involved in the publishing" +msgstr "Istitutzione che è coinvolta nella pubblicazione" + +#: ../geanylatex/src/bibtexlabels.c:114 +msgid "Journal or magazine in which the work was published" +msgstr "Giornale o rivista in cui il lavoro sarà pubblicata" + +#: ../geanylatex/src/bibtexlabels.c:115 +msgid "" +"Hidden field used for specifying or overriding the alphabetical order of " +"entries" +msgstr "" +"Campi nascosti usati per specificare o sovrascrivere l'ordine alfabetico " +"delle voci" + +#: ../geanylatex/src/bibtexlabels.c:116 +msgid "Month of publication or creation if unpublished" +msgstr "" +"Mese di pubblicazione o, se non pubblicato, di creazione" + +#: ../geanylatex/src/bibtexlabels.c:117 +msgid "Miscellaneous extra information" +msgstr "Altre informazione extra" + +#: ../geanylatex/src/bibtexlabels.c:118 +msgid "Number of journal, magazine, or tech-report" +msgstr "Numero del giornale, rivista o report tecnico" + +#: ../geanylatex/src/bibtexlabels.c:119 +msgid "Sponsor of the conference" +msgstr "Sponsor della conferenza" + +#: ../geanylatex/src/bibtexlabels.c:120 +msgid "Page numbers separated by commas or double-hyphens" +msgstr "Numeri di pagine separati da virgole o doppi trattini" + +#: ../geanylatex/src/bibtexlabels.c:121 +msgid "Name of publisher" +msgstr "Nome dell'editore" + +#: ../geanylatex/src/bibtexlabels.c:122 +msgid "School where thesis was written" +msgstr "Scuola dove la tesi è stata scritta." + +#: ../geanylatex/src/bibtexlabels.c:123 +msgid "Series of books in which the book was published" +msgstr "Serie di libri in cui il libro fa parte" + +#: ../geanylatex/src/bibtexlabels.c:124 +msgid "Title of the work" +msgstr "Titolo del lavoro" + +#: ../geanylatex/src/bibtexlabels.c:125 +msgid "Type of technical report" +msgstr "Tipo di report tecnico" + +#: ../geanylatex/src/bibtexlabels.c:126 +msgid "Internet address" +msgstr "Indirizzo Internet" + +#: ../geanylatex/src/bibtexlabels.c:127 +msgid "Number of the volume" +msgstr "Numero del volume" + +#: ../geanylatex/src/bibtexlabels.c:128 +msgid "Year of publication or creation if unpublished" +msgstr "Anno di pubblicazione, o se non pubblicato, di creazione" + +#: ../geanylatex/src/geanylatex.c:41 +msgid "GeanyLaTeX" +msgstr "GeanyLaTeX" + +#: ../geanylatex/src/geanylatex.c:42 +msgid "Plugin to provide better LaTeX support" +msgstr "Plugin per fornire un supporto migliore di LaTeX" + +#: ../geanylatex/src/geanylatex.c:116 +msgid "Runs LaTeX wizard" +msgstr "Esegui wizard LaTeX" + +#: ../geanylatex/src/geanylatex.c:117 +msgid "Marks selected text as italic" +msgstr "Imposta il testo selezionato come corsivo" + +#: ../geanylatex/src/geanylatex.c:118 +msgid "Marks selected text as bold" +msgstr "Imposta ilt esto selezionato come grassetto" + +#: ../geanylatex/src/geanylatex.c:119 +msgid "Underlines selected text" +msgstr "Sottolinea il testo selezionato" + +#: ../geanylatex/src/geanylatex.c:120 ../geanylatex/src/formatpatterns.c:45 +msgid "Centered" +msgstr "Centrato" + +#: ../geanylatex/src/geanylatex.c:121 ../geanylatex/src/formatpatterns.c:46 +msgid "Left side oriented" +msgstr "A sinistra" + +#: ../geanylatex/src/geanylatex.c:122 ../geanylatex/src/formatpatterns.c:47 +msgid "Right side oriented" +msgstr "A destra" + +#: ../geanylatex/src/geanylatex.c:298 +msgid "Use KOMA script by default" +msgstr "Utilizza lo script KOMA di default" + +#: ../geanylatex/src/geanylatex.c:300 +msgid "Show extra plugin toolbar" +msgstr "Visualizza una extra-toolbar per il plugin" + +#: ../geanylatex/src/geanylatex.c:302 +msgid "Capitalize sentence on typing" +msgstr "Rendi maiuscola la prima lettera mentre scrivi" + +#: ../geanylatex/src/geanylatex.c:304 +msgid "Add a wizard icon to Geany's main toolbar" +msgstr "Aggiungi un'icona wizard al toolbar principale di Geany" + +#: ../geanylatex/src/geanylatex.c:306 +msgid "Lower selection when formating smallcaps (\\textsc{})" +msgstr "" +"Passare la selezione in minuscono quando è formattata in maiuscoletto " +"(\\textsc{})" + +#: ../geanylatex/src/geanylatex.c:310 +#, fuzzy +msgid "Don't care about this inside plugin" +msgstr "Non interessarti di questo per il plugin" + +#: ../geanylatex/src/geanylatex.c:312 +msgid "Always perform autocompletion on LaTeX" +msgstr "Esegui sempre l'autocompletamento in LaTeX" + +#: ../geanylatex/src/geanylatex.c:325 +msgid "Modus of autocompletion" +msgstr "Modo di autocompletamento" + +#: ../geanylatex/src/geanylatex.c:809 +msgid "Insert Label" +msgstr "Inserisci etichetta" + +#: ../geanylatex/src/geanylatex.c:811 +msgid "Label name:" +msgstr "Nome etichetta" + +#: ../geanylatex/src/geanylatex.c:833 +msgid "Insert Command" +msgstr "Inserisci comando" + +#: ../geanylatex/src/geanylatex.c:835 +msgid "Command name:" +msgstr "Nome comando:" + +#: ../geanylatex/src/geanylatex.c:878 +msgid "Insert Reference" +msgstr "Inserisci Riferimento" + +#: ../geanylatex/src/geanylatex.c:891 +msgid "Reference name:" +msgstr "Nome Riferimento:" + +#: ../geanylatex/src/geanylatex.c:916 +msgid "_Standard Reference" +msgstr "Riferimento _Standard" + +#: ../geanylatex/src/geanylatex.c:921 +msgid "_Page Reference" +msgstr "Riferimento _Pagina" + +#: ../geanylatex/src/geanylatex.c:926 +msgid "_Add both" +msgstr "_Aggiungi entrambi" + +#: ../geanylatex/src/geanylatex.c:1123 +msgid "More" +msgstr "More" + +#: ../geanylatex/src/geanylatex.c:1179 +msgid "Add additional package" +msgstr "Aggiungi package aggiuntivo" + +#: ../geanylatex/src/geanylatex.c:1192 +msgid "Package name:" +msgstr "Nome package:" + +#: ../geanylatex/src/geanylatex.c:1195 +msgid "Package options:" +msgstr "Opzioni package:" + +#: ../geanylatex/src/geanylatex.c:1243 +msgid "Insert BibTeX Reference" +msgstr "Inserisci riferimento BibTeX" + +#: ../geanylatex/src/geanylatex.c:1256 +msgid "BibTeX reference name:" +msgstr "Nome riferimento BibTeX:" + +#: ../geanylatex/src/geanylatex.c:1679 +msgid "Dear Sir or Madame" +msgstr "Gentile Signore o Signora" + +#: ../geanylatex/src/geanylatex.c:1680 +msgid "With kind regards" +msgstr "Cordiali saluti" + +#: ../geanylatex/src/geanylatex.c:1688 +msgid "No template assigned. Aborting" +msgstr "Nessun template assignato. Aborting" + +#. Building the wizard-dialog and showing it +#: ../geanylatex/src/geanylatex.c:1715 +msgid "LaTeX-Wizard" +msgstr "LaTeX-Wizard" + +#. Templates +#. * Adds custom templates if there are any. If there are none just +#. * adds default one +#. TEMPLATE FILE +#: ../geanylatex/src/geanylatex.c:1730 ../markdown/src/conf.c:659 +msgid "Template:" +msgstr "Template:" + +#: ../geanylatex/src/geanylatex.c:1734 +msgid "Set the template which should be used for creating the new document" +msgstr "Imposta il template che dovrà essere usato per creare un nuovo " +"documento" + +#: ../geanylatex/src/geanylatex.c:1743 +msgid "Default" +msgstr "Default" + +#. Documentclass +#: ../geanylatex/src/geanylatex.c:1754 +msgid "Documentclass:" +msgstr "Documentclass:" + +#: ../geanylatex/src/geanylatex.c:1757 +msgid "Choose the kind of document you want to write" +msgstr "Scegli il tipo di documento che vuoi scrivere" + +#: ../geanylatex/src/geanylatex.c:1761 +msgid "Article" +msgstr "Articolo" + +#: ../geanylatex/src/geanylatex.c:1763 +msgid "Report" +msgstr "Report" + +#: ../geanylatex/src/geanylatex.c:1765 +msgid "Letter" +msgstr "Lettera" + +#: ../geanylatex/src/geanylatex.c:1767 +msgid "Presentation" +msgstr "Presentazione" + +#. Encoding +#: ../geanylatex/src/geanylatex.c:1777 +msgid "Encoding:" +msgstr "Codifica:" + +#: ../geanylatex/src/geanylatex.c:1781 +msgid "Set the encoding for your new document" +msgstr "Imposta la codifica per il tuo nuovo documento" + +#. fontsize +#: ../geanylatex/src/geanylatex.c:1797 +msgid "Font size" +msgstr "Dimensione testo" + +#: ../geanylatex/src/geanylatex.c:1803 +msgid "Set the default font size of your new document" +msgstr "Imposta la dimensione del testo predefinita per i nuovi documenti" + +#. Author +#: ../geanylatex/src/geanylatex.c:1815 +msgid "Author:" +msgstr "Autore:" + +#: ../geanylatex/src/geanylatex.c:1818 +msgid "" +"Sets the value of the \\author command. In most cases this should be your " +"name" +msgstr "" +"Imposta il valore del comando \\author. Nella maggior parte dei casi questo " +"dovrebbe essere il tuo nome." + +#. Date +#: ../geanylatex/src/geanylatex.c:1832 +msgid "Date:" +msgstr "Data:" + +#: ../geanylatex/src/geanylatex.c:1835 +msgid "" +"Sets the value of the \\date command inside header of your new created LaTeX-" +"document. Keeping it at \\today is a good decision if you don't need any " +"fixed date." +msgstr "" +"Imposta il valore del comando \\date dentro l'header del tuo nuovo documento " +"LaTeX. Tieni presente che \\today può essere usato se non hai necessità " +"di una data fissa." + +#. Title of the new document +#: ../geanylatex/src/geanylatex.c:1847 +msgid "Title:" +msgstr "Titolo:" + +#: ../geanylatex/src/geanylatex.c:1850 +msgid "Sets the title of your new document." +msgstr "Imposta il titolo del tuo nuovo documento." + +#. Papersize +#: ../geanylatex/src/geanylatex.c:1859 +msgid "Paper size:" +msgstr "Dimensione pagina:" + +#: ../geanylatex/src/geanylatex.c:1862 +msgid "Choose the paper format for the newly created document" +msgstr "Scegli il formato della pagina per il nuovo documento creato" + +#. Paper direction +#: ../geanylatex/src/geanylatex.c:1875 +msgid "Paper Orientation:" +msgstr "Orientazione pagina:" + +#: ../geanylatex/src/geanylatex.c:1878 +msgid "Choose the paper orientation for the newly created document" +msgstr "Scegli l'orientamento della pagina per il nuovo documento creato" + +#: ../geanylatex/src/geanylatex.c:1899 +msgid "Use KOMA-script classes if possible" +msgstr "Usa le classi di KOMA-script se possibile" + +#: ../geanylatex/src/geanylatex.c:1901 +msgid "" +"Uses the KOMA-script classes by Markus Kohm.\n" +"Keep in mind: To compile your document these classes have to be installed " +"before." +msgstr "" +"Usa le classi KOMA-script di Markus Kohm.\n" +"Tieni presente: per compilare il tuo documento le classi devono essere " +"installate precedentemente." + +#: ../geanylatex/src/geanylatex.c:1908 +msgid "Use draft mode" +msgstr "Usa modalità bozza" + +#: ../geanylatex/src/geanylatex.c:1910 +msgid "" +"Set the draft flag inside new created documents to get documents with a " +"number of debugging helpers" +msgstr "" +"Imposta il flag bozza all'interno dei nuovi documenti per ottenere documenti " +"con un alcuni aiuti per il debugging" + +#: ../geanylatex/src/geanylatex.c:1927 +msgid "Run LaTeX-Wizard" +msgstr "Esegui LaTeX-Wizard" + +#: ../geanylatex/src/geanylatex.c:1929 +msgid "Insert \\label" +msgstr "Inserisci \\label" + +#: ../geanylatex/src/geanylatex.c:1931 +msgid "Insert \\ref" +msgstr "Inserisci \\ref" + +#: ../geanylatex/src/geanylatex.c:1933 +msgid "Insert linebreak \\\\ " +msgstr "Inserisci fine riga \\\\ " + +#: ../geanylatex/src/geanylatex.c:1936 +msgid "Insert command" +msgstr "Inserisci comando" + +#: ../geanylatex/src/geanylatex.c:1938 +msgid "Turn input replacement on/off" +msgstr "Attiva/Disattiva sostituzione input" + +#: ../geanylatex/src/geanylatex.c:1942 +msgid "Replace special characters" +msgstr "Sostituisci caratteri speciali" + +#: ../geanylatex/src/geanylatex.c:1945 +msgid "Run insert environment dialog" +msgstr "Mostra la finestra di dialogo inserimento ambiente" + +#: ../geanylatex/src/geanylatex.c:1947 +msgid "Insert \\item" +msgstr "Inserisci \\item" + +#: ../geanylatex/src/geanylatex.c:1949 +msgid "Format selection in bold font face" +msgstr "Imposta grassetto su selezione corrente" + +#: ../geanylatex/src/geanylatex.c:1951 +msgid "Format selection in italic font face" +msgstr "Imposta corsivo su selezione corrente" + +#: ../geanylatex/src/geanylatex.c:1953 +msgid "Format selection in typewriter font face" +msgstr "Imposta typewriter su selezione corrente" + +#: ../geanylatex/src/geanylatex.c:1955 +msgid "Format selection centered" +msgstr "Centra la selezione corrente" + +#: ../geanylatex/src/geanylatex.c:1957 +msgid "Format selection left-aligned" +msgstr "Allinea a sinistra la selezione corrente" + +#: ../geanylatex/src/geanylatex.c:1959 +msgid "Format selection right-aligned" +msgstr "Allinea a destra la selezione corrente" + +#: ../geanylatex/src/geanylatex.c:1962 +msgid "Insert description list" +msgstr "Inserisci una lista di descrizione" + +#: ../geanylatex/src/geanylatex.c:1965 +msgid "Insert itemize list" +msgstr "Inserisci elenco puntato" + +#: ../geanylatex/src/geanylatex.c:1968 +msgid "Insert enumerate list" +msgstr "Inserisci elenco numerato" + +#: ../geanylatex/src/geanylatex.c:1971 +msgid "Set selection one level up" +msgstr "Imposta selezione un livello sopra" + +#: ../geanylatex/src/geanylatex.c:1974 +msgid "Set selection one level down" +msgstr "Imposta selezione un livello sotto" + +#: ../geanylatex/src/geanylatex.c:1977 +msgid "Insert \\usepackage{}" +msgstr "Inserisci \\usepackage{}" + +#: ../geanylatex/src/geanylatex.c:1980 +msgid "Insert BibTeX reference dialog" +msgstr "Inserisci riferimento BibTeX" + +#: ../geanylatex/src/geanylatex.c:1987 +msgid "" +"GeanyLaTeX is a plugin to improve support for LaTeX in Geany.\n" +"\n" +"Please report all bugs or feature requests to one of the authors." +msgstr "" +"GeanyLaTeX è un plugin per migliorare il supporto LaTeX in Geany.\n" +"\n" +"Riporta tutti gli eventuali bug o richieste di nuove funzionalità a " +"uno degli autori." + +#: ../geanylatex/src/geanylatex.c:2025 +msgid "" +"glatex_set_autocompletion_contextsize has been initialized with an invalid " +"value. Default value taken. Please check your configuration file" +msgstr "" +"glatex_set_autocompletion_contextsize è stato inizializzato con un valore " +"non valido. Saranno usati i valori di default, si prega di controllare il " +"file di configurazione." + +#: ../geanylatex/src/geanylatex.c:2047 ../geanylatex/src/geanylatex.c:2054 +msgid "page \\pageref{{{reference}}}" +msgstr "pagina \\pageref{{{reference}}}" + +#: ../geanylatex/src/geanylatex.c:2051 ../geanylatex/src/geanylatex.c:2058 +msgid "\\ref{{{reference}}}, page \\pageref{{{reference}}}" +msgstr "\\ref{{{reference}}}, pagina \\pageref{{{reference}}}" + +#. Build up menu for menubar +#: ../geanylatex/src/geanylatex.c:2106 +msgid "_LaTeX" +msgstr "_LaTeX" + +#. Filling up menubar menus +#. LaTeX menu +#: ../geanylatex/src/geanylatex.c:2115 ../geanylatex/src/geanylatex.c:2327 +msgid "LaTeX-_Wizard" +msgstr "LaTeX-_Wizard" + +#: ../geanylatex/src/geanylatex.c:2118 ../geanylatex/src/geanylatex.c:2330 +msgid "Starts a Wizard to easily create LaTeX-documents" +msgstr "Avvia un Wizard per creare facilemente documenti LaTeX" + +#: ../geanylatex/src/geanylatex.c:2123 +msgid "I_nsert Special Character" +msgstr "I_nserisci Carattere Speciale" + +#: ../geanylatex/src/geanylatex.c:2125 +msgid "Helps to use some not very common letters and signs" +msgstr "Aiuta non usare molto lettere e segni non comuni." + +#: ../geanylatex/src/geanylatex.c:2135 +msgid "Insert _Reference" +msgstr "Inserisci _Riferimento" + +#: ../geanylatex/src/geanylatex.c:2137 +msgid "Inserting references to the document" +msgstr "Inserimento riferimenti al documento" + +#: ../geanylatex/src/geanylatex.c:2142 +msgid "Insert _Label" +msgstr "Inserisci _Etichetta" + +#: ../geanylatex/src/geanylatex.c:2144 +msgid "Helps at inserting labels to a document" +msgstr "Aiuta a inserire etichette al documento" + +#: ../geanylatex/src/geanylatex.c:2150 +msgid "Insert _Environment" +msgstr "Inserisci _Ambiente" + +#: ../geanylatex/src/geanylatex.c:2152 +msgid "Helps at inserting an environment a document" +msgstr "Aiuta a inserire un ambiente al documento" + +#: ../geanylatex/src/geanylatex.c:2158 +msgid "Insert P_ackage" +msgstr "Inserisci _Package" + +#: ../geanylatex/src/geanylatex.c:2160 +msgid "A small dialog to insert \\usepackage{} into header of current file" +msgstr "" +"Un piccolo dialogo per inserire \\usepackage{} dentro l'header " +"del file corrente" + +#: ../geanylatex/src/geanylatex.c:2165 ../scope/data/scope.glade.h:58 +msgid "_Format" +msgstr "_Formato" + +#. Add font size menu +#: ../geanylatex/src/geanylatex.c:2182 +msgid "F_ont size" +msgstr "_Dimensione Testo" + +#: ../geanylatex/src/geanylatex.c:2200 +msgid "_Special Character Replacement" +msgstr "_Sostituzione Carattere Speciale" + +#: ../geanylatex/src/geanylatex.c:2208 +msgid "Bulk _Replace Special Characters" +msgstr "Amplia _Sostituzione Caratteri Speciali" + +#: ../geanylatex/src/geanylatex.c:2210 +msgid "_Replace selected special characters with TeX substitutes" +msgstr "_Sostituisci i caratteri speciali con sostituti TeX" + +#: ../geanylatex/src/geanylatex.c:2218 +msgid "Toggle _Special Character Replacement" +msgstr "A_ttiva/Disattiva sostituzione caratteri speciali" + +#: ../geanylatex/src/geanylatex.c:2229 +msgid "Insert _Command" +msgstr "Inserisci _Comando" + +#: ../geanylatex/src/geanylatex.c:2231 +msgid "Inserting costumized command to document" +msgstr "Inserisci un comando personalizzato al documento" + +#: ../geanylatex/src/geanylatex.c:2256 +msgid "_BibTeX" +msgstr "_BibTeX" + +#: ../geanylatex/src/geanylatex.c:2264 +msgid "Insert B_ibTeX reference" +msgstr "Inserisci riferimento B_ibTeX" + +#: ../geanylatex/src/geanylatex.c:2266 +msgid "Helps to insert a reference out of BibTeX files" +msgstr "Aiuta a inserire un riferimento fuori dai BibTeX file" + +#: ../geanylatex/src/geanylatex.c:2271 +msgid "_BibTeX entries" +msgstr "voce _BibTeX" + +#: ../geanylatex/src/letters.c:40 +msgid "LaTeX letters" +msgstr "Lettere LaTeX" + +#: ../geanylatex/src/letters.c:41 +msgid "Greek letters" +msgstr "Lettere greche" + +#: ../geanylatex/src/letters.c:42 +msgid "German umlauts" +msgstr "Dieresi tedesche" + +#: ../geanylatex/src/letters.c:43 +msgid "Misc" +msgstr "Misc" + +#: ../geanylatex/src/letters.c:44 +msgid "Arrow characters" +msgstr "Caratteri frecce" + +#: ../geanylatex/src/letters.c:45 +msgid "Relational" +msgstr "Relazionale" + +#: ../geanylatex/src/letters.c:46 +msgid "Binary operation" +msgstr "Operazione binaria" + +#: ../geanylatex/src/formatpatterns.c:38 +msgid "Italic" +msgstr "Corsivo" + +#: ../geanylatex/src/formatpatterns.c:39 +msgid "Bold" +msgstr "Grassetto" + +#: ../geanylatex/src/formatpatterns.c:40 +msgid "Underline" +msgstr "Sottolineato" + +#: ../geanylatex/src/formatpatterns.c:41 +msgid "Typewriter" +msgstr "Typewriter" + +#: ../geanylatex/src/formatpatterns.c:42 +msgid "Small Caps" +msgstr "Maiuscoletto" + +#: ../geanylatex/src/formatpatterns.c:43 +msgid "Slanted" +msgstr "Inclinato" + +#: ../geanylatex/src/formatpatterns.c:44 +msgid "Emphasis" +msgstr "Enfasi" + +#: ../geanylatex/src/formatpatterns.c:64 +msgid "tiny" +msgstr "tiny" + +#: ../geanylatex/src/formatpatterns.c:65 +msgid "scriptsize" +msgstr "scriptsize" + +#: ../geanylatex/src/formatpatterns.c:66 +msgid "footnotesize" +msgstr "footnotesize" + +#: ../geanylatex/src/formatpatterns.c:67 +msgid "small" +msgstr "small" + +#: ../geanylatex/src/formatpatterns.c:68 +msgid "normalsize" +msgstr "normalsize" + +#: ../geanylatex/src/formatpatterns.c:69 +msgid "large" +msgstr "large" + +#: ../geanylatex/src/formatpatterns.c:70 +msgid "Large" +msgstr "Large" + +#: ../geanylatex/src/formatpatterns.c:71 +msgid "LARGE" +msgstr "LARGE" + +#: ../geanylatex/src/formatpatterns.c:72 +msgid "huge" +msgstr "huge" + +#: ../geanylatex/src/formatpatterns.c:73 +msgid "Huge" +msgstr "Huge" + +#: ../geanylatex/src/latexencodings.c:37 +msgid "UTF-8" +msgstr "UTF-8" + +#: ../geanylatex/src/latexencodings.c:38 +msgid "US-ASCII" +msgstr "US-ASCII" + +#: ../geanylatex/src/latexencodings.c:39 +msgid "ISO-8859-1 (Latin-1)" +msgstr "ISO-8859-1 (Latin-1)" + +#: ../geanylatex/src/latexencodings.c:41 +msgid "ISO-8859-2 (Latin-2)" +msgstr "ISO-8859-2 (Latin-2)" + +#: ../geanylatex/src/latexencodings.c:43 +msgid "ISO-8859-3 (Latin-3)" +msgstr "ISO-8859-3 (Latin-3)" + +#: ../geanylatex/src/latexencodings.c:45 +msgid "ISO-8859-4 (Latin-4)" +msgstr "ISO-8859-4 (Latin-4)" + +#: ../geanylatex/src/latexencodings.c:47 +msgid "ISO-8859-5 (Latin-5)" +msgstr "ISO-8859-5 (Latin-5)" + +#: ../geanylatex/src/latexencodings.c:49 +msgid "ISO-8859-9 (Latin-9)" +msgstr "ISO-8859-9 (Latin-9)" + +#: ../geanylatex/src/latexencodings.c:51 +msgid "ISO-8859-10 (Latin-10)" +msgstr "ISO-8859-10 (Latin-10)" + +#: ../geanylatex/src/latexencodings.c:53 +msgid "IBM 850 code page" +msgstr "IBM 850 code page" + +#: ../geanylatex/src/latexencodings.c:55 +msgid "IBM 852 code page" +msgstr "IBM 852 code page" + +#: ../geanylatex/src/latexencodings.c:57 +msgid "Don't set any encoding" +msgstr "Non impostare alcuna codifica" + +#: ../geanylipsum/src/geanylipsum.c:40 +msgid "GeanyLipsum" +msgstr "GeanyLipsum" + +#: ../geanylipsum/src/geanylipsum.c:41 +msgid "Creating dummy text with Geany" +msgstr "Crea un testo fittizio con Geany" + +#: ../geanylipsum/src/geanylipsum.c:89 +msgid "Lipsum-Generator" +msgstr "Lipsum-Generator" + +#: ../geanylipsum/src/geanylipsum.c:90 +msgid "Enter the length of Lipsum text here" +msgstr "Inserisci la lunghezza del testo Lipsum qui" + +#. Building menu entry +#: ../geanylipsum/src/geanylipsum.c:164 +msgid "_Lipsum" +msgstr "_Lipsum" + +#: ../geanylipsum/src/geanylipsum.c:165 +msgid "Include Pseudotext to your code" +msgstr "Includi uno Pseudotext al tuo codice" + +#: ../geanylipsum/src/geanylipsum.c:179 +msgid "Insert Lipsum text" +msgstr "Inserisci testo Lipsum" + +#: ../geanylua/glspi.h:100 ../geanylua/gsdlg_lua.c:95 +#: ../geanylua/glspi_kfile.c:54 +#, c-format +msgid "" +"Error in module \"%s\" at function %s():\n" +" expected type \"%s\" for argument #%d\n" +msgstr "" +"Errore nel modulo \"%s\" alla funzione %s():\n" +" atteso tipo \"%s\" per l'argomento #%d\n" + + +#: ../geanylua/glspi.h:114 +#, c-format +msgid "" +"Error in module \"%s\" at function %s():\n" +" expected type \"%s\" or \"%s\" for argument #%d\n" +msgstr "" +"Errore nel modulo \"%s\" alla funzione %s():\n" +" atteso tipo \"%s\" or \"%s\" per l'argomento #%d\n" + +#: ../geanylua/glspi.h:128 ../geanylua/gsdlg_lua.c:108 +#, c-format +msgid "" +"Error in module \"%s\" at function %s():\n" +" invalid table in argument #%d:\n" +" expected type \"%s\" for element #%d\n" +msgstr "" +"Errore nel modulo \"%s\" alla funzione %s():\n" +" tabella non valida nell'argomento #%d:\n" +" atteso tipo \"%s\" per l'elemento #%d\n" + +#. +#. * glspi_ver.c - This file is part of the Lua scripting plugin for the Geany IDE +#. * See the file "geanylua.c" for copyright information. +#. +#: ../geanylua/glspi_ver.h:7 +msgid "Lua Script" +msgstr "Lua Script" + +#: ../geanylua/glspi_ver.h:9 +msgid "Write and run Lua scripts for custom commands." +msgstr "Scrivi ed esegui gli script Lua per comandi personalizzati." + +#: ../geanylua/glspi_ver.h:19 +msgid "Lua Script Plugin" +msgstr "Lua Script Plugin" + +#: ../geanylua/glspi_run.c:90 ../geanylua/glspi_run.c:97 +msgid "Lua script error:" +msgstr "Errore script Lua:" + +#: ../geanylua/glspi_run.c:197 +msgid "Script timeout" +msgstr "Script timeout" + +#: ../geanylua/glspi_run.c:198 +msgid "" +"A Lua script seems to be taking excessive time to complete.\n" +"Do you want to continue waiting?" +msgstr "" +"Lo script Lua sembra metterci un tempo eccessivo per completare.\n" +"Vuoi continuare ad aspettare?" + +#: ../geanylua/glspi_run.c:206 +msgid "Script timeout exceeded." +msgstr "Timeout script raggiunto." + +#: ../geanylua/glspi_run.c:382 +msgid "(error object is not a string)" +msgstr "(l'oggetto error non è una stringa)" + +#: ../geanylua/glspi_run.c:387 +msgid "Unknown Error inside script." +msgstr "Errore Sconosciuto all'interno dello script" + +#: ../geanylua/glspi_run.c:459 +msgid "Out of memory." +msgstr "Memoria esaurita." + +#: ../geanylua/glspi_run.c:462 +msgid "Failed to open script file." +msgstr "Impossibile aprire il file dello script." + +#: ../geanylua/glspi_run.c:465 +msgid "Unknown error while loading script file." +msgstr "Errore sconosciuto leggendo il file dello script." + +#: ../geanylua/glspi_init.c:381 +msgid "_Lua Scripts" +msgstr "_Lua Scripts" + +#: ../geanylua/glspi_init.c:428 +#, c-format +msgid " ==>> %s: Building menu from '%s'\n" +msgstr " ==>> %s: Costruendo menu da '%s'\n" + +#: ../geanylua/glspi_init.c:527 +msgid "Nothing to configure!" +msgstr "Niente da configurare!" + +#: ../geanylua/glspi_init.c:529 +#, c-format +msgid "" +"You can create the script:\n" +"\n" +"\"%s\"\n" +"\n" +"to add your own custom configuration dialog." +msgstr "" +"Puoi creare lo script:\n" +"\n" +"\"%s\"\n" +"\n" +"per aggiungere il tuo dialogo di configurazione personalizzato." + +#: ../geanylua/gsdlg.c:103 ../geanylua/glspi_dlg.c:420 +msgid "Open file" +msgstr "Apri file" + +#: ../geanylua/gsdlg.c:107 +msgid "Select file" +msgstr "Seleziona file" + +#: ../geanylua/gsdlg.c:154 +msgid "Browse..." +msgstr "Sfoglia..." + +#: ../geanylua/gsdlg.c:176 +msgid "Select Color" +msgstr "Selezione colore" + +#: ../geanylua/gsdlg.c:207 +msgid "Choose..." +msgstr "Scegli..." + +#: ../geanylua/gsdlg.c:228 +msgid "Select Font" +msgstr "Seleziona Font" + +#: ../geanylua/gsdlg.c:255 +msgid "Select..." +msgstr "Seleziona..." + +#: ../geanylua/glspi_sci.c:427 +#, c-format +msgid "" +"Error in module \"%s\" at function navigate():\n" +"unknown navigation mode \"%s\" for argument #1.\n" +msgstr "" +"Errore nel modulo \"%s\" alla funzione navigate():\n" +"navigation mode sconosciuta \"%s\" per l'argomento #1.\n" + +#: ../geanylua/glspi_sci.c:603 +#, c-format +msgid "" +"Error in module \"%s\" at function %s():\n" +"API command \"%s\" not implemented.\n" +msgstr "" +"Errore nel modulo \"%s\" alla funzione %s():\n" +"Comando API \"%s\" non implementato.\n" + +#: ../geanylua/glspi_sci.c:614 +#, c-format +msgid "" +"Error in module \"%s\" at function %s():\n" +"not enough arguments for command \"%s\".\n" +msgstr "" +"Errore nel modulo \"%s\" alla funzione %s():\n" +"parametri non sufficienti per il comando \"%s\".\n" + +#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:396 +#, c-format +msgid "" +"Error in module \"%s\" at function %s():\n" +"unknown command \"%s\" given for argument #1.\n" +msgstr "" +"Errore nel modulo \"%s\" alla funzione %s():\n" +"comando sconosciuto \"%s\" per l'argomento #1.\n" + +#: ../geanylua/glspi_sci.c:794 +#, c-format +msgid "" +"Error in module \"%s\" at function %s():\n" +" invalid table in argument #%d:\n" +" unknown flag \"%s\" for element #%d\n" +msgstr "" +"Errore nel modulo \"%s\" alla funzione %s():\n" +" tabella non valida nell'argomento #%d:\n" +" flag \"%s\" sconosciuto per l'elemento #%d\n" + +#: ../geanylua/glspi_sci.c:798 +msgid "" +msgstr "" + +#: ../geanylua/glspi_dlg.c:336 +msgid "File exists" +msgstr "Il file esiste" + +#: ../geanylua/glspi_dlg.c:336 +msgid "Do you want to overwrite it?" +msgstr "Vuoi sovrascriverlo?" + +#: ../geanylua/glspi_dlg.c:337 +msgid "confirm" +msgstr "conferma" + +#: ../geanylua/glspi_dlg.c:410 +msgid "Save file" +msgstr "Salva file" + +#: ../geanylua/glspi_dlg.c:436 +#, c-format +msgid "" +"Error in module \"%s\" at function pickfile():\n" +"failed to parse filter string at argument #3.\n" +msgstr "" +"Errore nel modulo \"%s\" alla funzione pickfile():\n" +"impossibile effettuare parse filter string all'argomento #3.\n" + +#: ../geanylua/glspi_dlg.c:486 +#, c-format +msgid "" +"Error in module \"%s\" at function %s():\n" +"expected string \"open\" or \"save\" for argument #1.\n" +msgstr "" +"Errore nel modulo \"%s\" alla funzione %s():\n" +"attesa stringa \"open\" o \"save\" per l'argomento #1.\n" + +#: ../geanylua/geanylua.c:163 +#, c-format +msgid "%s: Can't load support library %s!\n" +msgstr "%s: impossibile caricare la libreria di support %s!\n" + +#: ../geanylua/geanylua.c:175 +#, c-format +msgid "%s: Failed to initialize support library %s!\n" +msgstr "%s: impossibile inizalizzare la libreria di supporto %s!\n" + +#: ../geanylua/geanylua.c:180 +#, c-format +msgid "%s: Support library version mismatch: %s for %s (should be %s)!\n" +msgstr "" +"%s: versione della libreria di supporto errata: %s per %s " +"(dovrebbe essere %s)!\n" + +#: ../geanylua/geanylua.c:186 +#, c-format +msgid "%s: Support library ABI mismatch: %d for %s (should be %d)!\n" +msgstr "" +"%s: versione ABI della libreria di supporto errata: %d per %s " +"(dovrebbe essere %d)!\n" + +#: ../geanylua/geanylua.c:215 +#, c-format +msgid "%s: Can't find support library %s!\n" +msgstr "%s: impossibile trovare la libreira %s!\n" + +#: ../geanylua/geanylua.c:234 +#, c-format +msgid "" +"The %s plugin failed to load properly.\n" +"Please check your installation." +msgstr "" +"Impossibile caricare correttamente il plugin %s\n" +"Controlla la tua installazione." + +#: ../geanylua/glspi_app.c:21 +#, c-format +msgid "" +"%s %s: %s\n" +"Copyright (c) 2007-2010 " +msgstr "" +"%s %s: %s\n" +"Copyright (c) 2007-2010 " + +#: ../geanylua/glspi_app.c:151 +#, c-format +msgid "" +"Error in module \"%s\" at function %s():\n" +"widget \"%s\" not found for argument #1.\n" +msgstr "" +"Errore nel modulo \"%s\" alla funzione %s():\n" +"il widget \"%s\" non è stato trovato per il argomento #1.\n" + +#: ../geanylua/glspi_app.c:160 +#, c-format +msgid "" +"Error in module \"%s\" at function %s() argument #2:\n" +"widget \"%s\" has no signal named \"%s\".\n" +msgstr "" +"Errore nel modulo \"%s\" alla funzione %s() argomento #2:\n" +"il widget \"%s\" non ha un segnale chiamato \"%s\".\n" + +#: ../geanymacro/src/geanymacro.c:55 +msgid "Cut to Clipboard" +msgstr "Taglia negli appunti" + +#: ../geanymacro/src/geanymacro.c:56 +msgid "Copy to Clipboard" +msgstr "Copia negli appunti" + +#: ../geanymacro/src/geanymacro.c:57 +msgid "Paste from Clipboard" +msgstr "Incolla dagli appunti" + +#: ../geanymacro/src/geanymacro.c:58 +msgid "Cut current line to Clipboard" +msgstr "Taglia la riga corrente negli appunti" + +#: ../geanymacro/src/geanymacro.c:59 +msgid "Copy current line to Clipboard" +msgstr "Copia la riga corrente negli appunti" + +#: ../geanymacro/src/geanymacro.c:61 +msgid "Delete character to the left" +msgstr "Elimina il carattere a sinistra" + +#: ../geanymacro/src/geanymacro.c:62 +msgid "Delete character to the right" +msgstr "Elimina il carattere a destra" + +#: ../geanymacro/src/geanymacro.c:63 +msgid "Delete character to the left (but not newline)" +msgstr "Elimina il caratter a sinistra (ma non il fine riga)" + +#: ../geanymacro/src/geanymacro.c:64 +msgid "Delete up to start of word to the Left" +msgstr "Elimina fino all'inizio della parola a sinistra" + +#: ../geanymacro/src/geanymacro.c:65 +msgid "Delete up to start of word to the Right" +msgstr "Elimina fino all'inizio della parola a destra" + +#: ../geanymacro/src/geanymacro.c:66 +msgid "Delete up to end of word to the Right" +msgstr "Elimina fino alla fine della parola a destra" + +#: ../geanymacro/src/geanymacro.c:67 +msgid "Delete to beginning of line" +msgstr "Elimina fino a inizio riga" + +#: ../geanymacro/src/geanymacro.c:68 +msgid "Delete to end of line" +msgstr "Elimina fino a fine riga" + +#: ../geanymacro/src/geanymacro.c:69 +msgid "Delete current line" +msgstr "Elimina la riga corrente" + +#: ../geanymacro/src/geanymacro.c:70 +msgid "Backwards Tab (deletes tab if nothing after it)" +msgstr "Backwards Tab (Elimina il tab se non c'è niente dopo)" + +#: ../geanymacro/src/geanymacro.c:72 +msgid "Scroll Display down a line" +msgstr "Muovi la finestra di una riga giù" + +#: ../geanymacro/src/geanymacro.c:73 +msgid "Scroll Display up a line" +msgstr "Muovi la finestra di una riga su" + +#: ../geanymacro/src/geanymacro.c:74 +msgid "Zoom view in" +msgstr "Zoom finestra in" + +#: ../geanymacro/src/geanymacro.c:75 +msgid "Zoom view out" +msgstr "Zoom finestra out" + +#: ../geanymacro/src/geanymacro.c:77 +msgid "Move Cursor Down" +msgstr "Sposta il cursore giù" + +#: ../geanymacro/src/geanymacro.c:78 +msgid "Move Cursor Up" +msgstr "Sposta il cursore su" + +#: ../geanymacro/src/geanymacro.c:79 +msgid "Move Cursor Left" +msgstr "Sposta il cursore a sinistra" + +#: ../geanymacro/src/geanymacro.c:80 +msgid "Move Cursor Right" +msgstr "Sposta il cursore a destra" + +#: ../geanymacro/src/geanymacro.c:81 +msgid "Move Cursor to start of Word to the Left" +msgstr "Muovi il cursore all'inizio della parola a Sinistra" + +#: ../geanymacro/src/geanymacro.c:82 +msgid "Move Cursor to start of Word to the Right" +msgstr "Muovi il cursore all'inizio della parola a Destra" + +#: ../geanymacro/src/geanymacro.c:83 +msgid "Move Cursor to start of Part of Word to the Left" +msgstr "Muovi il cursore all'inizio della parte della parola a sinistra" + +#: ../geanymacro/src/geanymacro.c:84 +msgid "Move Cursor to start of Part of Word to the Right" +msgstr "Muovi il cursore all'inizio della parte della parola a destra" + +#: ../geanymacro/src/geanymacro.c:85 +msgid "Move Cursor to start of line" +msgstr "Muovi il cursore a inizio riga" + +#: ../geanymacro/src/geanymacro.c:86 +msgid "Move Cursor to end of line" +msgstr "Muovi il cursore a fine riga" + +#: ../geanymacro/src/geanymacro.c:87 +msgid "Move Cursor to 1st line of Document" +msgstr "Muovi il cursore alla prima linea del documento" + +#: ../geanymacro/src/geanymacro.c:88 +msgid "Move Cursor to last line of document" +msgstr "Muovi il cursore all'ultima linea del documento" + +#: ../geanymacro/src/geanymacro.c:89 +msgid "Move Cursor up one Page" +msgstr "Muovi il cursore una Pagina su" + +#: ../geanymacro/src/geanymacro.c:90 +msgid "Move Cursor down one Page" +msgstr "Muovi il cursore una Pagina giù" + +#: ../geanymacro/src/geanymacro.c:91 +msgid "Move Cursor to first visible character" +msgstr "Muovi il cursore al primo carattere visibile" + +#: ../geanymacro/src/geanymacro.c:92 +msgid "Move Cursor to last visible character" +msgstr "Muovi il cursore all'ultimo carattere visibile" + +#: ../geanymacro/src/geanymacro.c:93 +msgid "" +"Move Cursor to 1st non-whitespace character of line, or 1st character of " +"line if already at 1st non-whitespace character" +msgstr "" +"Muovi il cursore al primo carattere della linea (non spazio) oppure al " +"primo carattere della linea se già il primo carattere non è spazio" + +#: ../geanymacro/src/geanymacro.c:95 +msgid "Move Cursor to beginning of next paragraph" +msgstr "Muovi il cursore all'inizio del prossimo paragrafo" + +#: ../geanymacro/src/geanymacro.c:96 +msgid "Move Cursor up to beginning of current/previous paragraph" +msgstr "Muoviil cursore all'inizio del corrente/precedente paragrafo" + +#: ../geanymacro/src/geanymacro.c:97 +msgid "Move Cursor to end of Word to the Left" +msgstr "Muovi il cursore alla fine della parola a sinistra" + +#: ../geanymacro/src/geanymacro.c:98 +msgid "Move Cursor to end of Word to the Right" +msgstr "Muovi il cursore alla fine della parola a destra" + +#: ../geanymacro/src/geanymacro.c:100 +msgid "Extend Selection down a line" +msgstr "Estendi la selezione in giù di una riga" + +#: ../geanymacro/src/geanymacro.c:101 +msgid "Extend Selection up a line" +msgstr "Estendi la selezione in su di una riga" + +#: ../geanymacro/src/geanymacro.c:102 +msgid "Extend Selection Left a line" +msgstr "Estendi la selezione a sinistra di una riga" + +#: ../geanymacro/src/geanymacro.c:103 +msgid "Extend Selection Right a line" +msgstr "Estendi la selezione a destra di una riga" + +#: ../geanymacro/src/geanymacro.c:104 +msgid "Extend Selection to start of Word to the Left" +msgstr "Estendi la selezione all'inizio di una parola a sinistra" + +#: ../geanymacro/src/geanymacro.c:105 +msgid "Extend Selection to start of Word to the Right" +msgstr "Estendi la selezione all'inizio di una parola a destra" + +#: ../geanymacro/src/geanymacro.c:106 +msgid "Extend Selection to start of Part of Word to the Left" +msgstr "Estendi la selezione all'inizio di una parte di una parola a sinistra" + +#: ../geanymacro/src/geanymacro.c:107 +msgid "Extend Selection to start of Part of Word to the Right" +msgstr "Estendi la selezione all'inizio di una parte di una parola a destra" + +#: ../geanymacro/src/geanymacro.c:108 +msgid "Extend Selection to start of line" +msgstr "Estendi la selezione all'inizio di una riga" + +#: ../geanymacro/src/geanymacro.c:109 +msgid "Extend Selection to end of line" +msgstr "Estendi la selezione alla fine di una riga" + +#: ../geanymacro/src/geanymacro.c:110 +msgid "Extend Selection to start of document" +msgstr "Estendi la selezione all'inizio del documento" + +#: ../geanymacro/src/geanymacro.c:111 +msgid "Extend Selection to end of document" +msgstr "Estendi la selezione alla fine del documento" + +#: ../geanymacro/src/geanymacro.c:112 +msgid "Extend Selection up one Page" +msgstr "Estendi la selezione su di una pagina" + +#: ../geanymacro/src/geanymacro.c:113 +msgid "Extend Selection down one Page" +msgstr "Estendi la selezione giù di una pagina" + +#: ../geanymacro/src/geanymacro.c:114 +msgid "Extend Selection to fist visible character" +msgstr "Estendi la selezione al primo carattere visibile" + +#: ../geanymacro/src/geanymacro.c:115 +msgid "Extend Selection to last visible character" +msgstr "Estendi la selezione all'ultimo carattere visibile" + +#: ../geanymacro/src/geanymacro.c:116 +msgid "" +"Extend Selection to 1st non-whitespace character of line, or 1st character " +"of line if already at 1st non-whitespace character" +msgstr "" +"Estendi la selezione al primo carattere di una linea (non spazio) oppure " +"al primo carattere della linea se già il primo carattere non è spazio" + +#: ../geanymacro/src/geanymacro.c:118 +msgid "Extend Selection to beginning of next paragraph" +msgstr "Estendi la selezione all'inizio del prossimo paragrafo" + +#: ../geanymacro/src/geanymacro.c:119 +msgid "Extend Selection up to beginning of current/previous paragraph" +msgstr "Estendi la selezione all'inizio del corrente/precedente paragrafo" + +#: ../geanymacro/src/geanymacro.c:120 +msgid "Extend Selection to end of Word to the Left" +msgstr "Estendi la selezione alla fine della parola a sinistra" + +#: ../geanymacro/src/geanymacro.c:121 +msgid "Extend Selection to end of Word to the Right" +msgstr "Estendi la selezione alla fine della parola a destra" + +#: ../geanymacro/src/geanymacro.c:123 +msgid "Extend Rectangular Selection down a line" +msgstr "Estendi la selezione rettangolare in giù di una riga" + +#: ../geanymacro/src/geanymacro.c:124 +msgid "Extend Rectangular Selection up a line" +msgstr "Estendi la selezione rettangolare in su di una riga" + +#: ../geanymacro/src/geanymacro.c:125 +msgid "Extend Rectangular Selection Left a line" +msgstr "Estendi la selezione rettangolare a sinistra di una riga" + +#: ../geanymacro/src/geanymacro.c:126 +msgid "Extend Rectangular Selection Right a line" +msgstr "Estendi la selezione rettangolare a destra di una riga" + +#: ../geanymacro/src/geanymacro.c:127 +msgid "Extend Rectangular Selection to start of line" +msgstr "Estendi la selezione rettangolare all'inizio riga" + +#: ../geanymacro/src/geanymacro.c:128 +msgid "Extend Rectangular Selection to end of line" +msgstr "Estendi la selezione rettangolare alla fine della riga" + +#: ../geanymacro/src/geanymacro.c:129 +msgid "Extend Rectangular Selection up one Page" +msgstr "Estendi la selezione rettangolare una pagina su" + +#: ../geanymacro/src/geanymacro.c:130 +msgid "Extend Rectangular Selection down one Page" +msgstr "Estendi la selezione rettangolare una pagina giù" + +#: ../geanymacro/src/geanymacro.c:131 +msgid "" +"Extend Rectangular Selection to 1st non-whitespace character of line, or 1st " +"character of line if already at 1st non-whitespace character" +msgstr "" +"Estendi la selezione rettangolare al primo carattere di una linea (non " +"spazio) oppure al primo carattere della linea se già il primo carattere non è spazio" + + +#: ../geanymacro/src/geanymacro.c:134 +msgid "Cancel Selection" +msgstr "Elimina selezione" + +#: ../geanymacro/src/geanymacro.c:136 +msgid "Toggle Insert/Overwrite mode" +msgstr "Attiva/Disattiva modalità sovrascrivi" + +#: ../geanymacro/src/geanymacro.c:137 ../pretty-printer/src/ConfigUI.c:239 +msgid "Tab" +msgstr "Tab" + +#: ../geanymacro/src/geanymacro.c:138 +msgid "Newline" +msgstr "Fine riga" + +#: ../geanymacro/src/geanymacro.c:140 ../geanymacro/src/geanymacro.c:1625 +#, c-format +msgid "Insert/replace with \"\"" +msgstr "Inserisci/Sostituisci con \"\"" + +#: ../geanymacro/src/geanymacro.c:142 +msgid "Swap current line wih one above" +msgstr "Scambia la riga corrente con la precedente" + +#: ../geanymacro/src/geanymacro.c:143 +msgid "Change selected text to lowercase" +msgstr "Imposta il testo selezionato a minuscolo" + +#: ../geanymacro/src/geanymacro.c:144 +msgid "Change selected text to uppercase" +msgstr "Imposta il testo selezionato a maiuscolo" + +#: ../geanymacro/src/geanymacro.c:146 +msgid "Insert duplicate of current line below" +msgstr "Inserisci un duplicato della riga corrente sotto" + +#: ../geanymacro/src/geanymacro.c:147 +msgid "" +"Insert duplicate of selected text after selection. If nothing selected, " +"duplicate line" +msgstr "" +"Inserisci duplicato del testo selezionato dopo la selezione. Se nulla è " +"selezionato, duplica la riga" + +#: ../geanymacro/src/geanymacro.c:150 +msgid "Search for next \"\"" +msgstr "Cerca il prossimo \"\"" + +#: ../geanymacro/src/geanymacro.c:151 +msgid "Search for previous \"\"" +msgstr "Cerca il precedente \"\"" + +#: ../geanymacro/src/geanymacro.c:152 +msgid "Set start of search to beginning of selection" +msgstr "Imposta l'inizio della ricerca in cima alla selezione" + +#: ../geanymacro/src/geanymacro.c:181 +msgid "Macros" +msgstr "Macro" + +#: ../geanymacro/src/geanymacro.c:181 +msgid "Macros for Geany" +msgstr "Macro per Geany" + +#: ../geanymacro/src/geanymacro.c:369 +msgid "No text in clipboard!" +msgstr "Nessun testo negli appunti!" + +#: ../geanymacro/src/geanymacro.c:546 +#, c-format +msgid "" +"Unrecognised message\n" +"%i %i %i" +msgstr "" +"Messaggio non riconosciuto\n" +"%i %i %i" + +#: ../geanymacro/src/geanymacro.c:820 +msgid "Save Macros when close Geany" +msgstr "Salva le Macro quando chiudi Geany" + +#: ../geanymacro/src/geanymacro.c:826 +msgid "Ask before replaceing existing Macros" +msgstr "Chiedi prima di sovrascrivere le Macro esistenti" + +#. create dialog box +#: ../geanymacro/src/geanymacro.c:847 +msgid "Geany Macros help" +msgstr "Aiuto Geany Macro" + +#: ../geanymacro/src/geanymacro.c:855 +msgid "" +"This Plugin implements Macros in Geany.\n" +"\n" +msgstr "" +"Questo Plugin implementa le Macro in Geany.\n" +"\n" + + +#: ../geanymacro/src/geanymacro.c:856 +msgid "This plugin allows you to record and use your own macros. " +msgstr "Questo plugin ti permette di registrare e usare macro personalizzate." + +#: ../geanymacro/src/geanymacro.c:857 +msgid "" +"These are sequences of actions that can then be repeated with a single key " +"combination. " +msgstr "" +"Le macro sono sequenze di azioni che possono essere ripetute con una singola " +"combinazione di tasti. " + +#: ../geanymacro/src/geanymacro.c:858 +msgid "" +"So if you had dozens of lines where you wanted to delete the last 2 " +"characters, you could simply start recording, press End, Backspace, " +"Backspace, down line and then stop recording. " +msgstr "" +"Se hai dozzine di righe di cui vuoi eliminare gli ultimi due caratteri, " +"puoi semplicemente avviare la registrazione, premere End, Backspace, " +"Backspace, scendere di una riga e poi fermare la registrazione. " + + +#: ../geanymacro/src/geanymacro.c:860 +msgid "" +"Then simply trigger the macro and it would automatically edit the line and " +"move to the next. " +msgstr "" +"Quindi semplicemente avvia la macro e automaticamente la riga corrente verrà " +"modificata e si sposterà alla successiva. " + +#: ../geanymacro/src/geanymacro.c:861 +msgid "" +"Select Record Macro from the Tools menu and you will be prompted with a " +"dialog box. " +msgstr "" +"Seleziona Registra Macro dal menu Strumenti e verrà aperta una finestra. " + +#: ../geanymacro/src/geanymacro.c:862 +msgid "" +"You need to specify a key combination that isn't being used, and a name for " +"the macro to help you identify it. " +msgstr "" +"Specifica una combinazione di tasti non ancora usata e un nome per la macro " +"per aiutarti a identificarla." + +#: ../geanymacro/src/geanymacro.c:864 +msgid "Then press Record. " +msgstr "Premi Registra." + +#: ../geanymacro/src/geanymacro.c:865 +msgid "" +"What you do in the editor is then recorded until you select Stop Recording " +"Macro from the Tools menu. " +msgstr "" +"Quello che fai nell'editor viene registrato fino a che non premi Ferma " +"Registrazione Macro dal menu Strumenti. " + +#: ../geanymacro/src/geanymacro.c:867 +msgid "Simply pressing the specified key combination will re-run the macro. " +msgstr "" +"Semplicemente premi la combinazioni tasti specificata per rieseguire " +"la macro. " + +#: ../geanymacro/src/geanymacro.c:868 +msgid "To edit the macros you have, select Edit Macro from the Tools menu. " +msgstr "Per modificare la macro devi selezionare Modifica Macro dal menu Strumenti" + +#: ../geanymacro/src/geanymacro.c:869 +msgid "You can select a macro and delete it, or re-record it. " +msgstr "Puoi selezionare la macro e eliminarla o ri-registrarla." + +#: ../geanymacro/src/geanymacro.c:870 +msgid "" +"You can also click on a macro's name and change it, or the key combination " +"and re-define that assuming that it's not already in use. " +msgstr "" +"Puoi anche cliccare sul nome della macro o sulla combinazione tasti e " +"cambiarli, prestando attenzione che le nuove impostazioni non siano già in uso" + +#: ../geanymacro/src/geanymacro.c:872 +msgid "" +"Selecting the edit option allows you to view all the individual elements " +"that make up the macro. " +msgstr "" +"Selezionare l'opzione di modifica ti permette di visualizzare tutti gli " +"elementi che compongono la macro. " + +#: ../geanymacro/src/geanymacro.c:874 +msgid "" +"You can select a diferent command for each element, move them, add new " +"elements, delete elements, or if it's replace/insert, you can edit the text " +"that replaces the selected text, or is inserted.\n" +"\n" +msgstr "" +"Puoi selezionare un comando differente per ogni elemento, spostarlo, " +"aggiungerne uno nuovo, eliminarlo o sostituirlo, puoi anche modificare " +"il testo che sostituisce il testo selezionato o inserito.\n" + +#: ../geanymacro/src/geanymacro.c:878 +msgid "" +"The only thing to bear in mind is that undo and redo actions are not " +"recorded, and won't be replayed when the macro is re-run.\n" +"\n" +msgstr "" +"L'unica cosa da tenere ben in mente è che i comandi 'annulla' e 'ripeti' " +"quindi non sono registrati e non possono essere replicati quando la macro " +"viene eseguita. \n\n" + +#: ../geanymacro/src/geanymacro.c:881 +msgid "" +"You can alter the default behaviour of this plugin by selecting Plugin " +"Manager under the Tools menu, selecting this plugin, and cliking " +"Preferences. " +msgstr "" +"Puoi modificare il comportamento di questo plugin selezionando Plugin " +"Manager nel menu Strumenti, selezionare il plugin, e cliccando " +"Preferenze. " + + +#: ../geanymacro/src/geanymacro.c:883 +msgid "You can change:\n" +msgstr "Puoi cambiare:\n" + +#: ../geanymacro/src/geanymacro.c:884 +msgid "" +"Save Macros when close Geany - If this is selected then Geany will save any " +"recorded macros and reload them for use the next time you open Geany, if not " +"they will be lost when Geany is closed.\n" +msgstr "" +"Salva le Macro quando Geany viene chiuso. Se è selezionato allora Geany " +"salverà qualsiasi macro registrata e verranno ricaricate la prossima volta " +"che aprirai Geany.\n" + +#: ../geanymacro/src/geanymacro.c:887 +msgid "" +"Ask before replaceing existing Macros - If this is selected then if you try " +"recording a macro over an existing one it will check before over-writing it, " +"giving you the option of trying a different name or key trigger combination, " +"otherwise it will simply erase any existing macros with the same name, or " +"the same key trigger combination." +msgstr "" +"Chiedi prima di sovrascrivere Macro esistenti - Se è selezionato se provi a " +"registrare una macro sopra una esistente, ti verrà chiesto se vuoi provare " +"con un nome o combinazione di tasti diversa, altrimenti eliminerà semplicemente" +"qualsiasi macro già esistente con lo stesso nome o con la stessa combinazione " +"di tasti." + +#. create dialog box +#: ../geanymacro/src/geanymacro.c:1057 +msgid "Record Macro" +msgstr "Registra Macro" + +#. create buttons +#: ../geanymacro/src/geanymacro.c:1063 +msgid "Record" +msgstr "Registra" + +#: ../geanymacro/src/geanymacro.c:1064 +msgid "Cancel" +msgstr "Annulla" + +#: ../geanymacro/src/geanymacro.c:1071 +msgid "Macro Trigger:" +msgstr "Macro Trigger:" + +#: ../geanymacro/src/geanymacro.c:1085 +msgid "Macro Name:" +msgstr "Nome Macro:" + +#: ../geanymacro/src/geanymacro.c:1121 +#, c-format +msgid "" +"Macro name \"%s\"\n" +" is already in use.\n" +"Replace?" +msgstr "" +"Nome Macro \"%s\"\n" +" è già in uso.\n" +"Sostituire?" + +#: ../geanymacro/src/geanymacro.c:1137 +#, c-format +msgid "" +"Macro trigger \"%s\"\n" +" is already in use.\n" +"Replace?" +msgstr "" +"Il trigger Macro \"%s\"\n" +" è già in uso.\n" +"Sostituire?" + +#: ../geanymacro/src/geanymacro.c:1333 +#, c-format +msgid "Search %s, looking for %s%s%s.%s%s%s%s%s" +msgstr "Ricerca %s per %s%s%s.%s%s%s%s%s" + +#. create dialog box +#: ../geanymacro/src/geanymacro.c:1388 +msgid "Search Options:" +msgstr "Opzioni di ricerca:" + +#. create buttons +#: ../geanymacro/src/geanymacro.c:1393 ../geanymacro/src/geanymacro.c:1536 +#: ../geanymacro/src/geanymacro.c:1826 ../geanymacro/src/geanymacro.c:2122 +msgid "_Ok" +msgstr "_Ok" + +#: ../geanymacro/src/geanymacro.c:1394 ../geanymacro/src/geanymacro.c:1537 +#: ../geanymacro/src/geanymacro.c:1827 +msgid "_Cancel" +msgstr "_Annulla" + +#: ../geanymacro/src/geanymacro.c:1403 +msgid "Search Forwards" +msgstr "Cerca successivo" + +#: ../geanymacro/src/geanymacro.c:1404 +msgid "Search Backwards" +msgstr "Cerca precedente" + +#. create checkbox to check for search options +#: ../geanymacro/src/geanymacro.c:1410 +msgid "Search for contents of clipboard" +msgstr "Cerca contenuto negli appunti" + +#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:93 +msgid "Search for:" +msgstr "Cerca per:" + +#. create checkbox to check for search options +#: ../geanymacro/src/geanymacro.c:1442 +msgid "Search is case sensitive" +msgstr "La ricerca è case-sensitive" + +#: ../geanymacro/src/geanymacro.c:1447 +msgid "Search for whole word" +msgstr "Cerca per parola intera" + +#: ../geanymacro/src/geanymacro.c:1452 +msgid "Search for start of word" +msgstr "Cerca all'inizio della parola" + +#: ../geanymacro/src/geanymacro.c:1457 +msgid "Search text is regular expression" +msgstr "Cerca regular-expression" + +#: ../geanymacro/src/geanymacro.c:1462 +msgid "Search text is POSIX compatible" +msgstr "Cerca testo POSIX-compatibile" + +#. create dialog box +#: ../geanymacro/src/geanymacro.c:1531 +msgid "Edit Insert/Replace Text" +msgstr "Modifica Inserimento/Rimpiazzo testo" + +#: ../geanymacro/src/geanymacro.c:1544 +msgid "Text:" +msgstr "Testo:" + +#: ../geanymacro/src/geanymacro.c:1570 ../geanymacro/src/geanymacro.c:1758 +#, c-format +msgid "Insert/replace with \"%s\"" +msgstr "Inserisci/Sostituisci con \"%s\"" + +#. create dialog box +#: ../geanymacro/src/geanymacro.c:1735 +#, c-format +msgid "Edit: %s" +msgstr "Modifica: %s" + +#. add column +#: ../geanymacro/src/geanymacro.c:1801 +msgid "Event" +msgstr "Evento" + +#. add buttons +#: ../geanymacro/src/geanymacro.c:1816 +msgid "Move _Up" +msgstr "Sposta _Su" + +#: ../geanymacro/src/geanymacro.c:1818 +msgid "Move Do_wn" +msgstr "Sposta _Giù" + +#: ../geanymacro/src/geanymacro.c:1820 +msgid "New _Above" +msgstr "Nuovo _Sopra" + +#: ../geanymacro/src/geanymacro.c:1821 +msgid "New _Below" +msgstr "Nuovo So_tto" + +#: ../geanymacro/src/geanymacro.c:1824 ../geanymacro/src/geanymacro.c:2120 +msgid "_Delete" +msgstr "_Elimina" + +#. create dialog box +#: ../geanymacro/src/geanymacro.c:2065 +msgid "Edit Macros" +msgstr "Modifica Macro" + +#: ../geanymacro/src/geanymacro.c:2095 +msgid "Macro Name" +msgstr "Nome Macro" + +#: ../geanymacro/src/geanymacro.c:2101 +msgid "Key Trigger" +msgstr "Tasto Trigger" + +#. add buttons +#: ../geanymacro/src/geanymacro.c:2116 +msgid "_Re-Record" +msgstr "_Re-Registra" + +#. add record macro menu entry +#: ../geanymacro/src/geanymacro.c:2260 +msgid "Record _Macro" +msgstr "Registra _Macro" + +#. add stop record macromenu entry +#: ../geanymacro/src/geanymacro.c:2266 +msgid "Stop Recording _Macro" +msgstr "Ferma Registrazione _Macro" + +#. add Edit Macro menu entry +#: ../geanymacro/src/geanymacro.c:2272 +msgid "_Edit Macros" +msgstr "_Modifica Macro" + +#. *< \brief It's the information message about geany mini script +#: ../geanyminiscript/src/gms_gui.c:129 +msgid "" +"GMS : Geany Mini-Script filter Plugin\n" +"This plugin is a tool to apply a script filter on:\n" +" o the text selection,\n" +" o the current document,\n" +" o all documents of the current session.\n" +"\n" +"The filter type can be:\n" +" o Unix shell script,\n" +" o perl script,\n" +" o python script,\n" +" o sed commands,\n" +" o awk script.\n" +"\n" +"AUTHOR\n" +" Written by Pascal BURLOT (December,2008)\n" +"\n" +"LICENSE:\n" +"This program is free software; you can redistribute\n" +"it and/or modify it under the terms of the GNU \n" +"General Public License as published by the Free\n" +"Software Foundation; either version 2 of the License,\n" +"or (at your option) any later version." +msgstr "" +"GMS : Geany Mini-Script filter Plugin\n" +"Questo plugin è uno strumento per applicare un filtro-script a:\n" +" o una selezione di testo,\n" +" o documento corrente,\n" +" o tutti i documenti della sessione corrente.\n" +"\n" +"Il fitlro può essere:\n" +" o uno script di shell Unix,\n" +" o script perl,\n" +" o script python,\n" +" o comandi sed,\n" +" o script awk.\n" +"\n" +"AUTORE\n" +" Scritto da Pascal BURLOT (December,2008)\n" +"\n" +"LICENZA:\n" +"This program is free software; you can redistribute\n" +"it and/or modify it under the terms of the GNU \n" +"General Public License as published by the Free\n" +"Software Foundation; either version 2 of the License,\n" +"or (at your option) any later version." + +#: ../geanyminiscript/src/gms_gui.c:253 +msgid "Load Mini-Script File" +msgstr "Carica file Mini-Script" + +#: ../geanyminiscript/src/gms_gui.c:310 +msgid "Save Mini-Script File" +msgstr "Salva file Mini-Script" + +#: ../geanyminiscript/src/gms_gui.c:419 +msgid "Mini-Script Filter" +msgstr "Filtro Mini-Script" + +#: ../geanyminiscript/src/gms_gui.c:445 +msgid "Clear the mini-script window" +msgstr "Pulisci la finestra Mini-Script" + +#: ../geanyminiscript/src/gms_gui.c:450 +msgid "Load a mini-script into this window" +msgstr "Carica un Mini-Script in questa finestra" + +#: ../geanyminiscript/src/gms_gui.c:455 +msgid "Save the mini-script into a file" +msgstr "Salva il Mini-Script in un file" + +#: ../geanyminiscript/src/gms_gui.c:460 +msgid "Display a information about the mini-script plugin" +msgstr "Visualizza informazioni sul plugin Mini-Script" + +#: ../geanyminiscript/src/gms_gui.c:468 +msgid "select the mini-script type" +msgstr "Seleziona il tipo di Mini-Script" + +#. Hbox : Radio bouttons for choosing the input: +#. * selection/current document/all documents of the current session +#: ../geanyminiscript/src/gms_gui.c:499 +msgid "filter input" +msgstr "filtro input" + +#: ../geanyminiscript/src/gms_gui.c:501 +msgid "select the input of mini-script filter" +msgstr "seleziona l'input del filtro mini-script" + +#: ../geanyminiscript/src/gms_gui.c:507 +msgid "selection" +msgstr "selezione" + +#: ../geanyminiscript/src/gms_gui.c:508 +msgid "document" +msgstr "documento" + +#: ../geanyminiscript/src/gms_gui.c:509 +msgid "session" +msgstr "sessione" + +#. Hbox : Radio bouttons for choosing the output: +#. * current document/ or new document +#: ../geanyminiscript/src/gms_gui.c:518 +msgid "filter output" +msgstr "filtro output" + +#: ../geanyminiscript/src/gms_gui.c:520 +msgid "select the output of mini-script filter" +msgstr "seleziona l'output del filtro Mini-Script" + +#: ../geanyminiscript/src/gms_gui.c:526 +msgid "Current Doc." +msgstr "Doc. corrente" + +#: ../geanyminiscript/src/gms_gui.c:527 +msgid "New Doc." +msgstr "Nuovo Doc." + +#: ../geanyminiscript/src/gms_gui.c:748 +msgid "script configuration" +msgstr "Configurazione script" + +#: ../geanyminiscript/src/gms.c:58 +msgid "Mini Script" +msgstr "Mini Script" + +#: ../geanyminiscript/src/gms.c:59 +msgid "" +"A tool to apply a script filter on a text selection or current document(s)" +msgstr "" +"Uno strumento per applicare uno script filtro a una selezione di testo o " +"ai documenti correnti." + +#: ../geanyminiscript/src/gms.c:60 +msgid "Pascal BURLOT, a Geany user" +msgstr "Pascal BURLOT, un utente di Geany" + +#. Add an item to the Tools menu +#: ../geanyminiscript/src/gms.c:249 +msgid "_Mini-Script" +msgstr "_Mini-Script" + +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:61 +msgid "Numbered Bookmarks for Geany" +msgstr "Segnalibri numerati per Geany" + +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:927 +#, c-format, fuzzy +msgid "Unable to apply all markers to '%s' as all being used." +msgstr "Impossibile applicare tutti i marcatori a '%s' come tutti in uso." + +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:929 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:973 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1396 +msgid "_Okay" +msgstr "_Okay" + +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:971 +#, c-format +msgid "" +"'%s' has been edited since it was last saved by geany. Marker positions may " +"be unreliable and will not be loaded.\n" +"Press Ignore to try an load markers anyway." +msgstr "" +"'%s' è stato modificato dall'ultimo salvataggio di Geany. La posizione dei " +"segnalibri potrebbe essere inaffidabile e non verranno quindi caricati.\n" +"Premi Ignora per provare a caricarli ugualmente." + +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:974 +msgid "_Ignore" +msgstr "_Ignora" + +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1219 +msgid "remember fold state" +msgstr "Ricorda stato di espansione" + +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1225 +msgid "Center view when goto bookmark" +msgstr "Centra la vista quando vai a un segnalibro" + +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1232 +msgid "Move to start of line" +msgstr "Sposta a inizio riga" + +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1233 +msgid "Move to remembered position in line" +msgstr "Sposta nella posizione salvata della riga" + +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1234 +msgid "Move to position in current line" +msgstr "Sposta nella posizione corrente" + +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1235 +msgid "Move to End of line" +msgstr "Sposta a fine riga" + +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1241 +msgid "Save file settings with program settings" +msgstr "Salva le preferenze con le impostazioni del programma" + +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1242 +msgid "Save file settings to filename with suffix" +msgstr "Salva il file delle preferenze con un suffisso" + +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1247 +msgid "remember normal Bookmarks" +msgstr "Ricorda normali Segnalibri" + +#. create dialog box +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1267 +msgid "Numbered Bookmarks help" +msgstr "Aiuto segnalibri numerati" + +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1274 +msgid "" +"This Plugin implements Numbered Bookmarks in Geany, as well as remembering " +"the state of folds, and positions of standard non-numbered bookmarks when a " +"file is saved.\n" +"\n" +"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark " +"press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to " +"the line number. If you press Ctrl+Shift+a number on a line that already has " +"that bookmark number then it removes the bookmark, otherwise it will move " +"the bookmark there if it was set on a different line, or create it if it had " +"not already been set. Only the most recently set bookmark on a line will be " +"shown, but you can have more than one bookmark per line. To move to a " +"previously set bookmark, press Ctrl+a number from 0 to 9." +msgstr "" +"Questo Plugin implementa i Segnalibri Numerati in Geany, lo stato delle espansioni " +"e contrazioni del codice e le posizioni dei segnalibri standard non numerati " +"questo il file viene salvato.\n" +"\n" +"Ti permette di usare fino a 10 segnalibri numerati. Per avere un sengalibro " +"numerato premi Ctrl+Shift+ un numero da 0 a 9. Vedrai un simbolo comparire " +"vicino al numero della riga. Se premi Ctrl+Shift+ un numero su una riga " +"che ne ha già quel numero, quel segnalibro sarà rimosso, altrimenti si " +"sposterà da un'altra riga (se esiste) oppure verrà creato. Solo l'ultimo " +"segnalibro inserito su ogni riga verrà visualizzato, ma puoi avere più " +"segnalibri per linea. Per muoverti a un segnalibro precedentemente impostato " +"premi Ctrl+un numero da 0 a 9." + +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1395 +#, fuzzy +msgid "Unable to apply markers as all being used." +msgstr "Impossibile applicare tutti i marcatori come tutti in uso" + +#: ../geanypg/src/decrypt_cb.c:33 ../geanypg/src/encrypt_cb.c:32 +#: ../geanypg/src/sign_cb.c:33 +msgid "couldn't create tempfile" +msgstr "Impossibile creare file temporaneo" + +#: ../geanypg/src/encrypt_cb.c:84 +#, c-format +msgid "" +"The key with user ID \"%s\" has validity \"%s\".\n" +"\n" +"WARNING: It is NOT certain that the key belongs to the person named in the " +"user ID.\n" +"\n" +"Are you *really* sure you want to use this key anyway?" +msgstr "" +"La chiave con user ID \"%s\" ha validità \"%s\".\n" +"\n" +"ATTENZIONE: Non è certo che appartiene alla persona indicata nello user ID. " +"\n" +"\n" +"Sei *davvero* sicuro di voler usare questa chiave comunque?" + +#: ../geanypg/src/encrypt_cb.c:96 +msgid "" +"No recipients were selected,\n" +"use symetric cipher?" +msgstr "" +"Nessun destinatario selezionato,\n" +"usare cifratura simmetrica?" + +#: ../geanypg/src/geanypg.c:37 +msgid "gpg encryption plugin for geany" +msgstr "Plugin per la crittografia gpg in Geany" + +#: ../geanypg/src/geanypg.c:39 +msgid "Hans Alves " +msgstr "Hans Alves " + +#: ../geanypg/src/geanypg.c:47 +msgid "Using libgpgme version:" +msgstr "Usando versione libgpgme:" + +#: ../geanypg/src/geanypg.c:60 ../geanypg/src/geanypg.c:61 +msgid "Error from" +msgstr "Errore da" + +#: ../geanypg/src/geanypg.c:86 +msgid "Encrypt" +msgstr "Crifra" + +#: ../geanypg/src/geanypg.c:87 +msgid "Sign" +msgstr "Firma" + +#: ../geanypg/src/geanypg.c:88 +msgid "Decrypt / Verify" +msgstr "Decifra / Verifica" + +#: ../geanypg/src/geanypg.c:89 +msgid "Verify detached signature" +msgstr "Verifica firma separata" + +#: ../geanypg/src/key_selection_dialog.c:152 +msgid "Please select any recipients" +msgstr "Si prega di selezionare eventuali destinatari" + +#: ../geanypg/src/key_selection_dialog.c:154 +msgid "Sign the message as:" +msgstr "Firma il messaggio come:" + +#: ../geanypg/src/key_selection_dialog.c:162 +msgid "Select recipients" +msgstr "Seleziona destinatari" + +#: ../geanypg/src/key_selection_dialog.c:224 +msgid "Choose a key to sign with:" +msgstr "Scegli una chiave per firmare:" + +#: ../geanypg/src/key_selection_dialog.c:232 +msgid "Select signer" +msgstr "Seleziona firmatario" + +#. shouldn't get here +#: ../geanypg/src/pinentry.c:111 +msgid "Could not use pinentry." +msgstr "Impossibile usare pinentry." + +#: ../geanypg/src/pinentry.c:123 +msgid "Unexpected output from pinentry." +msgstr "Output inaspettato da pinentry." + +#. read the rest of the first line after OK +#: ../geanypg/src/pinentry.c:131 +msgid "Passphrase entry" +msgstr "Inserimento parola chiave" + +#: ../geanypg/src/pinentry.c:135 +msgid "Passphrase" +msgstr "Parola chiave" + +#: ../geanypg/src/pinentry.c:140 +msgid "Enter passphrase for" +msgstr "Inserisci parola chiave per" + +#: ../geanypg/src/pinentry.c:171 +msgid "pinentry gave error" +msgstr "pinentry ha resituito un errore" + +#: ../geanypg/src/pinentry.c:174 +msgid "Unexpected error from pinentry." +msgstr "Errore inaspettato da pinentry." + +#: ../geanypg/src/pinentry.c:199 +msgid "" +"Error, Passphrase input without using gpg-agent is not supported on Windows " +"yet." +msgstr "" +"Errore, l'input di parola chiave senza usare un gpg-agent non è ancora supportato " +"su Windows" + +#: ../geanypg/src/verify_aux.c:53 +msgid "a key with fingerprint" +msgstr "una chiave con fingerprint" + +#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:527 +#: ../spellcheck/src/gui.c:538 +msgid "unknown" +msgstr "sconosciuto" + +#: ../geanypg/src/verify_aux.c:67 +msgid "undefined" +msgstr "non definito" + +#: ../geanypg/src/verify_aux.c:68 +msgid "never" +msgstr "mai" + +#: ../geanypg/src/verify_aux.c:69 +msgid "marginal" +msgstr "marginale" + +#: ../geanypg/src/verify_aux.c:70 +msgid "full" +msgstr "pieno" + +#: ../geanypg/src/verify_aux.c:71 +msgid "ultimate" +msgstr "finale" + +#: ../geanypg/src/verify_aux.c:72 ../geanypg/src/verify_aux.c:74 +msgid "[bad validity value]" +msgstr "[valore validità errato]" + +#. buffer should be more than 105 bytes long +#: ../geanypg/src/verify_aux.c:79 +msgid " valid" +msgstr " valido" + +#: ../geanypg/src/verify_aux.c:80 +msgid " green" +msgstr " verde" + +#: ../geanypg/src/verify_aux.c:81 +msgid " red" +msgstr " rosso" + +#: ../geanypg/src/verify_aux.c:82 +msgid " revoked" +msgstr " revocato" + +#: ../geanypg/src/verify_aux.c:83 +msgid " key-expired" +msgstr "chiave scaduta" + +#: ../geanypg/src/verify_aux.c:84 +msgid " sig-expired" +msgstr " firma scaduta" + +#: ../geanypg/src/verify_aux.c:85 +msgid " key-missing" +msgstr " chiave mancante" + +#: ../geanypg/src/verify_aux.c:86 +msgid " crl-missing" +msgstr " crl mancante" + +#: ../geanypg/src/verify_aux.c:87 +msgid " crl-too-old" +msgstr " crl troppo vecchio" + +#: ../geanypg/src/verify_aux.c:88 +msgid " bad-policy" +msgstr " policy errata" + +#: ../geanypg/src/verify_aux.c:89 +msgid " sys-error" +msgstr " errore sistema" + +#: ../geanypg/src/verify_aux.c:96 +#, c-format +msgid "" +"status ....: %s\n" +"summary ...:%s\n" +"fingerprint: %s\n" +"created ...: %sexpires ...: %svalidity ..: %s\n" +"val.reason : %s\n" +"pubkey algo: %s\n" +"digest algo: %s\n" +"pka address: %s\n" +"pka trust .: %s\n" +"other flags:%s%s\n" +"notations .: %s\n" +msgstr "" +"stato ....: %s\n" +"riepilogo ...:%s\n" +"fingerprint: %s\n" +"creato ...: %sexpires ...: %svalidità ..: %s\n" +"motivo val.: %s\n" +"pubkey algo: %s\n" +"digest algo: %s\n" +"pka address: %s\n" +"pka trust .: %s\n" +"altri flags:%s%s\n" +"note .: %s\n" + +#: ../geanypg/src/verify_aux.c:119 ../geanypg/src/verify_aux.c:124 +msgid "Unknown\n" +msgstr "Sconosciuto\n" + +#: ../geanypg/src/verify_aux.c:129 ../geanypg/src/verify_aux.c:136 +#: ../geanypg/src/verify_aux.c:147 ../geanypg/src/verify_aux.c:154 +msgid "[None]" +msgstr "[Nessuno]" + +#: ../geanypg/src/verify_aux.c:134 ../geanypg/src/verify_aux.c:135 +#: ../geanypg/src/verify_aux.c:152 ../geanypg/src/verify_aux.c:153 +msgid "Unknown" +msgstr "Sconosciuto" + +#: ../geanypg/src/verify_aux.c:137 ../geanypg/src/verify_aux.c:155 +msgid "n/a" +msgstr "n.d." + +#: ../geanypg/src/verify_aux.c:137 ../geanypg/src/verify_aux.c:155 +msgid "bad" +msgstr "errato" + +#: ../geanypg/src/verify_aux.c:137 ../geanypg/src/verify_aux.c:155 +msgid "okay" +msgstr "okay" + +#: ../geanypg/src/verify_aux.c:137 ../geanypg/src/verify_aux.c:155 +msgid "RFU" +msgstr "RFU" + +#: ../geanypg/src/verify_aux.c:138 ../geanypg/src/verify_aux.c:156 +msgid " wrong-key-usage" +msgstr " uso-chiave-errato" + +#: ../geanypg/src/verify_aux.c:139 ../geanypg/src/verify_aux.c:156 +msgid " chain-model" +msgstr " chain-model" + +#: ../geanypg/src/verify_aux.c:140 ../geanypg/src/verify_aux.c:157 +msgid "yes" +msgstr "sì" + +#: ../geanypg/src/verify_aux.c:140 ../geanypg/src/verify_aux.c:157 +msgid "no" +msgstr "no" + +#: ../geanypg/src/verify_aux.c:175 +msgid "Found a signature from" +msgstr "Cerca una firma da" + +#: ../geanypg/src/verify_aux.c:178 +msgid "Signature" +msgstr "Firma" + +#: ../geanypg/src/verify_aux.c:201 +msgid "Could not find verification results" +msgstr "Impossibile trovare risultati della verifica" + +#: ../geanypg/src/verify_aux.c:202 +msgid "Error, could not find verification results" +msgstr "Errore, impossibile trovare risultati della verifica" + +#: ../geanypg/src/verify_cb.c:27 +msgid "Open a signature file" +msgstr "Apri un file firma" + +#: ../geanyprj/src/geanyprj.c:38 ../geanyprj/src/sidebar.c:456 +#: ../gproject/src/gproject-sidebar.c:849 +msgid "Project" +msgstr "Progetto" + +#: ../geanyprj/src/geanyprj.c:38 +msgid "Alternative project support." +msgstr "Supporto alternativo progetto." + +#: ../geanyprj/src/geanyprj.c:224 +msgid "Find a text in geanyprj's project" +msgstr "Cerca un testo in un progetto geanyprj" + +#: ../geanyprj/src/geanyprj.c:238 +msgid "Display sidebar" +msgstr "Visualizza barra laterale" + +#: ../geanyprj/src/menu.c:92 +msgid "Project Preferences" +msgstr "Preferenze progetto" + +#: ../geanyprj/src/menu.c:101 ../geanyprj/src/menu.c:377 +#: ../geanyprj/src/sidebar.c:172 +msgid "New Project" +msgstr "Nuovo progetto" + +#: ../geanyprj/src/menu.c:110 +msgid "C_reate" +msgstr "C_rea" + +#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:114 +msgid "Name:" +msgstr "Nome:" + +#: ../geanyprj/src/menu.c:132 +msgid "Location:" +msgstr "Posizione:" + +#: ../geanyprj/src/menu.c:147 +msgid "Choose Project Location" +msgstr "Scegli una posizione per il progetto" + +#: ../geanyprj/src/menu.c:155 +msgid "Base path:" +msgstr "Percorso base:" + +#: ../geanyprj/src/menu.c:160 +msgid "" +"Base directory of all files that make up the project. This can be a new " +"path, or an existing directory tree. You can use paths relative to the " +"project filename." +msgstr "" +"Directory base di tutti i file che compongono il progetto. Questo può essere " +"un nuovo percorso o uno già esistente. Puoi usare anche percorsi relativi " +"al file del progetto." + +#: ../geanyprj/src/menu.c:163 +msgid "Choose Project Base Path" +msgstr "Scegli percorso base del progetto" + +#: ../geanyprj/src/menu.c:170 +msgid "Generate file list on load" +msgstr "Genera lista file all'apertura" + +#: ../geanyprj/src/menu.c:172 +msgid "" +"Automatically add files that match project type on project load " +"automatically. You can't manually add/remove files if you checked this " +"option, since your modification will be lost on on next project load" +msgstr "" +"Aggiunge automaticamente i file che corrispondono al tipo progetto all'" +"apertura di quest'ultimo. Non puoi manualmente aggiungere/rimuovere file " +"se selezioni questa opzione, perché le tue modifiche andranno perse alla " +"prossima apertura del progetto." + + +#: ../geanyprj/src/menu.c:180 +msgid "Type:" +msgstr "Tipo:" + +#: ../geanyprj/src/menu.c:218 +#, c-format +msgid "Project file \"%s\" already exists" +msgstr "Il file del progetto \"%s\" esiste già" + +#: ../geanyprj/src/menu.c:368 +msgid "_Project" +msgstr "_Progetto" + +#: ../geanyprj/src/menu.c:386 ../geanyprj/src/sidebar.c:181 +msgid "Delete Project" +msgstr "Elimina Progetto" + +#: ../geanyprj/src/menu.c:397 ../geanyprj/src/sidebar.c:194 +msgid "Add File" +msgstr "Aggiungi file" + +#: ../geanyprj/src/menu.c:408 ../geanyprj/src/sidebar.c:216 +msgid "Preferences" +msgstr "Preferenze" + +#: ../geanyprj/src/menu.c:419 ../geanyprj/src/sidebar.c:229 +msgid "Find in Project" +msgstr "Cerca nel progetto" + +#: ../geanyprj/src/sidebar.c:203 +msgid "Remove File" +msgstr "Rimuovi file" + +#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:828 +msgid "H_ide Sidebar" +msgstr "Nascond_i barra laterale" + +#: ../geanyprj/src/xproject.c:96 +#, c-format +msgid "Project \"%s\" opened." +msgstr "Progetto \"%s\" aperto." + +#: ../geanypy/src/geanypy-plugin.c:34 +msgid "GeanyPy" +msgstr "GeanyPy" + +#: ../geanypy/src/geanypy-plugin.c:35 +msgid "Python plugins support" +msgstr "Supporto plugins in Python" + +#: ../geanypy/src/geanypy-plugin.c:77 +#, c-format +msgid "Unable to pre-load Python library: %s." +msgstr "Impossibile 'pre-load' sulla libreria Python: %s." + +#: ../geanypy/src/geanypy-plugin.c:157 +msgid "Failed to import manager module" +msgstr "Impossibile importare modulo 'manager'" + +#: ../geanypy/src/geanypy-plugin.c:166 +msgid "Failed to retrieve PluginManager from manager module" +msgstr "Impossibile ottenere PluginManager da modulo 'manager'" + +#: ../geanypy/src/geanypy-plugin.c:182 +msgid "System plugin directory not found." +msgstr "Impossibile trovare la directory di sistema per i plugin." + +#: ../geanypy/src/geanypy-plugin.c:211 +msgid "Unable to instantiate new PluginManager" +msgstr "Impossibile instanziare new PluginManager" + +#: ../geanypy/src/geanypy-plugin.c:227 +msgid "Unable to get show_all() method on plugin manager" +msgstr "Impossibile ottenere show_all() sul plugin manager" + +#: ../geanypy/src/geanypy-plugin.c:255 +#, c-format +msgid "Unable to create Python plugins directory: %s: %s" +msgstr "Impossibile creare la Python plugins directory: %s: %s" + +#: ../geanypy/src/geanypy-plugin.c:266 +msgid "Python Plugin Manager" +msgstr "Python Plugin Manager" + +#: ../geanysendmail/src/geanysendmail.c:43 +msgid "GeanySendMail" +msgstr "GeanySendMail" + +#: ../geanysendmail/src/geanysendmail.c:44 +msgid "" +"A little plugin to send the current file as attachment by user's favorite " +"mailer" +msgstr "" +"Un picolo plugin per inviare il file corrente come allegato del programma " +"di posta preferito" + +#: ../geanysendmail/src/geanysendmail.c:98 +msgid "Recipient's Address" +msgstr "Indirizzo destinatario" + +#: ../geanysendmail/src/geanysendmail.c:100 +msgid "Enter the recipient's e-mail address:" +msgstr "Inserisci l'email del destinatario:" + +#: ../geanysendmail/src/geanysendmail.c:138 +msgid "Filename placeholder not found. The executed command might have failed." +msgstr "Segnaposto nome file non trovato. Il comando eseguito potrebbe aver fallito." + +#: ../geanysendmail/src/geanysendmail.c:144 +msgid "" +"Recipient address placeholder not found. The executed command might have " +"failed." +msgstr "" +"Segnaposto indirizzo destinatario non trovato. Il comando eseguito potrebbe " +"aver fallito." + +#: ../geanysendmail/src/geanysendmail.c:159 +msgid "Could not execute mailer. Please check your configuration." +msgstr "Impossibile eseguire il gestore mail. Controlla la tua configurazione. " + +#: ../geanysendmail/src/geanysendmail.c:168 +msgid "Please define a mail client first." +msgstr "Devi definire un client mail prima." + +#: ../geanysendmail/src/geanysendmail.c:173 +msgid "File has to be saved before sending." +msgstr "Il file deve essere salvato prima di inviare." + +#: ../geanysendmail/src/geanysendmail.c:191 +msgid "Mail" +msgstr "Mail" + +#: ../geanysendmail/src/geanysendmail.c:222 +msgid "Send by mail" +msgstr "Inviato via mail" + +#. add a label and a text entry to the dialog +#: ../geanysendmail/src/geanysendmail.c:312 +msgid "Path and options for the mail client:" +msgstr "Percorso e opzioni per il client mail:" + +#: ../geanysendmail/src/geanysendmail.c:320 +msgid "" +"Note: \n" +"\t%f will be replaced by your file.\n" +"\t%r will be replaced by recipient's email address.\n" +"\t%b will be replaced by basename of a file\n" +"\tExamples:\n" +"\tsylpheed --attach \"%f\" --compose \"%r\"\n" +"\tmutt -s \"Sending '%b'\" -a \"%f\" \"%r\"" +msgstr "" +"Note: \n" +"\t%f sarà sostituito dal nome del tuo file.\n" +"\t%r sarà sostituito dall'indirizzo mail del destinatario.\n" +"\t%b sarà sostituito dal percorso base del file\n" +"\tEsempi:\n" +"\tsylpheed --attach \"%f\" --compose \"%r\"\n" +"\tmutt -s \"Invio '%b'\" -a \"%f\" \"%r\"" + +#: ../geanysendmail/src/geanysendmail.c:330 +msgid "Show toolbar icon" +msgstr "Visualizza icona nella toolbar" + +#: ../geanysendmail/src/geanysendmail.c:332 +msgid "Shows a icon in the toolbar to send file more easy." +msgstr "Visualizza un'icona nella toolbar per inviare il file più semplicemente." + +#: ../geanysendmail/src/geanysendmail.c:338 +msgid "Use dialog for entering email address of recipients" +msgstr "Usa un dialogo per inserire gli indirizzi email dei destinatari" + +#: ../geanysendmail/src/geanysendmail.c:360 +msgid "Send file by mail" +msgstr "Invia file via mail" + +#. Build up menu entry +#: ../geanysendmail/src/geanysendmail.c:383 +msgid "_Mail document" +msgstr "Documento _mail" + +#: ../geanysendmail/src/geanysendmail.c:386 +msgid "" +"Sends the opened file as unzipped attachment by any mailer from your $PATH" +msgstr "" +"Invia un file aperto come allegato non compresso da qualsiasi programma " +"dal tuo $PATH" + +#: ../geanyvc/src/geanyvc.c:53 +msgid "GeanyVC" +msgstr "GeanyVC" + +#: ../geanyvc/src/geanyvc.c:54 +msgid "Interface to different Version Control systems." +msgstr "Interfaccia per differenti sistemi di Controllo Versione (VCS)" + +#: ../geanyvc/src/geanyvc.c:475 +#, c-format +msgid "geanyvc: s_spawn_sync error: %s" +msgstr "geanyvc: errore s_spawn_sync: %s" + +#: ../geanyvc/src/geanyvc.c:561 +#, c-format +msgid "File %s: action %s executed via %s." +msgstr "File %s: azioni %s eseguiti da %s." + +#: ../geanyvc/src/geanyvc.c:614 ../geanyvc/src/geanyvc.c:625 +#, c-format +msgid "geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'" +msgstr "geanyvc: vcdiff_file_activated: Impossibile rinonimare '%s' in '%s'" + +#: ../geanyvc/src/geanyvc.c:651 ../geanyvc/src/geanyvc.c:701 +msgid "No changes were made." +msgstr "Nessuna modifica effettuata." + +#: ../geanyvc/src/geanyvc.c:728 +msgid "No history available" +msgstr "Cronologia non disponibile" + +#: ../geanyvc/src/geanyvc.c:921 ../geanyvc/src/geanyvc.c:929 +#, c-format +msgid "Do you really want to revert: %s?" +msgstr "Vuoi davvero ripristinare: %s?" + +#: ../geanyvc/src/geanyvc.c:937 +#, c-format +msgid "Do you really want to add: %s?" +msgstr "Vuoi davvero aggiungere: %s?" + +#: ../geanyvc/src/geanyvc.c:944 +#, c-format +msgid "Do you really want to remove: %s?" +msgstr "Vuoi davvero rimuovere: %s?" + +#: ../geanyvc/src/geanyvc.c:967 +msgid "Do you really want to update?" +msgstr "Vuoi davvero aggiornare: %s?" + +#: ../geanyvc/src/geanyvc.c:1094 +msgid "" +"The resulting differences cannot be displayed because the changes are too " +"big to display here and would slow down the UI significantly.\n" +"\n" +"To view the differences, cancel this dialog and open the differences in " +"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)." +msgstr "" +"Le differenze risultanti non possono essere visualizzare perché i cambiamenti " +"sono troppo grandi da mostrare e rallenterebbero eccessivamente l'interfaccia.\n" +"\n" +"Per vedere le differenze, chiudere questa finestra ed aprirle in Geany " +"tramite in menu GeanyVC (Directory Base -> Diff)." + +#: ../geanyvc/src/geanyvc.c:1243 +msgid "Commit Y/N" +msgstr "Commit S/N" + +#: ../geanyvc/src/geanyvc.c:1253 +msgid "Status" +msgstr "Stato" + +#: ../geanyvc/src/geanyvc.c:1260 +msgid "Path" +msgstr "Percorso" + +#: ../geanyvc/src/geanyvc.c:1324 +#, c-format +msgid "Line: %d Column: %d" +msgstr "Linea: %d Colonna: %d" + +#: ../geanyvc/src/geanyvc.c:1370 +msgid "Commit" +msgstr "Commit" + +#: ../geanyvc/src/geanyvc.c:1412 +msgid "_De-/select all files" +msgstr "_De-/seleziona tutti i file" + +#: ../geanyvc/src/geanyvc.c:1456 +msgid "Commit message:" +msgstr "Messaggio commit:" + +#: ../geanyvc/src/geanyvc.c:1475 +msgid "C_ommit" +msgstr "C_ommit" + +#: ../geanyvc/src/geanyvc.c:1556 +msgid "Nothing to commit." +msgstr "Niente da committare." + +#: ../geanyvc/src/geanyvc.c:1602 +#, c-format +msgid "Error initializing spell checking: %s" +msgstr "Errore nell'inizializzazione del controllo ortografia: %s" + +#: ../geanyvc/src/geanyvc.c:1614 +#, c-format +msgid "" +"Error while setting up language for spellchecking. Please check " +"configuration. Error message was: %s" +msgstr "" +"Errore mentre la lingua del controllo ortografia veniva impostata. Si " +"prega di controllare la configurazione. Messaggio di errore: %s" + +#: ../geanyvc/src/geanyvc.c:1890 +msgid "Set Changed-flag for document tabs created by the plugin" +msgstr "Imposta flag-modificato per i tabs documenti creati dal plugin" + +#: ../geanyvc/src/geanyvc.c:1893 +msgid "" +"If this option is activated, every new by the VC-plugin created document tab " +"will be marked as changed. Even this option is useful in some cases, it " +"could cause a big number of annoying \"Do you want to save\"-dialogs." +msgstr "" +"Se questa opzione è attivata, ogni nuovo documento creato da VC-plugin " +"sarà impostato come modificato. Anche se questa opzione può essere utile " +"in alcuni casi, potrebbe produrre un noioso grande numero di finestre " +"\"Vuoi salvare il file?\"" + +#: ../geanyvc/src/geanyvc.c:1901 +msgid "Confirm adding new files to a VCS" +msgstr "Conferma aggiunta nuovo file to VCS" + +#: ../geanyvc/src/geanyvc.c:1904 +msgid "Shows a confirmation dialog on adding a new (created) file to VCS." +msgstr "" +"Visualizza un dialogo di conferma per aggiungere un nuovo (creato) file " +"al VCS." + +#: ../geanyvc/src/geanyvc.c:1910 +msgid "Maximize commit dialog" +msgstr "Ingrandisci dialogo commit" + +#: ../geanyvc/src/geanyvc.c:1911 +msgid "Show commit dialog maximize." +msgstr "Visualizza dialogo commit ingrandito." + +#: ../geanyvc/src/geanyvc.c:1917 +msgid "Use external diff viewer" +msgstr "Usa editor diff esterno" + +#: ../geanyvc/src/geanyvc.c:1919 +msgid "Use external diff viewer for file diff." +msgstr "Usa editor diff esterno per differenze." + +#: ../geanyvc/src/geanyvc.c:1925 +msgid "Show VC entries at editor menu" +msgstr "Visualizza voci VC nel menu editor" + +#: ../geanyvc/src/geanyvc.c:1927 +msgid "Show entries for VC functions inside editor menu" +msgstr "Visualizza voci per le funzioni VC all'interno del menu editor" + +#: ../geanyvc/src/geanyvc.c:1932 +msgid "Attach menu to menubar" +msgstr "Poni menu nella menubar" + +#: ../geanyvc/src/geanyvc.c:1934 +msgid "" +"Whether menu for this plugin are getting placed either inside tools menu or " +"directly inside Geany's menubar.Will take in account after next start of " +"GeanyVC" +msgstr "" +"Imposta se il menu per questo plugin deve essere posizionato all'interno " +"del menu strumenti o direttamente nella toolbar di Geany. La modifica sarà " +"visibile dopo il riavvio di Geany." + +#: ../geanyvc/src/geanyvc.c:1942 +msgid "Enable CVS" +msgstr "Abilita CVS" + +#: ../geanyvc/src/geanyvc.c:1947 +msgid "Enable GIT" +msgstr "Abilita GIT" + +#: ../geanyvc/src/geanyvc.c:1952 +msgid "Enable SVN" +msgstr "Abilita SVN" + +#: ../geanyvc/src/geanyvc.c:1957 +msgid "Enable SVK" +msgstr "Abilita SVK" + +#: ../geanyvc/src/geanyvc.c:1962 +msgid "Enable Bazaar" +msgstr "Abilita Bazaar" + +#: ../geanyvc/src/geanyvc.c:1967 +msgid "Enable Mercurial" +msgstr "Abilita Mercurial" + +#: ../geanyvc/src/geanyvc.c:1973 +msgid "Spellcheck language" +msgstr "Lingua controllo ortografia" + +#: ../geanyvc/src/geanyvc.c:2064 +msgid "_VC file Actions" +msgstr "_VC file azioni" + +#. Diff of current file +#. Diff of the current dir +#. Complete diff of base directory +#: ../geanyvc/src/geanyvc.c:2070 ../geanyvc/src/geanyvc.c:2147 +#: ../geanyvc/src/geanyvc.c:2187 +msgid "_Diff" +msgstr "_Diff" + +#: ../geanyvc/src/geanyvc.c:2073 +msgid "Make a diff from the current active file" +msgstr "Crea un diff dal file attivo corrente" + +#. Revert current file +#. Revert current dir +#. Revert everything +#: ../geanyvc/src/geanyvc.c:2078 ../geanyvc/src/geanyvc.c:2156 +#: ../geanyvc/src/geanyvc.c:2195 +msgid "_Revert" +msgstr "_Ripristina (revert)" + +#: ../geanyvc/src/geanyvc.c:2081 +msgid "Restore pristine working copy file (undo local edits)." +msgstr "Ripristina una versione originale del file (annulla modifiche locali)." + +#. Blame for current file +#: ../geanyvc/src/geanyvc.c:2090 +msgid "_Blame" +msgstr "_Responsabilità" + +#: ../geanyvc/src/geanyvc.c:2093 +msgid "Shows the changes made at one file per revision and author." +msgstr "Visualizza le modifiche fatte a un file per revisione e autore." + +#. History/log of current file +#. History/log of the current dir +#. Complete History/Log of base directory +#: ../geanyvc/src/geanyvc.c:2100 ../geanyvc/src/geanyvc.c:2166 +#: ../geanyvc/src/geanyvc.c:2207 +msgid "_History (log)" +msgstr "_Cronologia (log)" + +#: ../geanyvc/src/geanyvc.c:2103 +msgid "Shows the log of the current file" +msgstr "Visualizza i log del file corrente" + +#. base version of the current file +#: ../geanyvc/src/geanyvc.c:2108 +msgid "_Original" +msgstr "_Originale" + +#: ../geanyvc/src/geanyvc.c:2111 +msgid "Shows the original of the current file" +msgstr "Visualizza l'originale del file corrente" + +#. add current file +#: ../geanyvc/src/geanyvc.c:2119 +msgid "_Add to Version Control" +msgstr "_Aggiungi a Controllo Versione" + +#: ../geanyvc/src/geanyvc.c:2121 +msgid "Add file to repository." +msgstr "Aggiungi file al repository." + +#. remove current file +#: ../geanyvc/src/geanyvc.c:2127 +msgid "_Remove from Version Control" +msgstr "_Rimuovi da Controllo Versione" + +#: ../geanyvc/src/geanyvc.c:2129 +msgid "Remove file from repository." +msgstr "Rimuovi file da repository." + +#: ../geanyvc/src/geanyvc.c:2144 +msgid "_Directory" +msgstr "_Directory" + +#: ../geanyvc/src/geanyvc.c:2150 +msgid "Make a diff from the directory of the current active file" +msgstr "Crea una diff dalla directory del file attivo corrente" + +#: ../geanyvc/src/geanyvc.c:2159 +msgid "Restore original files in the current folder (undo local edits)." +msgstr "" +"Ripristina file originali nella cartella corrente (annulla modifiche locali)" + +#: ../geanyvc/src/geanyvc.c:2169 +msgid "Shows the log of the current directory" +msgstr "Visualizza log directory corrente" + +#: ../geanyvc/src/geanyvc.c:2183 +msgid "_Base Directory" +msgstr "_Base Directory" + +#: ../geanyvc/src/geanyvc.c:2189 +msgid "Make a diff from the top VC directory" +msgstr "Crea diff dalla directory VC primaria" + +#: ../geanyvc/src/geanyvc.c:2197 +msgid "Revert any local edits." +msgstr "Annulla qualsiasi modifica locale." + +#: ../geanyvc/src/geanyvc.c:2210 +msgid "Shows the log of the top VC directory" +msgstr "Visualizza log della directory VC primaria" + +#: ../geanyvc/src/geanyvc.c:2236 +msgid "VC _Commit" +msgstr "VC _Commit" + +#: ../geanyvc/src/geanyvc.c:2271 +msgid "Show diff of file" +msgstr "Visualizza diff del file" + +#: ../geanyvc/src/geanyvc.c:2273 +msgid "Show diff of directory" +msgstr "Visualizza diff della directory" + +#: ../geanyvc/src/geanyvc.c:2275 +msgid "Show diff of basedir" +msgstr "Visualizza diff della basedir" + +#: ../geanyvc/src/geanyvc.c:2278 +msgid "Commit changes" +msgstr "Commit cambiamenti" + +#: ../geanyvc/src/geanyvc.c:2280 +msgid "Show status" +msgstr "Visualizza status" + +#: ../geanyvc/src/geanyvc.c:2282 +msgid "Revert single file" +msgstr "Ripristina singolo file" + +#: ../geanyvc/src/geanyvc.c:2284 +msgid "Revert directory" +msgstr "Ripristina directory" + +#: ../geanyvc/src/geanyvc.c:2286 +msgid "Revert base directory" +msgstr "Ripristina directory base" + +#: ../geanyvc/src/geanyvc.c:2288 +msgid "Update file" +msgstr "Aggiorna file" + +#: ../geanyvc/src/geanyvc.c:2316 +msgid "_VC" +msgstr "_VC" + +#: ../geanyvc/src/geanyvc.c:2322 +msgid "_Version Control" +msgstr "_Version Control" + +#. Status of basedir +#: ../geanyvc/src/geanyvc.c:2344 +msgid "_Status" +msgstr "_Status" + +#: ../geanyvc/src/geanyvc.c:2346 +msgid "Show status." +msgstr "Visualizza status." + +#: ../geanyvc/src/geanyvc.c:2353 +msgid "Update from remote repository." +msgstr "Aggiorna dal repository remoto." + +#. Commit all changes +#: ../geanyvc/src/geanyvc.c:2358 +msgid "_Commit" +msgstr "_Commit" + +#: ../geanyvc/src/geanyvc.c:2360 +msgid "Commit changes." +msgstr "Commit modifiche." + +#: ../geniuspaste/src/geniuspaste.c:101 +msgid "Paste your code on your favorite pastebin" +msgstr "Incolla il tuo codice da un pastebin preferito" + +#: ../geniuspaste/src/geniuspaste.c:222 +msgid "Refusing to create blank paste" +msgstr "Rifiuta di creare appunti vuoti" + +#: ../geniuspaste/src/geniuspaste.c:341 +msgid "" +"Unable to paste the code on codepad.org\n" +"Retry or select another pastebin." +msgstr "" +"Impossibile incolla il codice su codepad.org\n" +"Riprova o seleziona un altro pastebin." + +#: ../geniuspaste/src/geniuspaste.c:393 +msgid "Paste Successful" +msgstr "Appunti caricato correttamente" + +#: ../geniuspaste/src/geniuspaste.c:395 +#, c-format +msgid "" +"Your paste can be found here:\n" +"%s" +msgstr "" +"Puoi trovare i tuoi appunti qui:\n" +"%s" + +#: ../geniuspaste/src/geniuspaste.c:403 +#, c-format +msgid "" +"Unable to paste the code. Check your connection and retry.\n" +"Error code: %d\n" +msgstr "" +"Impossibile caricare il codice. Controlla la tua connessione e riprova.\n" +"Codice errore: %d\n" + +#: ../geniuspaste/src/geniuspaste.c:416 +msgid "There are no opened documents. Open one and retry.\n" +msgstr "Non ci sono documenti aperti. Aprine uno e riprova.\n" + +#: ../geniuspaste/src/geniuspaste.c:429 +msgid "The author name field is empty!" +msgstr "Il campo del nome autore è vuoto!" + +#: ../geniuspaste/src/geniuspaste.c:448 +msgid "Select a pastebin:" +msgstr "Seleziona un pastbin:" + +#: ../geniuspaste/src/geniuspaste.c:451 +msgid "Enter the author name:" +msgstr "Inserisci nome autore:" + +#: ../geniuspaste/src/geniuspaste.c:466 +msgid "Show your paste in a new browser tab" +msgstr "Visualizza i tuoi appunti in un nuovo tab del browser" + +#: ../geniuspaste/src/geniuspaste.c:488 +msgid "_Paste it!" +msgstr "_Incollalo!" + +#: ../gproject/src/gproject-main.c:36 ../gproject/src/gproject-project.c:455 +msgid "GProject" +msgstr "GProject" + +#: ../gproject/src/gproject-main.c:37 +msgid "Glob-pattern-based project management plugin for Geany." +msgstr "Plugin per la gestione del progetto Glob-pattern-based in Geany." + +#: ../gproject/src/gproject-menu.c:353 +msgid "Find in Project Files" +msgstr "Cerca nei file del progetto" + +#: ../gproject/src/gproject-menu.c:359 +msgid "Find in project files" +msgstr "Cerca nei file del progetto" + +#: ../gproject/src/gproject-menu.c:363 +msgid "Find Project File" +msgstr "Cerca file progetto" + +#: ../gproject/src/gproject-menu.c:369 +msgid "Find project file" +msgstr "Cerca file progetto" + +#: ../gproject/src/gproject-menu.c:371 +msgid "Swap Intestazione/Sorgente" +msgstr "Scambia Intestazione/Sorgente" + +#: ../gproject/src/gproject-menu.c:376 +msgid "Swap intestazione/sorgente" +msgstr "Scambia intestazione/sorgente" + +#: ../gproject/src/gproject-menu.c:382 +msgid "Open Selected File (gproject)" +msgstr "Open file selezionato (gproject)" + +#: ../gproject/src/gproject-project.c:406 +msgid "Source patterns:" +msgstr "Patterns sorgente:" + +#: ../gproject/src/gproject-project.c:412 +msgid "" +"Space separated list of patterns that are used to identify source files." +msgstr "" +"Lista separata da spazi dei patterns che saranno usati per identificare " +"i file sorgenti." + +#: ../gproject/src/gproject-project.c:417 +msgid "Header patterns:" +msgstr "Intestazione patterns:" + +#: ../gproject/src/gproject-project.c:423 +msgid "" +"Space separated list of patterns that are used to identify headers. Used " +"mainly for header/source swapping." +msgstr "" +"Lista separata da spazi dei patterns che saranno usati per identificare " +"i file intestazione. Usato principalmente per scambiare intestazione/sorgente" + +#: ../gproject/src/gproject-project.c:429 +msgid "Ignored dirs patterns:" +msgstr "Ignora patters directory:" + +#: ../gproject/src/gproject-project.c:435 +msgid "" +"Space separated list of patterns that are used to identify directories that " +"are not scanned for source files." +msgstr "" +"Lista separata da spazi dei patterns che saranno usati per identificare " +"le directory che non saranno scansione per file sorgenti." + +#: ../gproject/src/gproject-project.c:443 +msgid "Generate tags for all project files" +msgstr "Genera tags per tutti i file del progetto" + +#: ../gproject/src/gproject-project.c:445 +msgid "" +"Generate tag list for all project files instead of only for the currently " +"opened files. Too slow for big projects (>1000 files) and should be disabled " +"in this case." +msgstr "" +"Genera lista tag per tutti i file del progetto al posto dei soli file " +"correttamente aperti. Troppo lento per grandi progetti (>1000 files) e " +"dovrebbe essere disabilitato in questo caso." + +#: ../gproject/src/gproject-project.c:451 +msgid "" +"Note: set the patterns of files belonging to the project under the Project " +"tab." +msgstr "" +"Nota: impostare i patterns dei file che appartengono al progetto sotto il " +"tab Progetto" + +#: ../gproject/src/gproject-sidebar.c:82 +#: ../gproject/src/gproject-sidebar.c:817 +msgid "Find File" +msgstr "Cerca file" + +#: ../gproject/src/gproject-sidebar.c:109 +msgid "Search inside:" +msgstr "Cerca all'interno:" + +#: ../gproject/src/gproject-sidebar.c:121 +msgid "C_ase sensitive" +msgstr "C_ase sensitive" + +#: ../gproject/src/gproject-sidebar.c:124 +msgid "Search in full path" +msgstr "Cerca nel percorso completo" + +#: ../gproject/src/gproject-sidebar.c:727 +msgid "Reload all" +msgstr "Ricarica tutto" + +#: ../gproject/src/gproject-sidebar.c:736 +#: ../treebrowser/src/treebrowser.c:1281 +msgid "Expand all" +msgstr "Espandi tutto" + +#: ../gproject/src/gproject-sidebar.c:742 +#: ../treebrowser/src/treebrowser.c:1285 +msgid "Collapse all" +msgstr "Collassa tutto" + +#: ../gproject/src/gproject-sidebar.c:751 +msgid "Follow active editor" +msgstr "Segui l'editor attivo" + +#: ../gproject/src/gproject-sidebar.c:799 +msgid "Expand All" +msgstr "Espandi tutto" + +#: ../gproject/src/gproject-sidebar.c:808 +msgid "Find in Files" +msgstr "Cerca nei files" + +#. POSITION OF VIEW +#: ../markdown/src/conf.c:567 +msgid "Position:" +msgstr "Positione:" + +#: ../markdown/src/conf.c:573 +msgid "Sidebar" +msgstr "Barra laterale" + +#: ../markdown/src/conf.c:581 +msgid "Message Window" +msgstr "Finestra messaggi" + +#: ../markdown/src/conf.c:595 +msgid "Font:" +msgstr "Font:" + +#: ../markdown/src/conf.c:612 +msgid "Code Font:" +msgstr "Font codice:" + +#: ../markdown/src/conf.c:629 +msgid "BG Color:" +msgstr "Colore sfondo:" + +#: ../markdown/src/conf.c:645 +msgid "FG Color:" +msgstr "Colore font:" + +#: ../markdown/src/conf.c:663 +msgid "Select Template File" +msgstr "Seleziona file template" + +#: ../markdown/src/plugin.c:35 +msgid "Real-time Markdown preview" +msgstr "Anteprima real-time Markdown" + +#: ../markdown/src/plugin.c:51 +msgid "Markdown Preview" +msgstr "Anteprima Markdown" + +#: ../markdown/src/plugin.c:162 +msgid "The current document does not have a Markdown filetype." +msgstr "Il documento corrente non ha un tipo di file Markdown." + +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:35 +msgid "Pair Tag Highlighter" +msgstr "Coppia tag Highlighter" + +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:36 +msgid "Finds and highlights matching opening/closing HTML tag" +msgstr "Cerca e evidenzia corrispondenza apertura/chiusura tag HTML" + +#: ../pohelper/data/menus.ui.h:1 +msgid "_Translation Helper" +msgstr "Aiuto _Traduzione" + +#: ../pohelper/data/menus.ui.h:2 +msgid "_Previous String" +msgstr "Stringa _Precedente" + +#: ../pohelper/data/menus.ui.h:3 ../pohelper/src/gph-plugin.c:1031 +msgid "Go to previous string" +msgstr "Vai alla stringa precedente" + +#: ../pohelper/data/menus.ui.h:4 +msgid "_Next String" +msgstr "Stringa _Successiva" + +#: ../pohelper/data/menus.ui.h:5 ../pohelper/src/gph-plugin.c:1034 +msgid "Go to next string" +msgstr "Vai a stringa successiva" + +#: ../pohelper/data/menus.ui.h:6 +msgid "Pre_vious Untranslated" +msgstr "Traduzione mancante p_rec." + +#: ../pohelper/data/menus.ui.h:7 ../pohelper/src/gph-plugin.c:1037 +msgid "Go to previous untranslated string" +msgstr "Vai alla traduzione mancante precedente" + +#: ../pohelper/data/menus.ui.h:8 +msgid "Next _Untranslated" +msgstr "Traduzione mancante s_ucc." + +#: ../pohelper/data/menus.ui.h:9 ../pohelper/src/gph-plugin.c:1040 +msgid "Go to next untranslated string" +msgstr "Vai alla traduzione mancante successiva" + +#: ../pohelper/data/menus.ui.h:10 +msgid "Previous Fu_zzy" +msgstr "Fu_zzy precedente" + +#: ../pohelper/data/menus.ui.h:11 ../pohelper/src/gph-plugin.c:1043 +msgid "Go to previous fuzzily translated string" +msgstr "Vai alla precedente stringa 'fuzzy'" + +#: ../pohelper/data/menus.ui.h:12 +msgid "Next _Fuzzy" +msgstr "_Fuzzy successiva" + +#: ../pohelper/data/menus.ui.h:13 ../pohelper/src/gph-plugin.c:1046 +msgid "Go to next fuzzily translated string" +msgstr "Vai alla successiva stringa 'fuzzy'" + +#: ../pohelper/data/menus.ui.h:14 +msgid "Previous Untranslated or Fuzz_y" +msgstr "Non tradotta o Fuzz_y precedente" + +#: ../pohelper/data/menus.ui.h:15 ../pohelper/src/gph-plugin.c:1049 +msgid "Go to previous untranslated or fuzzy string" +msgstr "Vai alla precedente stringa non tradotta o 'fuzzy'" + +#: ../pohelper/data/menus.ui.h:16 +msgid "Next Untranslated _or Fuzzy" +msgstr "Non tradotta o Fuzz_y successiva" + +#: ../pohelper/data/menus.ui.h:17 ../pohelper/src/gph-plugin.c:1053 +msgid "Go to next untranslated or fuzzy string" +msgstr "Vai alla successiva stringa non tradotta o 'fuzzy'" + +#: ../pohelper/data/menus.ui.h:18 ../pohelper/src/gph-plugin.c:1064 +msgid "Toggle current translation fuzziness" +msgstr "Dis-/Attiva 'fuzzy' per la traduzione corrente" + +#: ../pohelper/data/menus.ui.h:19 +msgid "_Toggle Fuzziness" +msgstr "Dis-/A_ttiva 'fuzzy'" + +#: ../pohelper/data/menus.ui.h:20 +msgid "Paste _Message as Translation" +msgstr "Incolla _Messaggio come Traduzione" + +#: ../pohelper/data/menus.ui.h:21 +msgid "Paste the original untranslated string to the translation" +msgstr "Incolla la stringa non tradotta originale come traduzione " + +#: ../pohelper/data/menus.ui.h:22 ../pohelper/src/gph-plugin.c:1061 +msgid "Reflow the current translation string" +msgstr "Riordina la stringa di traduzione corrente" + +#: ../pohelper/data/menus.ui.h:23 +msgid "_Reflow Translation" +msgstr "_Riordina traduzione" + +#: ../pohelper/data/menus.ui.h:24 +msgid "" +"Whether to update the translation headers (author, revision date, ...) upon " +"file save" +msgstr "" +"Aggiorna le intestazioni della traduzione (autore, revision, data, ...) " +"quando il file viene salvato" + +#: ../pohelper/data/menus.ui.h:25 +msgid "Update _Headers Upon Save" +msgstr "Aggiorna _Intestazione quando salvi" + +#: ../pohelper/src/gph-plugin.c:41 +msgid "Translation Helper" +msgstr "Translation Helper" + +#: ../pohelper/src/gph-plugin.c:42 +msgid "Improves support for GetText translation files." +msgstr "Aggiunge supporto per la traduzione dei file GetText." + +#: ../pohelper/src/gph-plugin.c:1057 +msgid "Paste original untranslated string to translation" +msgstr "Incolla stringa non tradotta originale alla traduzione" + +#: ../pohelper/src/gph-plugin.c:1099 +#, c-format +msgid "Failed to load configuration file: %s" +msgstr "Impossibile caricare file di configurazione: %s" + +#: ../pohelper/src/gph-plugin.c:1124 +#, c-format +msgid "Failed to create configuration directory \"%s\": %s" +msgstr "Impossibile create directory di configurazione \"%s\": %s" + +#: ../pohelper/src/gph-plugin.c:1127 +#, c-format +msgid "Failed to save configuration file: %s" +msgstr "Impossibile salvare file di configurazione: %s" + +#: ../pohelper/src/gph-plugin.c:1182 +#, c-format +msgid "" +"Failed to load UI definition, please check your installation. The error was: " +"%s" +msgstr "" +"Impossibile caricare definizioni UI, si prega di controllare l'installazione. " +"Messaggio di errore: %s" + +#: ../pohelper/src/gph-plugin.c:1222 +#, c-format +msgid "" +"Cannot find widget \"%s\" in the UI definition, please check your " +"installation." +msgstr "" +"Impossibile trovare il widge t\"%s\" nella definizione delle UI, si prega " +"di controllare l'installazione." + +#: ../pretty-printer/src/PluginEntry.c:37 +msgid "XML PrettyPrinter" +msgstr "XML PrettyPrinter" + +#: ../pretty-printer/src/PluginEntry.c:38 +msgid "Formats an XML and makes it human-readable." +msgstr "Formatta XML e rendilo 'umanamente' leggibile" + +#. put the menu into the Tools +#: ../pretty-printer/src/PluginEntry.c:66 +msgid "PrettyPrinter XML" +msgstr "PrettyPrinter XML" + +#: ../pretty-printer/src/PluginEntry.c:74 +msgid "Run the PrettyPrinter XML" +msgstr "Esegui PrettyPrinter XML" + +#: ../pretty-printer/src/PluginEntry.c:148 +msgid "Unable to parse the content as XML." +msgstr "Impossibile effettuare parse del contenuto come XML" + +#: ../pretty-printer/src/PluginEntry.c:159 +msgid "" +"Unable to process PrettyPrinting on the specified XML because some features " +"are not supported.\n" +"\n" +"See Help > Debug messages for more details..." +msgstr "" +"Impossible precessare PrettyPrinting sull'XML specificato perchè alcune " +"funzioni non sono supportate.\n" +"\n" +"Vedi Aiuto > Messaggi di debug per dettagli..." + +#: ../pretty-printer/src/ConfigUI.c:73 +msgid "Comments" +msgstr "Commenti" + +#: ../pretty-printer/src/ConfigUI.c:73 ../pretty-printer/src/ConfigUI.c:74 +#: ../pretty-printer/src/ConfigUI.c:75 +msgid "Put on one line" +msgstr "Metti in una riga" + +#: ../pretty-printer/src/ConfigUI.c:73 ../pretty-printer/src/ConfigUI.c:74 +#: ../pretty-printer/src/ConfigUI.c:75 +msgid "Inline if possible" +msgstr "In riga se possibile" + +#: ../pretty-printer/src/ConfigUI.c:73 ../pretty-printer/src/ConfigUI.c:74 +#: ../pretty-printer/src/ConfigUI.c:75 +msgid "Alignment" +msgstr "Allineamneto" + +#: ../pretty-printer/src/ConfigUI.c:74 +msgid "Text nodes" +msgstr "Nodi di testo" + +#: ../pretty-printer/src/ConfigUI.c:75 +msgid "CDATA" +msgstr "CDATA" + +#: ../pretty-printer/src/ConfigUI.c:205 +msgid "Empty nodes" +msgstr "Nodi vuoti" + +#: ../pretty-printer/src/ConfigUI.c:206 +msgid "Concatenation ( to )" +msgstr "Concatenazione (da a )" + +#: ../pretty-printer/src/ConfigUI.c:207 +msgid "Spacing ( to )" +msgstr "Spaziatura (da a )" + +#: ../pretty-printer/src/ConfigUI.c:208 +msgid "Expansion ( to )" +msgstr "Espansione (da a )" + +#: ../pretty-printer/src/ConfigUI.c:235 +msgid "Indentation" +msgstr "Indentazione" + +#: ../pretty-printer/src/ConfigUI.c:240 +msgid "Space" +msgstr "Spazio" + +#: ../pretty-printer/src/ConfigUI.c:264 +msgid "Line break" +msgstr "Interruzione di riga" + +#: ../scope/data/scope.glade.h:1 +msgid "Debu_g" +msgstr "Debu_g" + +#: ../scope/data/scope.glade.h:2 +msgid "_Setup Program" +msgstr "Programma di In_stallazione" + +#: ../scope/data/scope.glade.h:3 +msgid "Recent _Programs" +msgstr "_Programmi recenti" + +#: ../scope/data/scope.glade.h:4 +msgid "_Run/Continue" +msgstr "_Esegui/Continua" + +#: ../scope/data/scope.glade.h:5 +msgid "Run to _Cursor" +msgstr "Esegui al _Cursore" + +#: ../scope/data/scope.glade.h:6 +#, fuzzy +msgid "Run to _Source" +msgstr "Esegui alla _Sorgente" + +#: ../scope/data/scope.glade.h:7 +msgid "Step _Into" +msgstr "Entra (step _into)" + +#: ../scope/data/scope.glade.h:8 +msgid "Step _Over" +msgstr "Scavalca (step _over)" + +#: ../scope/data/scope.glade.h:9 +msgid "Step O_ut" +msgstr "Esci (step o_ut)" + +#: ../scope/data/scope.glade.h:10 +msgid "_Terminate" +msgstr "_Termina" + +#: ../scope/data/scope.glade.h:11 +msgid "Toggle _Breakpoint" +msgstr "Attiva/Disattiva _Breakpoint" + +#: ../scope/data/scope.glade.h:12 +msgid "_GDB Command" +msgstr "Comando _GDB" + +#: ../scope/data/scope.glade.h:13 +msgid "_More" +msgstr "_Altro" + +#: ../scope/data/scope.glade.h:14 +msgid "_Show Terminal" +msgstr "_Visualizza terminale" + +#: ../scope/data/scope.glade.h:15 +msgid "_Reset Markers" +msgstr "_Reimposta marcatori" + +#: ../scope/data/scope.glade.h:16 +msgid "_Cleanup Files" +msgstr "_Pulisci files" + +#: ../scope/data/scope.glade.h:17 +msgid "_Feed" +msgstr "_Feed" + +#: ../scope/data/scope.glade.h:18 +msgid "_Window" +msgstr "_Finestra" + +#: ../scope/data/scope.glade.h:19 +msgid "_Auto Show" +msgstr "Mostra _Automaticamente" + +#: ../scope/data/scope.glade.h:20 +msgid "Auto _Hide" +msgstr "_Nascondi Automaticamente" + +#: ../scope/data/scope.glade.h:21 +msgid "Show on _Error" +msgstr "Visualizza se _Errore" + +#: ../scope/data/scope.glade.h:22 +msgid "_Unsorted" +msgstr "_Non ordinati" + +#: ../scope/data/scope.glade.h:23 +msgid "_View Source" +msgstr "_Visualizza sorgente" + +#: ../scope/data/scope.glade.h:24 +msgid "S_ynchronize" +msgstr "S_incronizza" + +#: ../scope/data/scope.glade.h:25 +msgid "_Interrupt" +msgstr "_Interrompi" + +#: ../scope/data/scope.glade.h:26 +msgid "_Send Signal" +msgstr "Invia _segnale" + +#: ../scope/data/scope.glade.h:27 +#, fuzzy +msgid "S_elect on" +msgstr "S_elezionate da" + +#: ../scope/data/scope.glade.h:28 +msgid "_Running" +msgstr "_Esecuzione" + +#: ../scope/data/scope.glade.h:29 +msgid "_Stopped" +msgstr "_Fermato" + +#: ../scope/data/scope.glade.h:30 +msgid "_Exited" +msgstr "_Terminato" + +#: ../scope/data/scope.glade.h:31 +msgid "_Follow" +msgstr "_Segui" + +#: ../scope/data/scope.glade.h:32 +msgid "_Columns" +msgstr "_Colonne" + +#: ../scope/data/scope.glade.h:33 +msgid "Show _Group" +msgstr "Visuliazza _Gruppo" + +#: ../scope/data/scope.glade.h:34 +msgid "Show _Core" +msgstr "Visualizza _Core" + +#: ../scope/data/scope.glade.h:35 +msgid "Add _Break" +msgstr "Aggiungi _Break" + +#: ../scope/data/scope.glade.h:36 +msgid "Add _Watch" +msgstr "Aggiunge _Vista" + +#: ../scope/data/scope.glade.h:37 +msgid "Apply on _Run" +msgstr "Applica quando _Esegui" + +#: ../scope/data/scope.glade.h:38 +msgid "_Show @entry" +msgstr "_Visualizza @entry" + +#: ../scope/data/scope.glade.h:39 +msgid "Show _Address" +msgstr "Visualizz_a Indirizzo" + +#: ../scope/data/scope.glade.h:40 +msgid "_Modify" +msgstr "_Modifica" + +#: ../scope/data/scope.glade.h:41 +msgid "_Watch" +msgstr "_Vista" + +#: ../scope/data/scope.glade.h:42 +msgid "_Inspect" +msgstr "_Ispeziona" + +#: ../scope/data/scope.glade.h:43 +msgid "_8-bit mode" +msgstr "Modalità _8-bit" + +#: ../scope/data/scope.glade.h:44 +msgid "_Default" +msgstr "_Default" + +#: ../scope/data/scope.glade.h:45 +msgid "_7 bit" +msgstr "_7 bit" + +#: ../scope/data/scope.glade.h:46 +msgid "_Locale" +msgstr "_Locale" + +#: ../scope/data/scope.glade.h:47 +msgid "_UTF-8" +msgstr "_UTF-8" + +#: ../scope/data/scope.glade.h:48 +msgid "_Show .names" +msgstr "Vi_sualizza .names" + +#: ../scope/data/scope.glade.h:49 +msgid "R_ead" +msgstr "L_eggi" + +#: ../scope/data/scope.glade.h:50 +msgid "_Group by" +msgstr "Ra_ggruppa per" + +#: ../scope/data/scope.glade.h:51 +msgid "_1" +msgstr "_1" + +#: ../scope/data/scope.glade.h:52 +msgid "_2" +msgstr "_2" + +#: ../scope/data/scope.glade.h:53 +msgid "_4" +msgstr "_" + +#: ../scope/data/scope.glade.h:54 +msgid "_8" +msgstr "_" + +#: ../scope/data/scope.glade.h:55 +msgid "_Jump To" +msgstr "Sal_ta a" + +#: ../scope/data/scope.glade.h:56 +msgid "_Apply" +msgstr "_Applica" + +#: ../scope/data/scope.glade.h:57 +msgid "_Expand" +msgstr "_Espandi" + +#: ../scope/data/scope.glade.h:59 +msgid "_Natural" +msgstr "_Naturale" + +#: ../scope/data/scope.glade.h:60 +msgid "_Decimal" +msgstr "_Decimale" + +#: ../scope/data/scope.glade.h:61 +msgid "_Hex" +msgstr "_Esadecimale" + +#: ../scope/data/scope.glade.h:62 +msgid "_Octal" +msgstr "_Ottale" + +#: ../scope/data/scope.glade.h:63 +msgid "_Binary" +msgstr "_Binario" + +#: ../scope/data/scope.glade.h:64 +msgid "_Raw" +msgstr "_Raw" + +#: ../scope/data/scope.glade.h:65 +msgid "_Evaluate/Modify" +msgstr "_Valuta/Modifica" + +#: ../scope/data/scope.glade.h:66 +msgid "_Watch Expression" +msgstr "Espressione _Watch" + +#: ../scope/data/scope.glade.h:67 +msgid "_Inspect Variable" +msgstr "_Ispeziona variabile" + +#: ../scope/data/scope.glade.h:68 +msgid "Threads" +msgstr "Threads" + +#: ../scope/data/scope.glade.h:69 +msgid "Stack" +msgstr "Stack" + +#: ../scope/data/scope.glade.h:70 +msgid "Locals" +msgstr "Locals" + +#: ../scope/data/scope.glade.h:71 +msgid "Watches" +msgstr "Watches" + +#: ../scope/data/scope.glade.h:72 +msgid "Memory" +msgstr "Memoria" + +#: ../scope/data/scope.glade.h:73 +msgid "Enter gdb command:" +msgstr "Inserisci comando gdb:" + +#: ../scope/data/scope.glade.h:74 +msgid "Convert _UTF-8 to locale" +msgstr "Converti _UTF-8 a locale" + +#: ../scope/data/scope.glade.h:75 +msgid "_Thread" +msgstr "_Thread" + +#: ../scope/data/scope.glade.h:76 +msgid "_Group" +msgstr "_Gruppo" + +#: ../scope/data/scope.glade.h:77 +msgid "_Frame" +msgstr "_Frame" + +#: ../scope/data/scope.glade.h:78 +msgid "Setup Program" +msgstr "Programma installazione" + +#: ../scope/data/scope.glade.h:79 +msgid "_Executable:" +msgstr "_Eseguibile:" + +#: ../scope/data/scope.glade.h:80 +msgid "_Arguments:" +msgstr "_Argomenti:" + +#: ../scope/data/scope.glade.h:81 +msgid "En_vironment:" +msgstr "Am_biente" + +#: ../scope/data/scope.glade.h:82 +msgid "_Working dir:" +msgstr "Directory di la_voro:" + +#: ../scope/data/scope.glade.h:83 +msgid "_Load script:" +msgstr "Script _Caricamento:" + +#: ../scope/data/scope.glade.h:84 +msgid "Auto _run program/exit gdb" +msgstr "Auto _esegui programma/esci gdb" + +#: ../scope/data/scope.glade.h:85 +msgid "_Non-stop mode" +msgstr "Modalità _non-stop" + +#: ../scope/data/scope.glade.h:86 +msgid "_Temporary breakpoint on load at:" +msgstr "Breakpoint _temporaneo all'avvio a:" + +#: ../scope/data/scope.glade.h:87 +msgid "_Delete all breakpoints, watches, inspects and registers" +msgstr "_Elimina tutti i breakpoint, viste, ispezioni e registri" + +#: ../scope/data/scope.glade.h:88 ../scope/src/scope.c:522 +msgid "Program" +msgstr "Programma" + +#: ../scope/data/scope.glade.h:89 +msgid "Open on" +msgstr "Apri su" + +#: ../scope/data/scope.glade.h:90 +msgid "g_db load" +msgstr "carica g_db" + +#: ../scope/data/scope.glade.h:91 +msgid "p_rogram start" +msgstr "avvio p_rogramma" + +#: ../scope/data/scope.glade.h:92 +msgid "Update all _views" +msgstr "Aggiorna tutte le _viste" + +#: ../scope/data/scope.glade.h:93 +msgid "Panel" +msgstr "Pannello" + +#: ../scope/data/scope.glade.h:94 +msgid "Default 8-bit text mode:" +msgstr "Modalità testo default 8-bit:" + +#: ../scope/data/scope.glade.h:95 +msgid "_7-bit \\nnn" +msgstr "_7-bit \\nnn" + +#: ../scope/data/scope.glade.h:96 +msgid "Display" +msgstr "Display" + +#: ../scope/data/scope.glade.h:97 +msgid "_member" +msgstr "_membro" + +#: ../scope/data/scope.glade.h:98 +msgid "and" +msgstr "e" + +#: ../scope/data/scope.glade.h:99 +msgid "_argument" +msgstr "_argomento" + +#: ../scope/data/scope.glade.h:100 +msgid "names" +msgstr "_nomi" + +#: ../scope/data/scope.glade.h:101 +msgid "Values" +msgstr "Valori" + +#: ../scope/data/scope.glade.h:102 +msgid "E_xpand on apply" +msgstr "E_spandi quando applichi" + +#: ../scope/data/scope.glade.h:103 +msgid "S_how" +msgstr "_Visualizza" + +#: ../scope/data/scope.glade.h:104 +msgid "children" +msgstr "figlio" + +#: ../scope/data/scope.glade.h:105 +msgid "Inspect" +msgstr "Inspeziona" + +#: ../scope/data/scope.glade.h:106 +msgid "Show =li_brary messages" +msgstr "Visualizza messaggi =li_brary" + +#: ../scope/data/scope.glade.h:107 +msgid "Show _tooltips" +msgstr "Visualizza suggerimen_ti" + +#: ../scope/data/scope.glade.h:108 +msgid "Others" +msgstr "Altri" + +#: ../scope/data/scope.glade.h:109 +msgid "Options" +msgstr "Opzioni" + +#: ../scope/data/scope.glade.h:110 +msgid "_Import" +msgstr "_Importa" + +#: ../scope/data/scope.glade.h:111 +msgid "Enter assignment expression:" +msgstr "Inserisci espressione di assegnamento:" + +#: ../scope/data/scope.glade.h:112 +msgid "Inspect" +msgstr "Ispeziona" + +#: ../scope/data/scope.glade.h:113 +msgid "Object:" +msgstr "Oggetto:" + +#: ../scope/data/scope.glade.h:115 +msgid "-" +msgstr "-" + +#: ../scope/data/scope.glade.h:116 +msgid "Frame:" +msgstr "Frame:" + +#: ../scope/data/scope.glade.h:117 +msgid "@" +msgstr "@" + +#: ../scope/data/scope.glade.h:118 +msgid "_Apply on run" +msgstr "_Applica quando esegui" + +#: ../scope/data/scope.glade.h:119 +msgid "Expand" +msgstr "Espandi" + +#: ../scope/data/scope.glade.h:120 +msgid "Start:" +msgstr "Avvio:" + +#: ../scope/data/scope.glade.h:121 +msgid "Count:" +msgstr "Conteggio:" + +#: ../scope/data/scope.glade.h:122 +msgid "_Expand on apply" +msgstr "_Espandi quando applichi" + +#: ../scope/data/scope.glade.h:123 ../scope/src/scope.c:522 +msgid "Program Terminal" +msgstr "Terminale programma" + +#: ../scope/data/scope.glade.h:125 +msgid "Registers" +msgstr "Registri" + +#: ../scope/src/break.c:97 +msgid "breakpoint" +msgstr "breakpoint" + +#: ../scope/src/break.c:98 +msgid "hardware breakpoint" +msgstr "hardware breakpoint" + +#: ../scope/src/break.c:99 +msgid "tracepoint" +msgstr "tracepoint" + +#: ../scope/src/break.c:100 +msgid "fast tracepoint" +msgstr "tracepoint veloce" + +#: ../scope/src/break.c:101 +msgid "write watchpoint" +msgstr "watchpoint scrittura" + +#: ../scope/src/break.c:104 +msgid "access watchpoint" +msgstr "watchpoint accesso" + +#: ../scope/src/break.c:106 +msgid "read watchpoint" +msgstr "watchpoint lettura" + +#: ../scope/src/break.c:108 +msgid "catchpoint" +msgstr "catchpoint" + +#: ../scope/src/break.c:135 ../scope/src/break.c:139 +msgid "CLI" +msgstr "CLI" + +#: ../scope/src/break.c:136 +msgid "unsupported MI" +msgstr "MI non supportato" + +#: ../scope/src/break.c:141 +msgid "on load" +msgstr "all'avvio" + +#: ../scope/src/break.c:142 +msgid "Run to Cursor" +msgstr "Esegui al cursore" + +#: ../scope/src/break.c:1013 +#, c-format +msgid "" +"There are two or more breakpoints at %s:%d.\n" +"\n" +"Use the breakpoint list to remove the exact one." +msgstr "" +"Ci sono due o più breakpoint a %s:%d.\n" +"\n" +"Usare la lista breakpoint per rimuoverne uno." + +#: ../scope/src/break.c:1252 +#, c-format +msgid ", %s" +msgstr ", %s" + +#: ../scope/src/break.c:1278 +#, c-format +msgid "func %s" +msgstr "func %s" + +#: ../scope/src/break.c:1309 +msgid "Add Breakpoint" +msgstr "Aggiungi Breakpoint" + +#: ../scope/src/break.c:1324 +msgid "Add Watchpoint" +msgstr "Aggiungi Watchpoint" + +#: ../scope/src/conterm.c:106 +msgid "Feed Terminal" +msgstr "Terminale Feed" + +#: ../scope/src/conterm.c:106 +msgid "Enter char # (0..255):" +msgstr "Inserisci carattere # (0..255):" + +#: ../scope/src/conterm.c:509 ../scope/src/scope.c:550 +#: ../scope/src/scope.c:551 +#, c-format +msgid "Scope: %s." +msgstr "Ambito: %s" + +#: ../scope/src/debug.c:115 ../scope/src/debug.c:120 ../scope/src/utils.c:37 +#, c-format +msgid "%s: %s." +msgstr "%s: %s." + +#: ../scope/src/debug.c:363 +#, c-format +msgid "GDB died unexpectedly with status %d." +msgstr "GDB si è chiudo inaspettatamente con status %d." + +#: ../scope/src/debug.c:365 +msgid "Program terminated." +msgstr "Programma terminato." + +#: ../scope/src/debug.c:469 +msgid "No breakpoints. Hanging." +msgstr "Nessun breakpoint. Sospeso." + +#: ../scope/src/debug.c:598 ../scope/src/thread.c:92 +#, c-format +msgid "%s." +msgstr "%s." + +#: ../scope/src/inspect.c:66 +msgid "..." +msgstr "..." + +#: ../scope/src/inspect.c:339 +msgid "invalid data" +msgstr "dati invalidi" + +#: ../scope/src/inspect.c:371 +msgid "no children in range" +msgstr "nessun figlio nel range" + +#: ../scope/src/inspect.c:454 +msgid "out of scope" +msgstr "fuori dallo scope" + +#: ../scope/src/inspect.c:627 +msgid "Duplicate inspect variable name." +msgstr "Nome variabile ispezione duplicato." + +#: ../scope/src/memory.c:292 +msgid "Read Memory" +msgstr "Leggi memoria" + +#: ../scope/src/memory.c:396 +#, c-format +msgid "Scope: pointer size > %d, Data disabled." +msgstr "Ambito: dimensione puntatore > %d, dati disabilitati." + +#: ../scope/src/menu.c:375 +msgid "Modify" +msgstr "Modifica" + +#: ../scope/src/menu.c:481 +msgid "Evaluate/modify" +msgstr "Valuta/Modifica" + +#: ../scope/src/menu.c:482 +msgid "Watch expression" +msgstr "Controlla espressione" + +#: ../scope/src/menu.c:483 +msgid "Inspect variable" +msgstr "Ispeziona variabile" + +#: ../scope/src/parse.c:437 +msgid "Undefined GDB error." +msgstr "Errore GDB non definito." + +#: ../scope/src/plugme.c:81 +msgid "Select Folder" +msgstr "Seleziona Cartella" + +#: ../scope/src/plugme.c:81 +msgid "Select File" +msgstr "Seleziona File" + +#: ../scope/src/prefs.c:294 ../scope/src/utils.c:438 +#, c-format +msgid "Scope: %s: %s." +msgstr "Scope: %s: %s." + +#: ../scope/src/prefs.c:299 +msgid "Scope: created configuration file." +msgstr "Scope: creato file di configurazione." + +#: ../scope/src/program.c:251 +#, c-format +msgid "Loaded debug settings for %s." +msgstr "Caricate impostazioni debug per %s." + +#: ../scope/src/program.c:259 +#, c-format +msgid "Could not load debug settings file %s: %s." +msgstr "Impossibile caricare file di impostazione debug per %s:%s." + +#: ../scope/src/program.c:379 +#, c-format +msgid "" +"%s: %s.\n" +"\n" +"Continue?" +msgstr "" +"%s: %s.\n" +"\n" +"Continuare?" + +#: ../scope/src/program.c:415 +msgid "Delete all breakpoints, watches et cetera?" +msgstr "Eliminare tutti i breakpoint, viste, eccetera?" + +#: ../scope/src/program.c:523 +msgid "as _Name=value" +msgstr "come _Nome=valore" + +#: ../scope/src/program.c:524 +msgid "as _Name = value" +msgstr "come _Nome = valore" + +#: ../scope/src/scope.c:34 +msgid "Scope Debugger" +msgstr "Scope Debugger" + +#: ../scope/src/scope.c:35 +msgid "Relatively simple GDB front-end." +msgstr "Interfaccia relativamente semplice per GDB" + +#: ../scope/src/scope.c:62 +msgid "Setup program" +msgstr "Programma installazione" + +#: ../scope/src/scope.c:63 +msgid "Run/continue" +msgstr "Esegui/Continua" + +#: ../scope/src/scope.c:65 +msgid "Run to source" +msgstr "Esegui alla sorgente" + +#: ../scope/src/scope.c:69 +msgid "Terminate" +msgstr "Terminale" + +#: ../scope/src/scope.c:70 +msgid "Toggle breakpoint" +msgstr "Attiva/Disattiva breakpoint" + +#: ../scope/src/scope.c:72 ../scope/src/scope.c:75 +msgid "GDB command" +msgstr "Comando GDB" + +#: ../scope/src/scope.c:73 +msgid "Show terminal" +msgstr "Visualizza terminale" + +#: ../scope/src/scope.c:226 +msgid "Busy" +msgstr "Occupato" + +#: ../scope/src/scope.c:226 +msgid "Ready" +msgstr "Pronto" + +#: ../scope/src/scope.c:227 +msgid "Hang" +msgstr "Sospeso" + +#: ../scope/src/scope.c:227 +#, fuzzy +msgid "Assem" +msgstr "Assem" + +#: ../scope/src/scope.c:227 +msgid "Load" +msgstr "Carica" + +#: ../scope/src/scope.c:421 +msgid "Build action activated. Terminate debugging?" +msgstr "Generazione richiesta. Terminare debug?" + +#: ../scope/src/scope.c:524 +msgid "Breaks" +msgstr "Breaks" + +#: ../scope/src/scope.c:526 +msgid "Console" +msgstr "Console" + +#: ../scope/src/scope.c:526 +msgid "Debug Console" +msgstr "Console di Debug" + +#: ../scope/src/thread.c:48 +#, c-format +msgid "Thread group %s started." +msgstr "Thread gruppo %s avviato." + +#: ../scope/src/thread.c:63 +msgid "Thread group " +msgstr "Gruppo thread " + +#: ../scope/src/thread.c:83 +msgid " exited" +msgstr " uscito" + +#: ../scope/src/thread.c:86 +#, c-format +msgid " with exit code %s" +msgstr " con codice %s" + +#: ../scope/src/thread.c:748 +msgid "Send Signal" +msgstr "Invia segnale" + +#: ../scope/src/thread.c:748 +msgid "Enter signal #:" +msgstr "Inserisci segnale #:" + +#: ../scope/src/thread.c:788 +msgid "Terminate Process" +msgstr "Termina processo" + +#: ../scope/src/thread.c:788 +msgid "Enter exit code:" +msgstr "Inserisci codice uscita:" + +#: ../scope/src/thread.c:891 +msgid "Running" +msgstr "Esecuzione" + +#: ../scope/src/thread.c:892 +msgid "Stopped" +msgstr "Fermo" + +#: ../scope/src/utils.c:45 +#, c-format +msgid "%s: %s" +msgstr "%s:%s" + +#: ../scope/src/utils.c:225 +#, c-format +msgid "Scope: error reading [%s]." +msgstr "Scope: errore lettura [%s]." + +#: ../scope/src/views.c:526 +msgid "…" +msgstr "…" + +#: ../scope/src/views.c:549 +msgid "_Send" +msgstr "_Invia" + +#: ../scope/src/views.c:549 +msgid "_Busy" +msgstr "_Occupato" + +#: ../scope/src/views.c:558 +msgid "GDB Command" +msgstr "Comando GDB" + +#: ../spellcheck/src/speller.c:180 +msgid "Try: " +msgstr "Prova: " + +#: ../spellcheck/src/speller.c:252 +msgid "Checking" +msgstr "Controllo" + +#: ../spellcheck/src/speller.c:265 +#, c-format +msgid "Checking file \"%s\" (lines %d to %d using %s):" +msgstr "Controllo file \"%s\" (linee %d a %d usando %s):" + +#: ../spellcheck/src/speller.c:275 +#, c-format +msgid "Checking file \"%s\" (using %s):" +msgstr "Checking file \"%s\" (usando %s):" + +#: ../spellcheck/src/speller.c:302 +msgid "The checked text is spelled correctly." +msgstr "Il testo selezionato è scritto correttamente." + +#: ../spellcheck/src/speller.c:312 +#, c-format +msgid "The Enchant library couldn't be initialized (%s)." +msgstr "La libreria Enchant non può essere inizializzata (%s)." + +#: ../spellcheck/src/speller.c:313 +msgid "unknown error (maybe the chosen language is not available)" +msgstr "errore sconosciuto (forse la lingua scelto non è disponible)" + +#: ../spellcheck/src/scplugin.c:47 +msgid "Spell Check" +msgstr "Controllo ortografia" + +#: ../spellcheck/src/scplugin.c:48 +msgid "Checks the spelling of the current document." +msgstr "Controlla l'ortografia del documento corrente." + +#: ../spellcheck/src/scplugin.c:202 +msgid "Run Spell Check" +msgstr "Esegui controllo ortografia" + +#: ../spellcheck/src/scplugin.c:205 +msgid "Toggle Check While Typing" +msgstr "Attiva/Disattiva controllo mentre scrivi" + +#. initialise the dialog +#: ../spellcheck/src/scplugin.c:216 +msgid "Select Directory" +msgstr "Seleziona directory" + +#: ../spellcheck/src/scplugin.c:253 +msgid "Check spelling while typing" +msgstr "Controllo ortografico mentre scrivi" + +#: ../spellcheck/src/scplugin.c:258 +msgid "Show toolbar item to toggle spell checking" +msgstr "Visualizza un'icona nella toolbar per il controllo ortografico" + +#: ../spellcheck/src/scplugin.c:263 +msgid "Show editor menu item to show spelling suggestions" +msgstr "Visualizza elemento nel menu a tendina dell'editor per visualizzare suggerimenti" + +#: ../spellcheck/src/scplugin.c:269 +msgid "Print misspelled words and suggestions in the messages window" +msgstr "Stampa parole errate e suggerimento nella finestra messaggi" + +#: ../spellcheck/src/scplugin.c:273 +msgid "Language to use for the spell check:" +msgstr "Lingua da usare per il controllo ortografia:" + +#: ../spellcheck/src/scplugin.c:287 +msgid "_Directory to look for dictionary files:" +msgstr "_Directory in cui cercare i file del dizionario:" + +#: ../spellcheck/src/scplugin.c:295 +msgid "" +"Read additional dictionary files from this directory. For now, this only " +"works with myspell dictionaries." +msgstr "" +"Visualizza file del dizionario addizione da questa cartella. Per ora questo " +"funziona solo per i dizionari myspell" + +#: ../spellcheck/src/gui.c:76 +msgid "Spell checking while typing is now enabled" +msgstr "Controllo ortografia mentre scrivi è ora attivo" + +#: ../spellcheck/src/gui.c:78 +msgid "Spell checking while typing is now disabled" +msgstr "Controllo ortografia mentre scrivi è ora disattivato" + +#: ../spellcheck/src/gui.c:313 +msgid "" +"Search term is too long to provide\n" +"spelling suggestions in the editor menu." +msgstr "" +"Il termine di ricerca è troppo lungo per\n" +"fornire suggerimenti nel menu editor." + +#: ../spellcheck/src/gui.c:318 +msgid "Perform Spell Check" +msgstr "Esegui contrllo ortografia" + +#: ../spellcheck/src/gui.c:350 +msgid "More..." +msgstr "Altro..." + +#: ../spellcheck/src/gui.c:365 +msgid "(No Suggestions)" +msgstr "(Nessun suggerimento)" + +#: ../spellcheck/src/gui.c:374 +#, c-format +msgid "Add \"%s\" to Dictionary" +msgstr "Aggiungi \"%s\" al dizionario" + +#: ../spellcheck/src/gui.c:381 +msgid "Ignore All" +msgstr "Ignora tutti" + +#: ../spellcheck/src/gui.c:526 +#, c-format +msgid "Default (%s)" +msgstr "Default (%s)" + +#: ../spellcheck/src/gui.c:537 +#, c-format +msgid "Toggle spell check while typing (current language: %s)" +msgstr "Attiva/Disattiva controllo ortografico mentre scrivi (lingua corrente: %s)" + +#: ../spellcheck/src/gui.c:592 +msgid "Spelling Suggestions" +msgstr "Suggerimento ortografici" + +#: ../shiftcolumn/src/shiftcolumn.c:49 +msgid "Shift Column" +msgstr "Sposta Colonna" + +#: ../shiftcolumn/src/shiftcolumn.c:50 +msgid "Shift a selection left and right" +msgstr "Sposta una selezione a sinistra e destra" + +#: ../shiftcolumn/src/shiftcolumn.c:380 ../shiftcolumn/src/shiftcolumn.c:400 +msgid "Shift Left" +msgstr "Sposta a sinistra" + +#: ../shiftcolumn/src/shiftcolumn.c:387 ../shiftcolumn/src/shiftcolumn.c:402 +msgid "Shift Right" +msgstr "Sposta a destra" + +#: ../tableconvert/src/tableconvert.c:34 +msgid "Tableconvert" +msgstr "Convertitore tabella" + +#: ../tableconvert/src/tableconvert.c:35 +msgid "A little plugin to convert lists into tables" +msgstr "Un piccolo plugin per convertire liste in tabelle" + +#. OK. Something went not as expected. +#. * We did have a selection but cannot parse it into rows. +#. * Aborting +#: ../tableconvert/src/tableconvert.c:237 +msgid "Something went wrong on parsing selection. Aborting" +msgstr "Qualcosa è andato storto analizzando la selezione. Fallito." + +#: ../tableconvert/src/tableconvert.c:269 +msgid "Convert selection to table" +msgstr "Converti selezione in tabella" + +#. Build up menu entry +#: ../tableconvert/src/tableconvert.c:282 +msgid "_Convert to table" +msgstr "_Converti in tabella" + +#: ../tableconvert/src/tableconvert.c:285 +msgid "Converts current marked list to a table." +msgstr "Converti la lista corrente contrassegnata in una tabella." + +#: ../treebrowser/src/treebrowser.c:124 +msgid "TreeBrowser" +msgstr "TreeBrowser" + +#: ../treebrowser/src/treebrowser.c:125 +msgid "" +"This plugin adds a tree browser to Geany, allowing the user to browse files " +"using a tree view of the directory being browsed." +msgstr "" +"Questo plugin aggiunge a Geany un browser ad albero, permettendo all'utente di " +"sfogliare i file usando una vista ad albero delle directory." + +#: ../treebrowser/src/treebrowser.c:434 +#, c-format +msgid "%s: no such directory." +msgstr "%s: directory non trovata." + +#: ../treebrowser/src/treebrowser.c:537 ../treebrowser/src/treebrowser.c:572 +#: ../treebrowser/src/treebrowser.c:670 +msgid "(Empty)" +msgstr "(Vuoto)" + +#: ../treebrowser/src/treebrowser.c:971 +#, c-format +msgid "Could not execute configured external command '%s' (%s)." +msgstr "Impossibile eseguire il comando esterno configurato '%s' (%s)." + +#: ../treebrowser/src/treebrowser.c:1042 +msgid "NewDirectory" +msgstr "Nuova Directory" + +#: ../treebrowser/src/treebrowser.c:1044 +msgid "NewFile" +msgstr "Nuovo File" + +#: ../treebrowser/src/treebrowser.c:1049 +#, c-format +msgid "" +"Target file '%s' exists\n" +", do you really want to replace it with empty file?" +msgstr "" +"File di destinazione '%s' esiste\n" +", vuoi davvero sostituirlo con un file vuoto?" + +#: ../treebrowser/src/treebrowser.c:1095 +#, c-format +msgid "Do you really want to delete '%s' ?" +msgstr "Vuoi davvero eliminare '%s' ?" + +#: ../treebrowser/src/treebrowser.c:1207 ../treebrowser/src/treebrowser.c:1738 +msgid "Go up" +msgstr "Vai su" + +#: ../treebrowser/src/treebrowser.c:1211 ../treebrowser/src/treebrowser.c:1753 +msgid "Set path from document" +msgstr "Imposta percorso dal documento" + +#: ../treebrowser/src/treebrowser.c:1215 +msgid "_Open externally" +msgstr "_Apri esternamente" + +#: ../treebrowser/src/treebrowser.c:1220 +msgid "Open Terminal" +msgstr "Apri terminale" + +#: ../treebrowser/src/treebrowser.c:1224 +msgid "Set as root" +msgstr "Imposta come radice" + +#: ../treebrowser/src/treebrowser.c:1229 ../treebrowser/src/treebrowser.c:1743 +#: ../treebrowser/src/treebrowser.c:2123 +msgid "Refresh" +msgstr "Aggiorna" + +#: ../treebrowser/src/treebrowser.c:1233 +msgid "_Find in Files" +msgstr "Cerca nei _File" + +#: ../treebrowser/src/treebrowser.c:1241 +msgid "Create new directory" +msgstr "Crea nuova directory" + +#: ../treebrowser/src/treebrowser.c:1245 +msgid "Create new file" +msgstr "Crea un nuovo file" + +#: ../treebrowser/src/treebrowser.c:1249 +msgid "Rename" +msgstr "Rinonima" + +#: ../treebrowser/src/treebrowser.c:1254 +msgid "Delete" +msgstr "Elimina" + +#: ../treebrowser/src/treebrowser.c:1262 +#, c-format +msgid "Close: %s" +msgstr "Chiudi: %s" + +#: ../treebrowser/src/treebrowser.c:1267 +#, c-format +msgid "Close Child Documents " +msgstr "Chiudi documenti figlio " + +#: ../treebrowser/src/treebrowser.c:1272 +msgid "_Copy full path to clipboard" +msgstr "_Copia percorso completo negli appunti" + +#: ../treebrowser/src/treebrowser.c:1292 ../treebrowser/src/treebrowser.c:2032 +msgid "Show bookmarks" +msgstr "Visualizza segnalibri" + +#: ../treebrowser/src/treebrowser.c:1297 ../treebrowser/src/treebrowser.c:1981 +msgid "Show hidden files" +msgstr "Visualizza file nascosti" + +#: ../treebrowser/src/treebrowser.c:1302 +msgid "Show toolbars" +msgstr "Visualizza le toolbar" + +#: ../treebrowser/src/treebrowser.c:1621 +#, c-format +msgid "Target file '%s' exists, do you really want to replace it?" +msgstr "Il file obiettivo '%s' esiste, vuoi davvero sostituirlo?" + +#: ../treebrowser/src/treebrowser.c:1748 +msgid "Home" +msgstr "Home" + +#: ../treebrowser/src/treebrowser.c:1758 +#, fuzzy +msgid "Track path" +msgstr "Traccia percorso" + +#: ../treebrowser/src/treebrowser.c:1763 +#, fuzzy +msgid "Hide bars" +msgstr "Nascondi barre" + +#: ../treebrowser/src/treebrowser.c:1773 +#, fuzzy +msgid "" +"Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' " +"reverse try for example this '!;*.c;*.h;*.cpp'" +msgstr "" +"Filtro (*.c;*.h;*.cpp) e se vuoi un filtro temporaneo usando '!' inverti, " +"per esemprio '!;*.c;*.h;*.cpp'" + +#: ../treebrowser/src/treebrowser.c:1781 +msgid "Addressbar for example '/projects/my-project'" +msgstr "Barra indirizzo per esempio '/progetti/mio-progetto'" + +#: ../treebrowser/src/treebrowser.c:1806 +msgid "Tree Browser" +msgstr "Tree Browser" + +#: ../treebrowser/src/treebrowser.c:1945 +msgid "External open command" +msgstr "Apri comando esterno" + +#: ../treebrowser/src/treebrowser.c:1950 +#, c-format +msgid "" +"The command to execute when using \"Open with\". You can use %f and %d " +"wildcards.\n" +"%f will be replaced with the filename including full path\n" +"%d will be replaced with the path name of the selected file without the " +"filename" +msgstr "" +"Il comando da eseguire quando usi \"Apri con\". Puoi usare %f e %d. " +"\n" +"%f sarà sostituito dal nome del file includo il percorso completo\n" +"%d sarà sostituito dal percorso del file selezionato senza il nome del " +"file" + +#: ../treebrowser/src/treebrowser.c:1958 +msgid "Toolbar" +msgstr "Barra degli strumenti" + +#: ../treebrowser/src/treebrowser.c:1960 +msgid "Hidden" +msgstr "Nascosto" + +#: ../treebrowser/src/treebrowser.c:1961 +msgid "Top" +msgstr "Sopra" + +#: ../treebrowser/src/treebrowser.c:1962 +msgid "Bottom" +msgstr "Sotto" + +#: ../treebrowser/src/treebrowser.c:1967 +msgid "If position is changed, the option require plugin restart." +msgstr "Se la posizione è cambiata, l'opzione richiedi il riavvio del plugin." + +#: ../treebrowser/src/treebrowser.c:1971 +msgid "Show icons" +msgstr "Visualizza icone" + +#: ../treebrowser/src/treebrowser.c:1973 +msgid "None" +msgstr "Nessuno" + +#: ../treebrowser/src/treebrowser.c:1974 +msgid "Base" +msgstr "Base" + +#: ../treebrowser/src/treebrowser.c:1975 +msgid "Content-type" +msgstr "Content-type" + +#: ../treebrowser/src/treebrowser.c:1986 +msgid "On Windows, this just hide files that are prefixed with '.' (dot)" +msgstr "In Windows, questa nasconde tutti i file che sono preceduti da '.' (punto)" + +#: ../treebrowser/src/treebrowser.c:1988 +msgid "Hide object files" +msgstr "Nascondi i file oggetto" + +#: ../treebrowser/src/treebrowser.c:1993 +msgid "" +"Don't show generated object files in the file browser, this includes *.o, *." +"obj. *.so, *.dll, *.a, *.lib" +msgstr "" +"Non visualizzare i file oggetto generati nel file browser, questo include *.o " +"*.obj, *.so, *.dll, *.a, *.lib" + +#: ../treebrowser/src/treebrowser.c:1995 +msgid "Reverse filter" +msgstr "Inverti filtro" + +#: ../treebrowser/src/treebrowser.c:2000 +msgid "Follow current document" +msgstr "Segui il documento corrente" + +#: ../treebrowser/src/treebrowser.c:2005 +msgid "Single click, open document and focus it" +msgstr "Click singolo, apri il documento e dagli il focus" + +#: ../treebrowser/src/treebrowser.c:2010 +msgid "Double click open directory" +msgstr "Doppio click per aprire la cartella" + +#: ../treebrowser/src/treebrowser.c:2015 +msgid "On delete file, close it if is opened" +msgstr "Quando un file viene eliminato, chiudilo se aperto" + +#: ../treebrowser/src/treebrowser.c:2020 +msgid "Focus editor on file open" +msgstr "Porta il focus sull'editor quando un file viene aperto" + +#: ../treebrowser/src/treebrowser.c:2025 +msgid "Show tree lines" +msgstr "Visualizza linee dell'albero" + +#: ../treebrowser/src/treebrowser.c:2037 +msgid "Open new files" +msgstr "Apri nuovi file" + +#: ../treebrowser/src/treebrowser.c:2113 +msgid "Focus File List" +msgstr "Focus lista file" + +#: ../treebrowser/src/treebrowser.c:2115 +msgid "Focus Path Entry" +msgstr "Focus inserimento percorso" + +#: ../treebrowser/src/treebrowser.c:2117 +msgid "Rename Object" +msgstr "Rinonima oggetto" + +#: ../treebrowser/src/treebrowser.c:2119 +msgid "Create New File" +msgstr "Crea nuovo file" + +#: ../treebrowser/src/treebrowser.c:2121 +msgid "Create New Directory" +msgstr "Crea nuova cartella" + +#: ../updatechecker/src/updatechecker.c:41 +msgid "Updatechecker" +msgstr "Updatechecker" + +#: ../updatechecker/src/updatechecker.c:42 +msgid "" +"A plugin which is checking whether there are updates for Geany available." +msgstr "" +"Un plugin che controlla se ci sono update disponibili per Geany." + +#: ../updatechecker/src/updatechecker.c:190 +msgid "There is a more recent version available" +msgstr "C'è una versione più recente disponibile." + +#: ../updatechecker/src/updatechecker.c:198 +msgid "No update available" +msgstr "Nessun aggiornamento disponibile" + +#: ../updatechecker/src/updatechecker.c:210 +#, c-format +msgid "" +"Wasn't able to catch some version information.\n" +"Error code: %d \n" +"Error message: »%s«" +msgstr "" +"Impossibile ottenre alcune informazioni sulla versione.\n" +"Codice errore: %d \n" +"Messaggio errore: »%s«" + + +#: ../updatechecker/src/updatechecker.c:276 +msgid "Run updatecheck on startup" +msgstr "Esegui updatecheck all'avvio" + +#: ../updatechecker/src/updatechecker.c:319 +msgid "Check for Updates" +msgstr "Controlla aggiornamenti" + +#: ../webhelper/src/gwh-enum-types.c:15 +msgid "message-window" +msgstr "message-window" + +#: ../webhelper/src/gwh-enum-types.c:16 +msgid "sidebar" +msgstr "sidebar" + +#: ../webhelper/src/gwh-enum-types.c:17 +msgid "separate-window" +msgstr "separate-window" + +#: ../webhelper/src/gwh-enum-types.c:32 +msgid "none" +msgstr "none" + +#: ../webhelper/src/gwh-enum-types.c:33 +msgid "on-connexion" +msgstr "on-connexion" + +#: ../webhelper/src/gwh-enum-types.c:48 +msgid "normal" +msgstr "normal" + +#: ../webhelper/src/gwh-enum-types.c:49 +msgid "utility" +msgstr "utility" + +#: ../webhelper/src/gwh-settings.c:782 +#, c-format +msgid "%s:" +msgstr "%s:" + +#: ../webhelper/src/gwh-browser.c:534 +msgid "_Zoom" +msgstr "_Zoom" + +#: ../webhelper/src/gwh-browser.c:556 +msgid "Full-_content zoom" +msgstr "Zoom _contenuto intero" + +#: ../webhelper/src/gwh-browser.c:567 +msgid "Flip panes orientation" +msgstr "Inverti orientazione riquadri" + +#: ../webhelper/src/gwh-browser.c:814 +msgid "Back" +msgstr "Indietro" + +#: ../webhelper/src/gwh-browser.c:818 +msgid "Forward" +msgstr "Avanti" + +#: ../webhelper/src/gwh-browser.c:822 +msgid "Cancel loading" +msgstr "Annulla caricamento" + +#: ../webhelper/src/gwh-browser.c:826 +msgid "Reload current page" +msgstr "Ricarica pagina corrente" + +#: ../webhelper/src/gwh-browser.c:839 ../webhelper/src/gwh-browser.c:885 +msgid "Web inspector" +msgstr "Web inspector" + +#: ../webhelper/src/gwh-browser.c:840 +msgid "Toggle web inspector" +msgstr "Attiva/Disattiva web inspector" + +#: ../webhelper/src/gwh-plugin.c:50 +msgid "Web helper" +msgstr "Web helper" + +#: ../webhelper/src/gwh-plugin.c:51 +msgid "" +"Display a preview web page that gets updated upon document saving and " +"provide web analysis and debugging tools (aka Web Inspector), all using " +"WebKit." +msgstr "" +"Visualizza un'anteprima della pagina web che si aggiorna quando il documento " +"viene salvato, genera analisi web e strumenti per il debugging (cioè Web " +"Inspector), usando WebKit." + + +#: ../webhelper/src/gwh-plugin.c:141 +msgid "Web view" +msgstr "Vista web" + +#: ../webhelper/src/gwh-plugin.c:186 +msgid "Web preview" +msgstr "Anteprima web" + +#: ../webhelper/src/gwh-plugin.c:265 +msgid "Reload upon document saving" +msgstr "Ricarica al salvataggio del documento" + +#: ../webhelper/src/gwh-plugin.c:305 +msgid "Browser auto reload" +msgstr "Auto aggiornamento del browser" + +#: ../webhelper/src/gwh-plugin.c:306 +msgid "Whether the browser reloads itself upon document saving" +msgstr "Se il browser deve ricaricarsi da solo quando il documento viene salvato" + +#: ../webhelper/src/gwh-plugin.c:311 +msgid "Browser last URI" +msgstr "Ultimo URI del browser" + +#: ../webhelper/src/gwh-plugin.c:312 +msgid "Last URI visited by the browser" +msgstr "L'ultimo URI visitato dal browser" + +#: ../webhelper/src/gwh-plugin.c:317 +msgid "Browser orientation" +msgstr "Orientazione browser" + +#: ../webhelper/src/gwh-plugin.c:318 +msgid "Orientation of the browser widget" +msgstr "Orientazione del widget browser" + +#: ../webhelper/src/gwh-plugin.c:324 +msgid "Browser position" +msgstr "Posizione del browser" + +#: ../webhelper/src/gwh-plugin.c:325 +msgid "Position of the browser widget in Geany's UI" +msgstr "Posizione del widget browser nella UI di Geany" + +#: ../webhelper/src/gwh-plugin.c:331 +msgid "Browser separate window geometry" +msgstr "Geometria finestra browser separata" + +#: ../webhelper/src/gwh-plugin.c:332 +msgid "Last geometry of the separated browser's window" +msgstr "Ultima geometria della finestra separa del browser" + +#: ../webhelper/src/gwh-plugin.c:337 +msgid "Inspector window geometry" +msgstr "Geometria finestra Inspector" + +#: ../webhelper/src/gwh-plugin.c:338 +msgid "Last geometry of the inspector window" +msgstr "Ultima geometria della finestra separa del Inspector" + +#: ../webhelper/src/gwh-plugin.c:343 +msgid "Inspector detached" +msgstr "Inspector separato" + +#: ../webhelper/src/gwh-plugin.c:344 +msgid "Whether the inspector is in a separate window or docked in the browser" +msgstr "Se l'Inspector dovrà essere in una finestra separata o nel browser" + +#: ../webhelper/src/gwh-plugin.c:349 +msgid "Secondary windows skip task bar" +msgstr "Finestre secondarie non nella taskbar" + +#: ../webhelper/src/gwh-plugin.c:350 +msgid "" +"Whether to tell the window manager not to show the secondary windows in the " +"taskbar" +msgstr "" +"Se il gestore delle finestre non deve mostrare le finestre secondarie nella " +"barra delle applicazioni" + +#: ../webhelper/src/gwh-plugin.c:355 +msgid "Secondary windows are transient" +msgstr "Finestre secondarie transitorie" + +#: ../webhelper/src/gwh-plugin.c:356 +msgid "Whether secondary windows are transient children of their parent" +msgstr "Se le finestre secondarie sono figlie transitorie del loro padre" + +#: ../webhelper/src/gwh-plugin.c:361 +msgid "Secondary windows type" +msgstr "Tipo finestre secondarie" + +#: ../webhelper/src/gwh-plugin.c:362 +msgid "The type of the secondary windows" +msgstr "Il tipo delle finestre secondarie" + +#: ../webhelper/src/gwh-plugin.c:438 +msgid "Toggle Web Inspector" +msgstr "Attiva/Disattiva Web Inspector" + +#: ../webhelper/src/gwh-plugin.c:443 +msgid "Show/Hide Web View's Window" +msgstr "Visualizza/Nascondi la finestra Vista Web" + +#. Browser +#: ../webhelper/src/gwh-plugin.c:509 +msgid "Browser" +msgstr "Browser" + +#. Windows +#: ../webhelper/src/gwh-plugin.c:521 +msgid "Windows" +msgstr "Finestre" + +#: ../xmlsnippets/src/plugin.c:45 +msgid "XML Snippets" +msgstr "Frammenti XML" + +#: ../xmlsnippets/src/plugin.c:46 +msgid "Autocompletes XML/HTML tags using snippets." +msgstr "Autocompleta i tag XML/HTML usando i frammenti." diff -Nru geany-plugins-1.23+dfsg/po/ja.po geany-plugins-1.24+dfsg/po/ja.po --- geany-plugins-1.23+dfsg/po/ja.po 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/po/ja.po 2014-04-12 14:28:39.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Geany-plugins 1.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-23 14:32+0100\n" +"POT-Creation-Date: 2014-03-30 19:33+0200\n" "PO-Revision-Date: 2011-10-21 14:08+0100\n" "Last-Translator: Masami Chikahiro \n" "Language-Team: Japanese\n" @@ -35,12 +35,12 @@ msgid "Contents" msgstr "内容" -#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:615 +#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:625 msgid "Bookmarks" msgstr "ブックマーク" #. complete update -#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2295 +#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2351 msgid "_Update" msgstr "更新(_U)" @@ -77,15 +77,15 @@ msgid "Context:" msgstr "コンテキスト:" -#: ../addons/src/ao_xmltagging.c:56 +#: ../addons/src/ao_xmltagging.c:54 msgid "XML tagging" msgstr "XMLタグ付け" -#: ../addons/src/ao_xmltagging.c:67 +#: ../addons/src/ao_xmltagging.c:65 msgid "Tag name to be inserted:" msgstr "挿入するタグ名:" -#: ../addons/src/ao_xmltagging.c:71 +#: ../addons/src/ao_xmltagging.c:69 #, c-format msgid "" "%s will be replaced with your current selection. Please keep care on your " @@ -154,11 +154,12 @@ msgid "Run XML tagging" msgstr "XMLタグ付けを実行" -#: ../addons/src/addons.c:417 ../geanylatex/src/geanylatex.c:241 -#: ../geanyprj/src/geanyprj.c:174 ../geanysendmail/src/geanysendmail.c:121 -#: ../geanysendmail/src/geanysendmail.c:287 ../geanyvc/src/geanyvc.c:1798 +#: ../addons/src/addons.c:417 ../autoclose/src/autoclose.c:871 +#: ../geanylatex/src/geanylatex.c:241 ../geanyprj/src/geanyprj.c:174 +#: ../geanysendmail/src/geanysendmail.c:123 +#: ../geanysendmail/src/geanysendmail.c:291 ../geanyvc/src/geanyvc.c:1854 #: ../geniuspaste/src/geniuspaste.c:140 ../spellcheck/src/scplugin.c:146 -#: ../treebrowser/src/treebrowser.c:1880 +#: ../treebrowser/src/treebrowser.c:1933 #: ../updatechecker/src/updatechecker.c:253 msgid "Plugin configuration directory could not be created." msgstr "プラグイン設定ディレクトリを作成できません。" @@ -247,6 +248,15 @@ msgid "Enclose selection automatically (without having to press a keybinding)" msgstr "自動的に選択したものに括弧をつける(括弧をつけるためのキー入力は不要)" +#: ../autoclose/src/autoclose.c:50 +#, fuzzy +msgid "Auto-close" +msgstr "自動" + +#: ../autoclose/src/autoclose.c:51 +msgid "Auto-close braces and brackets with lot of features" +msgstr "" + #: ../codenav/src/codenavigation.c:52 msgid "Code navigation" msgstr "コードナビ" @@ -315,8 +325,8 @@ msgid "Various debuggers integration." msgstr "統合デバッガ" -#: ../debugger/src/plugin.c:131 ../debugger/src/keys.c:76 -#: ../scope/data/scope.glade.h:125 ../scope/src/scope.c:225 +#: ../debugger/src/plugin.c:133 ../debugger/src/keys.c:76 +#: ../scope/data/scope.glade.h:124 ../scope/src/scope.c:226 msgid "Debug" msgstr "デバッグ" @@ -450,7 +460,7 @@ msgid "Target" msgstr "対象" -#: ../debugger/src/tabs.c:135 ../scope/data/scope.glade.h:69 +#: ../debugger/src/tabs.c:135 ../scope/src/scope.c:524 msgid "Breakpoints" msgstr "ブレークポイント" @@ -487,22 +497,22 @@ msgstr "再起動" #: ../debugger/src/keys.c:52 ../debugger/src/btnpanel.c:113 -#: ../scope/src/scope.c:67 +#: ../scope/src/scope.c:66 msgid "Step into" msgstr "中へ" #: ../debugger/src/keys.c:53 ../debugger/src/btnpanel.c:110 -#: ../scope/src/scope.c:68 +#: ../scope/src/scope.c:67 msgid "Step over" msgstr "次へ" #: ../debugger/src/keys.c:54 ../debugger/src/btnpanel.c:122 -#: ../scope/src/scope.c:69 +#: ../scope/src/scope.c:68 msgid "Step out" msgstr "外へ" #: ../debugger/src/keys.c:55 ../debugger/src/btnpanel.c:125 -#: ../scope/src/scope.c:65 +#: ../scope/src/scope.c:64 msgid "Run to cursor" msgstr "カーソル位置まで実行" @@ -511,7 +521,8 @@ msgstr "ブレークポイントを追加/削除" #: ../debugger/src/keys.c:57 -msgid "Jump to the currect instruction" +#, fuzzy +msgid "Jump to the current instruction" msgstr "現在の命令に移動" #: ../debugger/src/watch_model.c:220 @@ -542,6 +553,14 @@ msgid "Save debug session data to a project" msgstr "デバッグ・セッション・データをプロジェクトに保存" +#: ../defineformat/src/defineformat.c:56 +msgid "Define formatter" +msgstr "" + +#: ../defineformat/src/defineformat.c:57 +msgid "Automatically align backslash in multi-line defines" +msgstr "" + #. never search for more than this many chars #: ../devhelp/src/dhp.h:38 msgid "Documentation" @@ -653,7 +672,7 @@ msgstr "書籍:" #. i18n: a documentation book -#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1760 +#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1759 msgid "Book" msgstr "書籍" @@ -781,12 +800,12 @@ msgid "A developers' help browser for GNOME" msgstr "GNOMEの開発者向けヘルプブラウザ" -#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2010 +#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2066 msgid "_File" msgstr "ファイル(_F)" -#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1815 -#: ../geanymacro/src/geanymacro.c:2112 +#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1822 +#: ../geanymacro/src/geanymacro.c:2118 msgid "_Edit" msgstr "編集(_E)" @@ -966,55 +985,64 @@ msgid "Column mode, select to line / brace / anchor." msgstr "列選択モード、行番号指定選択、対応する括弧、アンカーで選択" -#: ../geanyextrasel/src/extrasel.c:482 +#: ../geanyextrasel/src/extrasel.c:502 msgid "E_xtra Selection" msgstr "特殊な選択(_X)" -#: ../geanyextrasel/src/extrasel.c:489 +#: ../geanyextrasel/src/extrasel.c:509 msgid "_Column Mode" msgstr "列選択モード(_C)" -#: ../geanyextrasel/src/extrasel.c:494 +#: ../geanyextrasel/src/extrasel.c:514 msgid "Column mode" msgstr "列選択モード" -#: ../geanyextrasel/src/extrasel.c:496 +#: ../geanyextrasel/src/extrasel.c:516 msgid "Select to _Line" msgstr "行番号指定選択(_L)" -#: ../geanyextrasel/src/extrasel.c:500 +#: ../geanyextrasel/src/extrasel.c:520 msgid "Select to line" msgstr "行番号指定選択" -#: ../geanyextrasel/src/extrasel.c:502 +#: ../geanyextrasel/src/extrasel.c:522 msgid "Select to Matching _Brace" msgstr "対応する括弧で選択(_B)" -#: ../geanyextrasel/src/extrasel.c:506 +#: ../geanyextrasel/src/extrasel.c:526 msgid "Select to matching brace" msgstr "対応する括弧で選択" -#: ../geanyextrasel/src/extrasel.c:510 +#: ../geanyextrasel/src/extrasel.c:528 +msgid "_Toggle Stream/Rectangular" +msgstr "" + +#: ../geanyextrasel/src/extrasel.c:532 +#, fuzzy +msgid "Convert selection" +msgstr "選択範囲をテーブルに変換" + +#: ../geanyextrasel/src/extrasel.c:537 msgid "_Set Anchor" msgstr "アンカーを設定(_S)" -#: ../geanyextrasel/src/extrasel.c:514 +#: ../geanyextrasel/src/extrasel.c:541 msgid "Set anchor" msgstr "アンカーを設定" -#: ../geanyextrasel/src/extrasel.c:516 +#: ../geanyextrasel/src/extrasel.c:543 msgid "Select to _Anchor" msgstr "アンカー指定選択(_A)" -#: ../geanyextrasel/src/extrasel.c:520 +#: ../geanyextrasel/src/extrasel.c:547 msgid "Select to anchor" msgstr "アンカー指定選択" -#: ../geanyextrasel/src/extrasel.c:522 +#: ../geanyextrasel/src/extrasel.c:549 msgid "_Rectangle Select to Anchor" msgstr "アンカーで矩形選択(_R)" -#: ../geanyextrasel/src/extrasel.c:527 +#: ../geanyextrasel/src/extrasel.c:554 msgid "Rectangle select to anchor" msgstr "アンカーで矩形選択" @@ -1278,10 +1306,10 @@ "surprising since the comment will be generated for the last saved state of " "this document and not the current one." msgstr "" -"現在の文書からヘルプ文書を生成する前にディスクに保存するかどうかを指定します。" -"技術的な側面から見ると、タグ一覧が更新されます。このオプションを無効にし、更新さ" -"れた文書からヘルプ文書を生成すると、現在の文書ではなく、最後に保存された状態か" -"らコメントが生成されます。" +"現在の文書からヘルプ文書を生成する前にディスクに保存するかどうかを指定しま" +"す。技術的な側面から見ると、タグ一覧が更新されます。このオプションを無効に" +"し、更新された文書からヘルプ文書を生成すると、現在の文書ではなく、最後に保存" +"された状態からコメントが生成されます。" #. indent #: ../geanygendoc/src/ggd-plugin.c:637 @@ -1415,76 +1443,76 @@ msgid "Default documentation type for languages that does not have one set" msgstr "言語別の設定が用意されてしないすべて言語用の文書種類設定" -#: ../geanyinsertnum/src/insertnum.c:37 ../geanyinsertnum/src/insertnum.c:329 -#: ../geanyinsertnum/src/insertnum.c:461 +#: ../geanyinsertnum/src/insertnum.c:44 ../geanyinsertnum/src/insertnum.c:337 +#: ../geanyinsertnum/src/insertnum.c:484 msgid "Insert Numbers" msgstr "番号を挿入" -#: ../geanyinsertnum/src/insertnum.c:37 +#: ../geanyinsertnum/src/insertnum.c:44 msgid "Insert/Fill columns with numbers." msgstr "列に番号を挿入" -#: ../geanyinsertnum/src/insertnum.c:140 +#: ../geanyinsertnum/src/insertnum.c:146 msgid "Counting..." msgstr "数えています..." -#: ../geanyinsertnum/src/insertnum.c:188 +#: ../geanyinsertnum/src/insertnum.c:194 msgid "Preparing..." msgstr "準備中..." -#: ../geanyinsertnum/src/insertnum.c:194 +#: ../geanyinsertnum/src/insertnum.c:200 msgid "Inserting..." msgstr "挿入中..." -#: ../geanyinsertnum/src/insertnum.c:318 +#: ../geanyinsertnum/src/insertnum.c:333 msgid "For base 11 and above" msgstr "基数が11以上のとき" -#: ../geanyinsertnum/src/insertnum.c:341 +#: ../geanyinsertnum/src/insertnum.c:353 msgid "_Start:" msgstr "開始(_S):" -#: ../geanyinsertnum/src/insertnum.c:346 +#: ../geanyinsertnum/src/insertnum.c:358 msgid "S_tep:" msgstr "増分(_T):" -#: ../geanyinsertnum/src/insertnum.c:352 +#: ../geanyinsertnum/src/insertnum.c:364 msgid "_Base:" msgstr "基数(_B):" -#: ../geanyinsertnum/src/insertnum.c:363 +#: ../geanyinsertnum/src/insertnum.c:380 msgid "Letters:" msgstr "文字:" -#: ../geanyinsertnum/src/insertnum.c:366 +#: ../geanyinsertnum/src/insertnum.c:383 msgid "_Upper" msgstr "大文字(_U)" -#: ../geanyinsertnum/src/insertnum.c:371 +#: ../geanyinsertnum/src/insertnum.c:388 msgid "_Lower" msgstr "小文字(_L)" -#: ../geanyinsertnum/src/insertnum.c:376 +#: ../geanyinsertnum/src/insertnum.c:393 msgid "Base _prefix" msgstr "基数の接頭語(_P)" -#: ../geanyinsertnum/src/insertnum.c:378 +#: ../geanyinsertnum/src/insertnum.c:395 msgid "0 for octal, 0x for hex, + for positive decimal" msgstr "8進数には0,16進数には0x,正の10進数に+をつけることができます" -#: ../geanyinsertnum/src/insertnum.c:380 +#: ../geanyinsertnum/src/insertnum.c:397 msgid "Padding:" msgstr "余白:" -#: ../geanyinsertnum/src/insertnum.c:382 +#: ../geanyinsertnum/src/insertnum.c:399 msgid "Sp_ace" msgstr "空白(_A)" -#: ../geanyinsertnum/src/insertnum.c:385 +#: ../geanyinsertnum/src/insertnum.c:402 msgid "_Zero" msgstr "ゼロ(_Z)" -#: ../geanyinsertnum/src/insertnum.c:454 +#: ../geanyinsertnum/src/insertnum.c:477 msgid "Insert _Numbers" msgstr "番号を挿入(_N)" @@ -1916,20 +1944,20 @@ msgid "BibTeX reference name:" msgstr "BibTeX 参照名:" -#: ../geanylatex/src/geanylatex.c:1680 +#: ../geanylatex/src/geanylatex.c:1679 msgid "Dear Sir or Madame" msgstr "敬称の書出し(Dear Sir や Madameなど)" -#: ../geanylatex/src/geanylatex.c:1681 +#: ../geanylatex/src/geanylatex.c:1680 msgid "With kind regards" msgstr "文末の定型句(regardsなど)" -#: ../geanylatex/src/geanylatex.c:1689 +#: ../geanylatex/src/geanylatex.c:1688 msgid "No template assigned. Aborting" msgstr "テンプレートが割り当てられていません。終了します" #. Building the wizard-dialog and showing it -#: ../geanylatex/src/geanylatex.c:1716 +#: ../geanylatex/src/geanylatex.c:1715 msgid "LaTeX-Wizard" msgstr "LaTeXウィザード" @@ -1937,78 +1965,78 @@ #. * Adds custom templates if there are any. If there are none just #. * adds default one #. TEMPLATE FILE -#: ../geanylatex/src/geanylatex.c:1731 ../markdown/src/conf.c:666 +#: ../geanylatex/src/geanylatex.c:1730 ../markdown/src/conf.c:659 msgid "Template:" msgstr "テンプレート:" -#: ../geanylatex/src/geanylatex.c:1735 +#: ../geanylatex/src/geanylatex.c:1734 msgid "Set the template which should be used for creating the new document" msgstr "新規文書を作成するのに使用されるテンプレートを設定" -#: ../geanylatex/src/geanylatex.c:1744 +#: ../geanylatex/src/geanylatex.c:1743 msgid "Default" msgstr "標準" #. Documentclass -#: ../geanylatex/src/geanylatex.c:1755 +#: ../geanylatex/src/geanylatex.c:1754 msgid "Documentclass:" msgstr "文書クラス:" -#: ../geanylatex/src/geanylatex.c:1758 +#: ../geanylatex/src/geanylatex.c:1757 msgid "Choose the kind of document you want to write" msgstr "作成する文書の種類を選択" -#: ../geanylatex/src/geanylatex.c:1762 +#: ../geanylatex/src/geanylatex.c:1761 msgid "Article" msgstr "論文" -#: ../geanylatex/src/geanylatex.c:1764 +#: ../geanylatex/src/geanylatex.c:1763 msgid "Report" msgstr "レポート" -#: ../geanylatex/src/geanylatex.c:1766 +#: ../geanylatex/src/geanylatex.c:1765 msgid "Letter" msgstr "手紙" -#: ../geanylatex/src/geanylatex.c:1768 +#: ../geanylatex/src/geanylatex.c:1767 msgid "Presentation" msgstr "プレゼンテーション" #. Encoding -#: ../geanylatex/src/geanylatex.c:1778 +#: ../geanylatex/src/geanylatex.c:1777 msgid "Encoding:" msgstr "エンコード方法:" -#: ../geanylatex/src/geanylatex.c:1782 +#: ../geanylatex/src/geanylatex.c:1781 msgid "Set the encoding for your new document" msgstr "新規文書のエンコード方法を設定" #. fontsize -#: ../geanylatex/src/geanylatex.c:1798 +#: ../geanylatex/src/geanylatex.c:1797 msgid "Font size" msgstr "フォントサイズ:" -#: ../geanylatex/src/geanylatex.c:1804 +#: ../geanylatex/src/geanylatex.c:1803 msgid "Set the default font size of your new document" msgstr "新規文書の標準フォントサイズを設定" #. Author -#: ../geanylatex/src/geanylatex.c:1816 +#: ../geanylatex/src/geanylatex.c:1815 msgid "Author:" msgstr "著者:" -#: ../geanylatex/src/geanylatex.c:1819 +#: ../geanylatex/src/geanylatex.c:1818 msgid "" "Sets the value of the \\author command. In most cases this should be your " "name" msgstr "\\author コマンドの値を設定。通常あなたの氏名を設定します。" #. Date -#: ../geanylatex/src/geanylatex.c:1833 +#: ../geanylatex/src/geanylatex.c:1832 msgid "Date:" msgstr "日付:" -#: ../geanylatex/src/geanylatex.c:1836 +#: ../geanylatex/src/geanylatex.c:1835 msgid "" "Sets the value of the \\date command inside header of your new created LaTeX-" "document. Keeping it at \\today is a good decision if you don't need any " @@ -2018,37 +2046,37 @@ "定にしたくないときは、\\todayのままにしておくのがよいでしょう。" #. Title of the new document -#: ../geanylatex/src/geanylatex.c:1848 +#: ../geanylatex/src/geanylatex.c:1847 msgid "Title:" msgstr "題名:" -#: ../geanylatex/src/geanylatex.c:1851 +#: ../geanylatex/src/geanylatex.c:1850 msgid "Sets the title of your new document." msgstr "新規文書の題名を設定します。" #. Papersize -#: ../geanylatex/src/geanylatex.c:1860 +#: ../geanylatex/src/geanylatex.c:1859 msgid "Paper size:" msgstr "用紙サイズ:" -#: ../geanylatex/src/geanylatex.c:1863 +#: ../geanylatex/src/geanylatex.c:1862 msgid "Choose the paper format for the newly created document" msgstr "新規文書の用紙を選択" #. Paper direction -#: ../geanylatex/src/geanylatex.c:1876 +#: ../geanylatex/src/geanylatex.c:1875 msgid "Paper Orientation:" msgstr "用紙の向き" -#: ../geanylatex/src/geanylatex.c:1879 +#: ../geanylatex/src/geanylatex.c:1878 msgid "Choose the paper orientation for the newly created document" msgstr "新規文書の用紙の向きを選択" -#: ../geanylatex/src/geanylatex.c:1900 +#: ../geanylatex/src/geanylatex.c:1899 msgid "Use KOMA-script classes if possible" msgstr "可能であれば、KOMAスクリプトクラスを使用してください。" -#: ../geanylatex/src/geanylatex.c:1902 +#: ../geanylatex/src/geanylatex.c:1901 msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" "Keep in mind: To compile your document these classes have to be installed " @@ -2058,106 +2086,106 @@ "使用の注意: あなたの文書をコンパイルするには、これらのクラスを事前にインス" "トールする必要があります。" -#: ../geanylatex/src/geanylatex.c:1909 +#: ../geanylatex/src/geanylatex.c:1908 msgid "Use draft mode" msgstr "草稿モードを使用" -#: ../geanylatex/src/geanylatex.c:1911 +#: ../geanylatex/src/geanylatex.c:1910 msgid "" "Set the draft flag inside new created documents to get documents with a " "number of debugging helpers" msgstr "" "新規文書に草稿フラグを設定し、デバッグヘルパーを使用した文書を作成します。" -#: ../geanylatex/src/geanylatex.c:1928 +#: ../geanylatex/src/geanylatex.c:1927 msgid "Run LaTeX-Wizard" msgstr "LaTeXウィザードを実行" -#: ../geanylatex/src/geanylatex.c:1930 +#: ../geanylatex/src/geanylatex.c:1929 msgid "Insert \\label" msgstr "ラベル(\\label)を挿入" -#: ../geanylatex/src/geanylatex.c:1932 +#: ../geanylatex/src/geanylatex.c:1931 msgid "Insert \\ref" msgstr "参照(\\ref)を挿入" -#: ../geanylatex/src/geanylatex.c:1934 +#: ../geanylatex/src/geanylatex.c:1933 msgid "Insert linebreak \\\\ " msgstr "改行(\\\\)を挿入 " -#: ../geanylatex/src/geanylatex.c:1937 +#: ../geanylatex/src/geanylatex.c:1936 msgid "Insert command" msgstr "コマンドを挿入" -#: ../geanylatex/src/geanylatex.c:1939 +#: ../geanylatex/src/geanylatex.c:1938 msgid "Turn input replacement on/off" msgstr "入力置き換えのOn/Off" -#: ../geanylatex/src/geanylatex.c:1943 +#: ../geanylatex/src/geanylatex.c:1942 msgid "Replace special characters" msgstr "特殊文字の置き換え" -#: ../geanylatex/src/geanylatex.c:1946 +#: ../geanylatex/src/geanylatex.c:1945 msgid "Run insert environment dialog" msgstr "環境挿入ダイアログを実行" -#: ../geanylatex/src/geanylatex.c:1948 +#: ../geanylatex/src/geanylatex.c:1947 msgid "Insert \\item" msgstr "項目を挿入(\\item)" -#: ../geanylatex/src/geanylatex.c:1950 +#: ../geanylatex/src/geanylatex.c:1949 msgid "Format selection in bold font face" msgstr "太字フォント" -#: ../geanylatex/src/geanylatex.c:1952 +#: ../geanylatex/src/geanylatex.c:1951 msgid "Format selection in italic font face" msgstr "斜体フォント" -#: ../geanylatex/src/geanylatex.c:1954 +#: ../geanylatex/src/geanylatex.c:1953 msgid "Format selection in typewriter font face" msgstr "固定幅フォント" -#: ../geanylatex/src/geanylatex.c:1956 +#: ../geanylatex/src/geanylatex.c:1955 msgid "Format selection centered" msgstr "中央合わせ" -#: ../geanylatex/src/geanylatex.c:1958 +#: ../geanylatex/src/geanylatex.c:1957 msgid "Format selection left-aligned" msgstr "左寄せ" -#: ../geanylatex/src/geanylatex.c:1960 +#: ../geanylatex/src/geanylatex.c:1959 msgid "Format selection right-aligned" msgstr "右寄せ " -#: ../geanylatex/src/geanylatex.c:1963 +#: ../geanylatex/src/geanylatex.c:1962 msgid "Insert description list" msgstr "説明リストを挿入" -#: ../geanylatex/src/geanylatex.c:1966 +#: ../geanylatex/src/geanylatex.c:1965 msgid "Insert itemize list" msgstr "項目リストを挿入" -#: ../geanylatex/src/geanylatex.c:1969 +#: ../geanylatex/src/geanylatex.c:1968 msgid "Insert enumerate list" msgstr "列挙リストを挿入" -#: ../geanylatex/src/geanylatex.c:1972 +#: ../geanylatex/src/geanylatex.c:1971 msgid "Set selection one level up" msgstr "レベルを上げる" -#: ../geanylatex/src/geanylatex.c:1975 +#: ../geanylatex/src/geanylatex.c:1974 msgid "Set selection one level down" msgstr "レベルを下げる" -#: ../geanylatex/src/geanylatex.c:1978 +#: ../geanylatex/src/geanylatex.c:1977 msgid "Insert \\usepackage{}" msgstr "パッケージ(\\usepackage{})を挿入" -#: ../geanylatex/src/geanylatex.c:1981 +#: ../geanylatex/src/geanylatex.c:1980 msgid "Insert BibTeX reference dialog" msgstr "BibTeX参照ダイアログを挿入" -#: ../geanylatex/src/geanylatex.c:1988 +#: ../geanylatex/src/geanylatex.c:1987 msgid "" "GeanyLaTeX is a plugin to improve support for LaTeX in Geany.\n" "\n" @@ -2166,7 +2194,7 @@ "GeanyLaTeX は Geany で LaTexをよりよくサポートするプラグインです。\n" "不具合や機能追加については作者にレポートしてください。" -#: ../geanylatex/src/geanylatex.c:2026 +#: ../geanylatex/src/geanylatex.c:2025 msgid "" "glatex_set_autocompletion_contextsize has been initialized with an invalid " "value. Default value taken. Please check your configuration file" @@ -2174,116 +2202,116 @@ "glatex_set_autocompletion_contextsize が不正な値で初期化されました。既定値に" "戻します。設定ファイルを確認してください。" -#: ../geanylatex/src/geanylatex.c:2048 ../geanylatex/src/geanylatex.c:2055 +#: ../geanylatex/src/geanylatex.c:2047 ../geanylatex/src/geanylatex.c:2054 msgid "page \\pageref{{{reference}}}" msgstr "page \\pageref{{{reference}}}" -#: ../geanylatex/src/geanylatex.c:2052 ../geanylatex/src/geanylatex.c:2059 +#: ../geanylatex/src/geanylatex.c:2051 ../geanylatex/src/geanylatex.c:2058 msgid "\\ref{{{reference}}}, page \\pageref{{{reference}}}" msgstr "\\ref{{{reference}}}, page \\pageref{{{reference}}}" #. Build up menu for menubar -#: ../geanylatex/src/geanylatex.c:2107 +#: ../geanylatex/src/geanylatex.c:2106 msgid "_LaTeX" msgstr "_LaTeX" #. Filling up menubar menus #. LaTeX menu -#: ../geanylatex/src/geanylatex.c:2116 ../geanylatex/src/geanylatex.c:2328 +#: ../geanylatex/src/geanylatex.c:2115 ../geanylatex/src/geanylatex.c:2327 msgid "LaTeX-_Wizard" msgstr "LaTeXウィザード(_W)" -#: ../geanylatex/src/geanylatex.c:2119 ../geanylatex/src/geanylatex.c:2331 +#: ../geanylatex/src/geanylatex.c:2118 ../geanylatex/src/geanylatex.c:2330 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "LaTeX 文書を簡単に作成するウィザードを開始" -#: ../geanylatex/src/geanylatex.c:2124 +#: ../geanylatex/src/geanylatex.c:2123 msgid "I_nsert Special Character" msgstr "特殊文字の挿入(_N)" -#: ../geanylatex/src/geanylatex.c:2126 +#: ../geanylatex/src/geanylatex.c:2125 msgid "Helps to use some not very common letters and signs" msgstr "あまり使われない特殊文字や記号を入力するのを補助します。" -#: ../geanylatex/src/geanylatex.c:2136 +#: ../geanylatex/src/geanylatex.c:2135 msgid "Insert _Reference" msgstr "参照を挿入(_R)" -#: ../geanylatex/src/geanylatex.c:2138 +#: ../geanylatex/src/geanylatex.c:2137 msgid "Inserting references to the document" msgstr "文書に参照を挿入します" -#: ../geanylatex/src/geanylatex.c:2143 +#: ../geanylatex/src/geanylatex.c:2142 msgid "Insert _Label" msgstr "ラベルを挿入(_L)" -#: ../geanylatex/src/geanylatex.c:2145 +#: ../geanylatex/src/geanylatex.c:2144 msgid "Helps at inserting labels to a document" msgstr "文書にラベルを挿入します" -#: ../geanylatex/src/geanylatex.c:2151 +#: ../geanylatex/src/geanylatex.c:2150 msgid "Insert _Environment" msgstr "環境を挿入(_E)" -#: ../geanylatex/src/geanylatex.c:2153 +#: ../geanylatex/src/geanylatex.c:2152 msgid "Helps at inserting an environment a document" msgstr "文書に環境を挿入します" -#: ../geanylatex/src/geanylatex.c:2159 +#: ../geanylatex/src/geanylatex.c:2158 msgid "Insert P_ackage" msgstr "パッケージを挿入(_A)" -#: ../geanylatex/src/geanylatex.c:2161 +#: ../geanylatex/src/geanylatex.c:2160 msgid "A small dialog to insert \\usepackage{} into header of current file" msgstr "" "現在のファイルのヘッダに \\usepackage{} を挿入するための小さなダイアログ" -#: ../geanylatex/src/geanylatex.c:2166 ../scope/data/scope.glade.h:58 +#: ../geanylatex/src/geanylatex.c:2165 ../scope/data/scope.glade.h:58 msgid "_Format" msgstr "書式(_F)" #. Add font size menu -#: ../geanylatex/src/geanylatex.c:2183 +#: ../geanylatex/src/geanylatex.c:2182 msgid "F_ont size" msgstr "フォントサイズ(_O)" -#: ../geanylatex/src/geanylatex.c:2201 +#: ../geanylatex/src/geanylatex.c:2200 msgid "_Special Character Replacement" msgstr "特殊文字の置換(_S)" -#: ../geanylatex/src/geanylatex.c:2209 +#: ../geanylatex/src/geanylatex.c:2208 msgid "Bulk _Replace Special Characters" msgstr "特殊文字の大域置換(_R)" -#: ../geanylatex/src/geanylatex.c:2211 +#: ../geanylatex/src/geanylatex.c:2210 msgid "_Replace selected special characters with TeX substitutes" msgstr "選択した特殊文字をTeXの構文に置換(_R)" -#: ../geanylatex/src/geanylatex.c:2219 +#: ../geanylatex/src/geanylatex.c:2218 msgid "Toggle _Special Character Replacement" msgstr "特殊文字置換の切り替え(_S)" -#: ../geanylatex/src/geanylatex.c:2230 +#: ../geanylatex/src/geanylatex.c:2229 msgid "Insert _Command" msgstr "コマンドを挿入(_C)" -#: ../geanylatex/src/geanylatex.c:2232 +#: ../geanylatex/src/geanylatex.c:2231 msgid "Inserting costumized command to document" msgstr "文書にカスタムコマンドを挿入します" -#: ../geanylatex/src/geanylatex.c:2257 +#: ../geanylatex/src/geanylatex.c:2256 msgid "_BibTeX" msgstr "_BibTeX" -#: ../geanylatex/src/geanylatex.c:2265 +#: ../geanylatex/src/geanylatex.c:2264 msgid "Insert B_ibTeX reference" msgstr "BibTeX 参照を挿入(_I)" -#: ../geanylatex/src/geanylatex.c:2267 +#: ../geanylatex/src/geanylatex.c:2266 msgid "Helps to insert a reference out of BibTeX files" msgstr "BibTeXファイルの参照を挿入します" -#: ../geanylatex/src/geanylatex.c:2272 +#: ../geanylatex/src/geanylatex.c:2271 msgid "_BibTeX entries" msgstr "_BibTeX エントリー" @@ -2439,16 +2467,16 @@ msgid "Creating dummy text with Geany" msgstr "Geanyでダミーテキストを作成" -#: ../geanylipsum/src/geanylipsum.c:86 +#: ../geanylipsum/src/geanylipsum.c:89 msgid "Lipsum-Generator" msgstr "Lipsum-Generator" -#: ../geanylipsum/src/geanylipsum.c:87 +#: ../geanylipsum/src/geanylipsum.c:90 msgid "Enter the length of Lipsum text here" msgstr "ダミーテキストの文字数を指定" #. Building menu entry -#: ../geanylipsum/src/geanylipsum.c:163 +#: ../geanylipsum/src/geanylipsum.c:164 msgid "_Lipsum" msgstr "_Lipsum" @@ -2586,19 +2614,19 @@ msgid "Browse..." msgstr "参照..." -#: ../geanylua/gsdlg.c:175 +#: ../geanylua/gsdlg.c:176 msgid "Select Color" msgstr "色を選択" -#: ../geanylua/gsdlg.c:205 +#: ../geanylua/gsdlg.c:207 msgid "Choose..." msgstr "選択..." -#: ../geanylua/gsdlg.c:226 +#: ../geanylua/gsdlg.c:228 msgid "Select Font" msgstr "フォントを選択" -#: ../geanylua/gsdlg.c:253 +#: ../geanylua/gsdlg.c:255 msgid "Select..." msgstr "選択..." @@ -2629,7 +2657,7 @@ "モジュール \"%s\" が関数 %s() でエラー:\n" "コマンド \"%s\"の引数が不足しています。\n" -#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:398 +#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:396 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2669,7 +2697,7 @@ msgid "Save file" msgstr "ファイルを保存" -#: ../geanylua/glspi_dlg.c:436 +#: ../geanylua/glspi_dlg.c:438 #, c-format msgid "" "Error in module \"%s\" at function pickfile():\n" @@ -2678,7 +2706,7 @@ "モジュール \"%s\" が関数 pickfile() でエラー:\n" "引数 #3 のフィルタ文字列の解析に失敗。\n" -#: ../geanylua/glspi_dlg.c:486 +#: ../geanylua/glspi_dlg.c:489 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2722,7 +2750,7 @@ "プラグイン %s のロードに失敗。\n" "インストールを確認してください。" -#: ../geanylua/glspi_app.c:19 +#: ../geanylua/glspi_app.c:21 #, c-format msgid "" "%s %s: %s\n" @@ -2731,7 +2759,7 @@ "%s %s: %s\n" "Copyright (c) 2007-2010 " -#: ../geanylua/glspi_app.c:149 +#: ../geanylua/glspi_app.c:151 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2740,7 +2768,7 @@ "モジュール \"%s\" が関数 %s() でエラー:\n" "ウィジェット \"%s\" がありません(引数 #1)\n" -#: ../geanylua/glspi_app.c:158 +#: ../geanylua/glspi_app.c:160 #, c-format msgid "" "Error in module \"%s\" at function %s() argument #2:\n" @@ -3085,6 +3113,21 @@ msgstr "" "選択された文字列を下にコピー。選択されていなかったら、現在の行を下にコピー" +#: ../geanymacro/src/geanymacro.c:150 +#, fuzzy +msgid "Search for next \"\"" +msgstr "検索文字列:" + +#: ../geanymacro/src/geanymacro.c:151 +#, fuzzy +msgid "Search for previous \"\"" +msgstr "単語の開始部分を検索" + +#: ../geanymacro/src/geanymacro.c:152 +#, fuzzy +msgid "Set start of search to beginning of selection" +msgstr "行頭まで削除" + #: ../geanymacro/src/geanymacro.c:181 msgid "Macros" msgstr "マクロ" @@ -3218,9 +3261,8 @@ "that replaces the selected text, or is inserted.\n" "\n" msgstr "" -"個々の操作に別のコマンドを指定、操作の順序を変更、新しい操作を追加、" -"操作の削除も可能です。選択した文字や挿入した文字の編集" -"も可能です。\n" +"個々の操作に別のコマンドを指定、操作の順序を変更、新しい操作を追加、操作の削" +"除も可能です。選択した文字や挿入した文字の編集も可能です。\n" "\n" #: ../geanymacro/src/geanymacro.c:878 @@ -3239,9 +3281,9 @@ "Manager under the Tools menu, selecting this plugin, and cliking " "Preferences. " msgstr "" -"このプラグインの既定の動作を変更することも可能です。ツールメニューのプラグイン" -"マネージャを選択し、このプラグインを選択して、設定ボタンをクリックしてくださ" -"い。" +"このプラグインの既定の動作を変更することも可能です。ツールメニューのプラグイ" +"ンマネージャを選択し、このプラグインを選択して、設定ボタンをクリックしてくだ" +"さい。" #: ../geanymacro/src/geanymacro.c:883 msgid "You can change:\n" @@ -3325,12 +3367,12 @@ #. create buttons #: ../geanymacro/src/geanymacro.c:1393 ../geanymacro/src/geanymacro.c:1536 -#: ../geanymacro/src/geanymacro.c:1819 ../geanymacro/src/geanymacro.c:2116 +#: ../geanymacro/src/geanymacro.c:1826 ../geanymacro/src/geanymacro.c:2122 msgid "_Ok" msgstr "了解(_O)" #: ../geanymacro/src/geanymacro.c:1394 ../geanymacro/src/geanymacro.c:1537 -#: ../geanymacro/src/geanymacro.c:1820 +#: ../geanymacro/src/geanymacro.c:1827 msgid "_Cancel" msgstr "キャンセル(_C)" @@ -3347,7 +3389,7 @@ msgid "Search for contents of clipboard" msgstr "クリップボードの内容を検索" -#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:92 +#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:101 msgid "Search for:" msgstr "検索文字列:" @@ -3381,58 +3423,58 @@ msgid "Text:" msgstr "文字列:" -#: ../geanymacro/src/geanymacro.c:1571 ../geanymacro/src/geanymacro.c:1755 +#: ../geanymacro/src/geanymacro.c:1570 ../geanymacro/src/geanymacro.c:1758 #, c-format msgid "Insert/replace with \"%s\"" msgstr "\"%s\"を挿入/で置き換え" #. create dialog box -#: ../geanymacro/src/geanymacro.c:1731 +#: ../geanymacro/src/geanymacro.c:1735 #, c-format msgid "Edit: %s" msgstr "編集: %s" #. add column -#: ../geanymacro/src/geanymacro.c:1794 +#: ../geanymacro/src/geanymacro.c:1801 msgid "Event" msgstr "イベント" #. add buttons -#: ../geanymacro/src/geanymacro.c:1809 +#: ../geanymacro/src/geanymacro.c:1816 msgid "Move _Up" msgstr "上に移動(_U)" -#: ../geanymacro/src/geanymacro.c:1811 +#: ../geanymacro/src/geanymacro.c:1818 msgid "Move Do_wn" msgstr "下に移動(_W)" -#: ../geanymacro/src/geanymacro.c:1813 +#: ../geanymacro/src/geanymacro.c:1820 msgid "New _Above" msgstr "上に追加(_A)" -#: ../geanymacro/src/geanymacro.c:1814 +#: ../geanymacro/src/geanymacro.c:1821 msgid "New _Below" msgstr "下に追加(_B)" -#: ../geanymacro/src/geanymacro.c:1817 ../geanymacro/src/geanymacro.c:2114 +#: ../geanymacro/src/geanymacro.c:1824 ../geanymacro/src/geanymacro.c:2120 msgid "_Delete" msgstr "削除(_D)" #. create dialog box -#: ../geanymacro/src/geanymacro.c:2059 +#: ../geanymacro/src/geanymacro.c:2065 msgid "Edit Macros" msgstr "マクロを修正" -#: ../geanymacro/src/geanymacro.c:2089 +#: ../geanymacro/src/geanymacro.c:2095 msgid "Macro Name" msgstr "マクロ名" -#: ../geanymacro/src/geanymacro.c:2095 +#: ../geanymacro/src/geanymacro.c:2101 msgid "Key Trigger" msgstr "マクロ・キー" #. add buttons -#: ../geanymacro/src/geanymacro.c:2110 +#: ../geanymacro/src/geanymacro.c:2116 msgid "_Re-Record" msgstr "再び記録(_R)" @@ -3451,6 +3493,33 @@ msgid "_Edit Macros" msgstr "マクロを修正(_E)" +#. *< \brief It's the information message about geany mini script +#: ../geanyminiscript/src/gms_gui.c:129 +msgid "" +"GMS : Geany Mini-Script filter Plugin\n" +"This plugin is a tool to apply a script filter on:\n" +" o the text selection,\n" +" o the current document,\n" +" o all documents of the current session.\n" +"\n" +"The filter type can be:\n" +" o Unix shell script,\n" +" o perl script,\n" +" o python script,\n" +" o sed commands,\n" +" o awk script.\n" +"\n" +"AUTHOR\n" +" Written by Pascal BURLOT (December,2008)\n" +"\n" +"LICENSE:\n" +"This program is free software; you can redistribute\n" +"it and/or modify it under the terms of the GNU \n" +"General Public License as published by the Free\n" +"Software Foundation; either version 2 of the License,\n" +"or (at your option) any later version." +msgstr "" + #: ../geanyminiscript/src/gms_gui.c:253 msgid "Load Mini-Script File" msgstr "ミニスクリプトファイルを読み込み" @@ -3459,109 +3528,108 @@ msgid "Save Mini-Script File" msgstr "ミニスクリプトファイルを保存" -#: ../geanyminiscript/src/gms_gui.c:418 +#: ../geanyminiscript/src/gms_gui.c:419 msgid "Mini-Script Filter" msgstr "ミニスクリプト フィルタ" -#: ../geanyminiscript/src/gms_gui.c:446 +#: ../geanyminiscript/src/gms_gui.c:445 msgid "Clear the mini-script window" msgstr "ミニスクリプト ウィンドウをクリア" -#: ../geanyminiscript/src/gms_gui.c:451 +#: ../geanyminiscript/src/gms_gui.c:450 msgid "Load a mini-script into this window" msgstr "ミニスクリプトをウィンドウに読み込み" -#: ../geanyminiscript/src/gms_gui.c:456 +#: ../geanyminiscript/src/gms_gui.c:455 msgid "Save the mini-script into a file" msgstr "ミニスクリプトをファイルに保存" -#: ../geanyminiscript/src/gms_gui.c:461 +#: ../geanyminiscript/src/gms_gui.c:460 msgid "Display a information about the mini-script plugin" msgstr "ミニスクリプト プラグインの詳細な情報を表示する" -#: ../geanyminiscript/src/gms_gui.c:469 +#: ../geanyminiscript/src/gms_gui.c:468 msgid "select the mini-script type" msgstr "ミニスクリプト種類を選択" #. Hbox : Radio bouttons for choosing the input: #. * selection/current document/all documents of the current session -#: ../geanyminiscript/src/gms_gui.c:500 +#: ../geanyminiscript/src/gms_gui.c:499 msgid "filter input" msgstr "入力フィルタ" -#: ../geanyminiscript/src/gms_gui.c:502 +#: ../geanyminiscript/src/gms_gui.c:501 msgid "select the input of mini-script filter" msgstr "ミニスクリプト入力フィルタを選択" -#: ../geanyminiscript/src/gms_gui.c:508 +#: ../geanyminiscript/src/gms_gui.c:507 msgid "selection" msgstr "選択" -#: ../geanyminiscript/src/gms_gui.c:509 +#: ../geanyminiscript/src/gms_gui.c:508 msgid "document" msgstr "文書" -#: ../geanyminiscript/src/gms_gui.c:510 +#: ../geanyminiscript/src/gms_gui.c:509 msgid "session" msgstr "セッション" #. Hbox : Radio bouttons for choosing the output: #. * current document/ or new document -#: ../geanyminiscript/src/gms_gui.c:519 +#: ../geanyminiscript/src/gms_gui.c:518 msgid "filter output" msgstr "出力フィルタ" -#: ../geanyminiscript/src/gms_gui.c:521 +#: ../geanyminiscript/src/gms_gui.c:520 msgid "select the output of mini-script filter" msgstr "ミニスクリプト出力フィルタを選択" -#: ../geanyminiscript/src/gms_gui.c:527 +#: ../geanyminiscript/src/gms_gui.c:526 msgid "Current Doc." msgstr "現在の文書" -#: ../geanyminiscript/src/gms_gui.c:528 +#: ../geanyminiscript/src/gms_gui.c:527 msgid "New Doc." msgstr "新規文書" -#: ../geanyminiscript/src/gms_gui.c:749 +#: ../geanyminiscript/src/gms_gui.c:748 msgid "script configuration" msgstr "スクリプトの設定" -#. All plugins must set name, description, version and author. #: ../geanyminiscript/src/gms.c:58 msgid "Mini Script" msgstr "ミニスクリプト" -#: ../geanyminiscript/src/gms.c:58 +#: ../geanyminiscript/src/gms.c:59 msgid "" "A tool to apply a script filter on a text selection or current document(s)" msgstr "選択文字列や現在の文書にスクリプト フィルタを適用するツール" -#: ../geanyminiscript/src/gms.c:59 +#: ../geanyminiscript/src/gms.c:60 msgid "Pascal BURLOT, a Geany user" msgstr "Pascal BURLOT, Geanyユーザ" #. Add an item to the Tools menu -#: ../geanyminiscript/src/gms.c:278 +#: ../geanyminiscript/src/gms.c:249 msgid "_Mini-Script" msgstr "ミニスクリプト(_M)" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:58 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:61 msgid "Numbered Bookmarks for Geany" msgstr "番号指定ブックマーク" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:923 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:927 #, c-format msgid "Unable to apply all markers to '%s' as all being used." msgstr "すべて使用中のためマーカを '%s'に適用できません" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:925 -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:969 -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1392 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:929 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:973 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1396 msgid "_Okay" msgstr "了解(_O)" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:967 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:971 #, c-format msgid "" "'%s' has been edited since it was last saved by geany. Marker positions may " @@ -3572,52 +3640,52 @@ "ロードしません。\n" "無視をクリックするとマーカを強制的にロードします。" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:970 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:974 msgid "_Ignore" msgstr "無視(_I)" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1215 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1219 msgid "remember fold state" msgstr "折りたたみ状態を保持" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1221 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1225 msgid "Center view when goto bookmark" msgstr "ブックマークに移動したときに画面の中心にする" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1228 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1232 msgid "Move to start of line" msgstr "行の始まりに移動" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1229 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1233 msgid "Move to remembered position in line" msgstr "行の記録された位置に移動" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1230 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1234 msgid "Move to position in current line" msgstr "現在の行の位置に移動" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1231 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1235 msgid "Move to End of line" msgstr "行の終わりに移動" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1237 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1241 msgid "Save file settings with program settings" msgstr "プログラムの設定を保存" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1238 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1242 msgid "Save file settings to filename with suffix" msgstr "ファイルに設定を保存" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1243 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1247 msgid "remember normal Bookmarks" msgstr "通常のブックマークを保存" #. create dialog box -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1263 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1267 msgid "Numbered Bookmarks help" msgstr "番号指定ブックマーク・ヘルプ" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1270 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1274 msgid "" "This Plugin implements Numbered Bookmarks in Geany, as well as remembering " "the state of folds, and positions of standard non-numbered bookmarks when a " @@ -3632,15 +3700,15 @@ "shown, but you can have more than one bookmark per line. To move to a " "previously set bookmark, press Ctrl+a number from 0 to 9." msgstr "" -"このプラグインは番号指定ブックマークを提供します。ブックマークを設定するには、" -"CtrlキーとShiftキーを押しながら、0から9のキーを押してください。行番号の隣に" -"マーカが表示されます。マーカの行でCtrl+Shift+数字キーを押すと、そのマーカは削" -"除されます。別の行でCtrl+Shift+数字キーを押すと、その行が新しいマーカ位置にな" -"ります。ある行にマーカが複数設定されているときは、最後に指定したマーカ番号が表" -"示されますが、設定された他のマーカも有効です。以前設定したマーカを移動するに" -"は、Ctrlキーと0から9のキーを押します。" +"このプラグインは番号指定ブックマークを提供します。ブックマークを設定するに" +"は、CtrlキーとShiftキーを押しながら、0から9のキーを押してください。行番号の隣" +"にマーカが表示されます。マーカの行でCtrl+Shift+数字キーを押すと、そのマーカは" +"削除されます。別の行でCtrl+Shift+数字キーを押すと、その行が新しいマーカ位置に" +"なります。ある行にマーカが複数設定されているときは、最後に指定したマーカ番号" +"が表示されますが、設定された他のマーカも有効です。以前設定したマーカを移動す" +"るには、Ctrlキーと0から9のキーを押します。" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1391 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1395 msgid "Unable to apply markers as all being used." msgstr "すべて使用中のためマーカを適用できません" @@ -3726,36 +3794,36 @@ msgstr "署名者を選択" #. shouldn't get here -#: ../geanypg/src/pinentry.c:107 +#: ../geanypg/src/pinentry.c:111 msgid "Could not use pinentry." msgstr "pinentryを使用できません" -#: ../geanypg/src/pinentry.c:119 +#: ../geanypg/src/pinentry.c:123 msgid "Unexpected output from pinentry." msgstr "pinentryからの不明な出力" #. read the rest of the first line after OK -#: ../geanypg/src/pinentry.c:127 +#: ../geanypg/src/pinentry.c:131 msgid "Passphrase entry" msgstr "パスフレーズ入力" -#: ../geanypg/src/pinentry.c:131 +#: ../geanypg/src/pinentry.c:135 msgid "Passphrase" msgstr "パスフレーズ" -#: ../geanypg/src/pinentry.c:136 +#: ../geanypg/src/pinentry.c:140 msgid "Enter passphrase for" msgstr "パスフレーズを入力" -#: ../geanypg/src/pinentry.c:167 +#: ../geanypg/src/pinentry.c:171 msgid "pinentry gave error" msgstr "pinentry エラー" -#: ../geanypg/src/pinentry.c:170 +#: ../geanypg/src/pinentry.c:174 msgid "Unexpected error from pinentry." msgstr "pinentryからの不明なエラー" -#: ../geanypg/src/pinentry.c:195 +#: ../geanypg/src/pinentry.c:199 msgid "" "Error, Passphrase input without using gpg-agent is not supported on Windows " "yet." @@ -3767,8 +3835,8 @@ msgid "a key with fingerprint" msgstr "フィンガープリントを使用したキー" -#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:522 -#: ../spellcheck/src/gui.c:533 +#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:527 +#: ../spellcheck/src/gui.c:538 msgid "unknown" msgstr "不明" @@ -3935,7 +4003,7 @@ msgstr "署名ファイルを開く" #: ../geanyprj/src/geanyprj.c:38 ../geanyprj/src/sidebar.c:456 -#: ../gproject/src/gproject-sidebar.c:822 +#: ../gproject/src/gproject-sidebar.c:870 msgid "Project" msgstr "プロジェクト" @@ -3964,7 +4032,7 @@ msgid "C_reate" msgstr "作成(_R)" -#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:116 +#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:114 msgid "Name:" msgstr "名前:" @@ -4042,7 +4110,7 @@ msgid "Remove File" msgstr "ファイルを削除" -#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:803 +#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:849 msgid "H_ide Sidebar" msgstr "サイドバーを隠す(_I)" @@ -4051,6 +4119,50 @@ msgid "Project \"%s\" opened." msgstr "プロジェクト \"%s\" が開かれました" +#: ../geanypy/src/geanypy-plugin.c:34 +#, fuzzy +msgid "GeanyPy" +msgstr "GeanyPG" + +#: ../geanypy/src/geanypy-plugin.c:35 +msgid "Python plugins support" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:77 +#, fuzzy, c-format +msgid "Unable to pre-load Python library: %s." +msgstr "設定ディレクトリを '%s' に作成できません" + +#: ../geanypy/src/geanypy-plugin.c:157 +msgid "Failed to import manager module" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:166 +msgid "Failed to retrieve PluginManager from manager module" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:182 +#, fuzzy +msgid "System plugin directory not found." +msgstr "tty 一時ディレクトリがありません!\n" + +#: ../geanypy/src/geanypy-plugin.c:211 +msgid "Unable to instantiate new PluginManager" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:227 +msgid "Unable to get show_all() method on plugin manager" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:255 +#, fuzzy, c-format +msgid "Unable to create Python plugins directory: %s: %s" +msgstr "設定ディレクトリを '%s' に作成できません" + +#: ../geanypy/src/geanypy-plugin.c:266 +msgid "Python Plugin Manager" +msgstr "" + #: ../geanysendmail/src/geanysendmail.c:43 msgid "GeanySendMail" msgstr "GeanySendMail" @@ -4071,42 +4183,42 @@ msgid "Enter the recipient's e-mail address:" msgstr "受信者の電子メールアドレスを入力:" -#: ../geanysendmail/src/geanysendmail.c:136 +#: ../geanysendmail/src/geanysendmail.c:138 msgid "Filename placeholder not found. The executed command might have failed." msgstr "ファイル名がありません。実行したコマンドは間違っています。" -#: ../geanysendmail/src/geanysendmail.c:142 +#: ../geanysendmail/src/geanysendmail.c:144 msgid "" "Recipient address placeholder not found. The executed command might have " "failed." msgstr "受信者アドレスがありません。実行したコマンドは間違っています。" -#: ../geanysendmail/src/geanysendmail.c:157 +#: ../geanysendmail/src/geanysendmail.c:159 msgid "Could not execute mailer. Please check your configuration." msgstr "メールプログラムを実行できません。環境設定を確認してください。" -#: ../geanysendmail/src/geanysendmail.c:166 +#: ../geanysendmail/src/geanysendmail.c:168 msgid "Please define a mail client first." msgstr "メールプログラムを先に設定してください。" -#: ../geanysendmail/src/geanysendmail.c:171 +#: ../geanysendmail/src/geanysendmail.c:173 msgid "File has to be saved before sending." msgstr "送信する前にファイルを保存する必要があります。" -#: ../geanysendmail/src/geanysendmail.c:187 +#: ../geanysendmail/src/geanysendmail.c:191 msgid "Mail" msgstr "メール" -#: ../geanysendmail/src/geanysendmail.c:218 +#: ../geanysendmail/src/geanysendmail.c:222 msgid "Send by mail" msgstr "電子メールとして送信" #. add a label and a text entry to the dialog -#: ../geanysendmail/src/geanysendmail.c:308 +#: ../geanysendmail/src/geanysendmail.c:312 msgid "Path and options for the mail client:" msgstr "メールプログラムのパスとオプション:" -#: ../geanysendmail/src/geanysendmail.c:316 +#: ../geanysendmail/src/geanysendmail.c:320 msgid "" "Note: \n" "\t%f will be replaced by your file.\n" @@ -4124,28 +4236,28 @@ "\tsylpheed --attach \"\\%f\" --compose \"\\%r\"\n" "\tmutt -s \"Sending '\\%b'\" -a \"\\%f\" \"\\%r\"" -#: ../geanysendmail/src/geanysendmail.c:326 +#: ../geanysendmail/src/geanysendmail.c:330 msgid "Show toolbar icon" msgstr "ツールバーアイコンを表示" -#: ../geanysendmail/src/geanysendmail.c:328 +#: ../geanysendmail/src/geanysendmail.c:332 msgid "Shows a icon in the toolbar to send file more easy." msgstr "ファイル送信を簡単にするためにツールバーにアイコンを表示します。" -#: ../geanysendmail/src/geanysendmail.c:334 +#: ../geanysendmail/src/geanysendmail.c:338 msgid "Use dialog for entering email address of recipients" msgstr "受信者のメールアドレスを入力するダイアログを使用" -#: ../geanysendmail/src/geanysendmail.c:356 +#: ../geanysendmail/src/geanysendmail.c:360 msgid "Send file by mail" msgstr "ファイルを電子メールとして送信" #. Build up menu entry -#: ../geanysendmail/src/geanysendmail.c:379 +#: ../geanysendmail/src/geanysendmail.c:383 msgid "_Mail document" msgstr "文書をメールとして送信(_M)" -#: ../geanysendmail/src/geanysendmail.c:382 +#: ../geanysendmail/src/geanysendmail.c:386 msgid "" "Sends the opened file as unzipped attachment by any mailer from your $PATH" msgstr "" @@ -4165,76 +4277,95 @@ msgid "geanyvc: s_spawn_sync error: %s" msgstr "geanyvc: s_spawn_sync エラー: %s" -#: ../geanyvc/src/geanyvc.c:609 ../geanyvc/src/geanyvc.c:620 +#: ../geanyvc/src/geanyvc.c:561 +#, c-format +msgid "File %s: action %s executed via %s." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:614 ../geanyvc/src/geanyvc.c:625 #, c-format msgid "geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'" msgstr "geanyvc: vcdiff_file_activated: '%s' から '%s' に名前変更できません。" -#: ../geanyvc/src/geanyvc.c:646 ../geanyvc/src/geanyvc.c:696 +#: ../geanyvc/src/geanyvc.c:651 ../geanyvc/src/geanyvc.c:701 msgid "No changes were made." msgstr "変更されたものはありません。" -#: ../geanyvc/src/geanyvc.c:723 +#: ../geanyvc/src/geanyvc.c:728 msgid "No history available" msgstr "履歴が利用できません" -#: ../geanyvc/src/geanyvc.c:916 ../geanyvc/src/geanyvc.c:924 +#: ../geanyvc/src/geanyvc.c:921 ../geanyvc/src/geanyvc.c:929 #, c-format msgid "Do you really want to revert: %s?" msgstr "変更を取り消してもよいですか: %s?" -#: ../geanyvc/src/geanyvc.c:932 +#: ../geanyvc/src/geanyvc.c:937 #, c-format msgid "Do you really want to add: %s?" msgstr "ファイルを追加してもよいですか: %s?" -#: ../geanyvc/src/geanyvc.c:939 +#: ../geanyvc/src/geanyvc.c:944 #, c-format msgid "Do you really want to remove: %s?" msgstr "ファイルを削除してもよいですか: %s?" -#: ../geanyvc/src/geanyvc.c:962 +#: ../geanyvc/src/geanyvc.c:967 msgid "Do you really want to update?" msgstr "リポジトリから更新してもよいですか?" -#: ../geanyvc/src/geanyvc.c:1225 +#: ../geanyvc/src/geanyvc.c:1094 +msgid "" +"The resulting differences cannot be displayed because the changes are too " +"big to display here and would slow down the UI significantly.\n" +"\n" +"To view the differences, cancel this dialog and open the differences in " +"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:1243 msgid "Commit Y/N" msgstr "リポジトリに反映してもよいですか Y/N" -#: ../geanyvc/src/geanyvc.c:1235 +#: ../geanyvc/src/geanyvc.c:1253 msgid "Status" msgstr "状態" -#: ../geanyvc/src/geanyvc.c:1242 +#: ../geanyvc/src/geanyvc.c:1260 msgid "Path" msgstr "パス" -#: ../geanyvc/src/geanyvc.c:1330 +#: ../geanyvc/src/geanyvc.c:1324 +#, c-format +msgid "Line: %d Column: %d" +msgstr "" + +#: ../geanyvc/src/geanyvc.c:1370 msgid "Commit" msgstr "コミット" -#: ../geanyvc/src/geanyvc.c:1372 +#: ../geanyvc/src/geanyvc.c:1412 msgid "_De-/select all files" msgstr "すべてのファイルを選択/解除(_D)" -#: ../geanyvc/src/geanyvc.c:1413 +#: ../geanyvc/src/geanyvc.c:1456 msgid "Commit message:" msgstr "コミット メッセージ:" -#: ../geanyvc/src/geanyvc.c:1426 +#: ../geanyvc/src/geanyvc.c:1475 msgid "C_ommit" msgstr "コミット(_O)" -#: ../geanyvc/src/geanyvc.c:1500 +#: ../geanyvc/src/geanyvc.c:1556 msgid "Nothing to commit." msgstr "反映させるものはありません。" -#: ../geanyvc/src/geanyvc.c:1546 +#: ../geanyvc/src/geanyvc.c:1602 #, c-format msgid "Error initializing spell checking: %s" msgstr "スペルチェッカ初期化エラー: %s" -#: ../geanyvc/src/geanyvc.c:1558 +#: ../geanyvc/src/geanyvc.c:1614 #, c-format msgid "" "Error while setting up language for spellchecking. Please check " @@ -4243,11 +4374,11 @@ "スペルチェックの言語設定中にエラーになりました。環境設定を確認してください。" "エラーメッセージ: %s" -#: ../geanyvc/src/geanyvc.c:1834 +#: ../geanyvc/src/geanyvc.c:1890 msgid "Set Changed-flag for document tabs created by the plugin" msgstr "プラグインによって文書タブに作成された変更フラグを設定" -#: ../geanyvc/src/geanyvc.c:1837 +#: ../geanyvc/src/geanyvc.c:1893 msgid "" "If this option is activated, every new by the VC-plugin created document tab " "will be marked as changed. Even this option is useful in some cases, it " @@ -4257,44 +4388,44 @@ "更ありにマークされます。このオプションが便利な場合もありますが、多くの文書に" "対して逐一「保存しますか」ダイアログが表示される原因にもなります。" -#: ../geanyvc/src/geanyvc.c:1845 +#: ../geanyvc/src/geanyvc.c:1901 msgid "Confirm adding new files to a VCS" msgstr "新規ファイルをVCSに追加するかどうか確認" -#: ../geanyvc/src/geanyvc.c:1848 +#: ../geanyvc/src/geanyvc.c:1904 msgid "Shows a confirmation dialog on adding a new (created) file to VCS." msgstr "" "新規に作成されたファイルをVCSに追加するかどうか確認ダイアログを表示します。" -#: ../geanyvc/src/geanyvc.c:1854 +#: ../geanyvc/src/geanyvc.c:1910 msgid "Maximize commit dialog" msgstr "コミットダイアログを最大化" -#: ../geanyvc/src/geanyvc.c:1855 +#: ../geanyvc/src/geanyvc.c:1911 msgid "Show commit dialog maximize." msgstr "コミットダイアログを最大化して表示します。" -#: ../geanyvc/src/geanyvc.c:1861 +#: ../geanyvc/src/geanyvc.c:1917 msgid "Use external diff viewer" msgstr "外部diffビューアを使用" -#: ../geanyvc/src/geanyvc.c:1863 +#: ../geanyvc/src/geanyvc.c:1919 msgid "Use external diff viewer for file diff." msgstr "ファイルの差分を表示するのに外部のdiffビューアを使用します。" -#: ../geanyvc/src/geanyvc.c:1869 +#: ../geanyvc/src/geanyvc.c:1925 msgid "Show VC entries at editor menu" msgstr "'VCエントリー'をエディタのメニューに追加" -#: ../geanyvc/src/geanyvc.c:1871 +#: ../geanyvc/src/geanyvc.c:1927 msgid "Show entries for VC functions inside editor menu" msgstr "エディタメニュー内にVCの機能を表示" -#: ../geanyvc/src/geanyvc.c:1876 +#: ../geanyvc/src/geanyvc.c:1932 msgid "Attach menu to menubar" msgstr "メニューをメニューバーに追加" -#: ../geanyvc/src/geanyvc.c:1878 +#: ../geanyvc/src/geanyvc.c:1934 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " "directly inside Geany's menubar.Will take in account after next start of " @@ -4303,209 +4434,209 @@ "このプラグインのメニューがツールメニューの中に表示されるかGeanyのメニューバー" "に追加されるかを指定。GeanyVCの次回起動時に有効になります。" -#: ../geanyvc/src/geanyvc.c:1886 +#: ../geanyvc/src/geanyvc.c:1942 msgid "Enable CVS" msgstr "CVSを有効" -#: ../geanyvc/src/geanyvc.c:1891 +#: ../geanyvc/src/geanyvc.c:1947 msgid "Enable GIT" msgstr "GITを有効" -#: ../geanyvc/src/geanyvc.c:1896 +#: ../geanyvc/src/geanyvc.c:1952 msgid "Enable SVN" msgstr "SVNを有効" -#: ../geanyvc/src/geanyvc.c:1901 +#: ../geanyvc/src/geanyvc.c:1957 msgid "Enable SVK" msgstr "SVKを有効" -#: ../geanyvc/src/geanyvc.c:1906 +#: ../geanyvc/src/geanyvc.c:1962 msgid "Enable Bazaar" msgstr "Bazaarを有効" -#: ../geanyvc/src/geanyvc.c:1911 +#: ../geanyvc/src/geanyvc.c:1967 msgid "Enable Mercurial" msgstr "Mercurialを有効" -#: ../geanyvc/src/geanyvc.c:1917 +#: ../geanyvc/src/geanyvc.c:1973 msgid "Spellcheck language" msgstr "スペルチェック言語" -#: ../geanyvc/src/geanyvc.c:2008 +#: ../geanyvc/src/geanyvc.c:2064 msgid "_VC file Actions" msgstr "_VC ファイル アクション" #. Diff of current file #. Diff of the current dir #. Complete diff of base directory -#: ../geanyvc/src/geanyvc.c:2014 ../geanyvc/src/geanyvc.c:2091 -#: ../geanyvc/src/geanyvc.c:2131 +#: ../geanyvc/src/geanyvc.c:2070 ../geanyvc/src/geanyvc.c:2147 +#: ../geanyvc/src/geanyvc.c:2187 msgid "_Diff" msgstr "差分(_D)" -#: ../geanyvc/src/geanyvc.c:2017 +#: ../geanyvc/src/geanyvc.c:2073 msgid "Make a diff from the current active file" msgstr "現在のファイルとレポジトリのファイルの差分を作成します。" #. Revert current file #. Revert current dir #. Revert everything -#: ../geanyvc/src/geanyvc.c:2022 ../geanyvc/src/geanyvc.c:2100 -#: ../geanyvc/src/geanyvc.c:2139 +#: ../geanyvc/src/geanyvc.c:2078 ../geanyvc/src/geanyvc.c:2156 +#: ../geanyvc/src/geanyvc.c:2195 msgid "_Revert" msgstr "取り消し(_R)" -#: ../geanyvc/src/geanyvc.c:2025 +#: ../geanyvc/src/geanyvc.c:2081 msgid "Restore pristine working copy file (undo local edits)." msgstr "作業コピーのファイルを最初の状態に戻す(ローカルな編集を破棄)." #. Blame for current file -#: ../geanyvc/src/geanyvc.c:2034 +#: ../geanyvc/src/geanyvc.c:2090 msgid "_Blame" msgstr "履歴を追跡(_B)" -#: ../geanyvc/src/geanyvc.c:2037 +#: ../geanyvc/src/geanyvc.c:2093 msgid "Shows the changes made at one file per revision and author." msgstr "ファイルの変更履歴を版ごと修正者ごとに表示" #. History/log of current file #. History/log of the current dir #. Complete History/Log of base directory -#: ../geanyvc/src/geanyvc.c:2044 ../geanyvc/src/geanyvc.c:2110 -#: ../geanyvc/src/geanyvc.c:2151 +#: ../geanyvc/src/geanyvc.c:2100 ../geanyvc/src/geanyvc.c:2166 +#: ../geanyvc/src/geanyvc.c:2207 msgid "_History (log)" msgstr "履歴ログ(_H)" -#: ../geanyvc/src/geanyvc.c:2047 +#: ../geanyvc/src/geanyvc.c:2103 msgid "Shows the log of the current file" msgstr "現在のファイルのログを表示" #. base version of the current file -#: ../geanyvc/src/geanyvc.c:2052 +#: ../geanyvc/src/geanyvc.c:2108 msgid "_Original" msgstr "オリジナル(_O)" -#: ../geanyvc/src/geanyvc.c:2055 +#: ../geanyvc/src/geanyvc.c:2111 msgid "Shows the original of the current file" msgstr "現在のファイルのオリジナルを表示" #. add current file -#: ../geanyvc/src/geanyvc.c:2063 +#: ../geanyvc/src/geanyvc.c:2119 msgid "_Add to Version Control" msgstr "バージョン管理に追加(_A)" -#: ../geanyvc/src/geanyvc.c:2065 +#: ../geanyvc/src/geanyvc.c:2121 msgid "Add file to repository." msgstr "ファイルをレポジトリに追加" #. remove current file -#: ../geanyvc/src/geanyvc.c:2071 +#: ../geanyvc/src/geanyvc.c:2127 msgid "_Remove from Version Control" msgstr "バージョン管理から削除(_R)" -#: ../geanyvc/src/geanyvc.c:2073 +#: ../geanyvc/src/geanyvc.c:2129 msgid "Remove file from repository." msgstr "レポジトリからファイルを削除" -#: ../geanyvc/src/geanyvc.c:2088 +#: ../geanyvc/src/geanyvc.c:2144 msgid "_Directory" msgstr "ディレクトリ(_D)" -#: ../geanyvc/src/geanyvc.c:2094 +#: ../geanyvc/src/geanyvc.c:2150 msgid "Make a diff from the directory of the current active file" msgstr "現在のファイルのディレクトリから差分を作成" -#: ../geanyvc/src/geanyvc.c:2103 +#: ../geanyvc/src/geanyvc.c:2159 msgid "Restore original files in the current folder (undo local edits)." msgstr "現在のディレクトリの元のファイルを復元(ローカルな編集を破棄)" -#: ../geanyvc/src/geanyvc.c:2113 +#: ../geanyvc/src/geanyvc.c:2169 msgid "Shows the log of the current directory" msgstr "現在のディレクトリのログを表示" -#: ../geanyvc/src/geanyvc.c:2127 +#: ../geanyvc/src/geanyvc.c:2183 msgid "_Base Directory" msgstr "_BASE ディレクトリ" -#: ../geanyvc/src/geanyvc.c:2133 +#: ../geanyvc/src/geanyvc.c:2189 msgid "Make a diff from the top VC directory" msgstr "バージョン管理ディレクトリから diff を作成" -#: ../geanyvc/src/geanyvc.c:2141 +#: ../geanyvc/src/geanyvc.c:2197 msgid "Revert any local edits." msgstr "ローカルな編集を元に戻す" -#: ../geanyvc/src/geanyvc.c:2154 +#: ../geanyvc/src/geanyvc.c:2210 msgid "Shows the log of the top VC directory" msgstr "バージョン管理ディレクトリのログを表示" -#: ../geanyvc/src/geanyvc.c:2180 +#: ../geanyvc/src/geanyvc.c:2236 msgid "VC _Commit" msgstr "VC コミット(_C)" -#: ../geanyvc/src/geanyvc.c:2215 +#: ../geanyvc/src/geanyvc.c:2271 msgid "Show diff of file" msgstr "ファイルの差分を表示" -#: ../geanyvc/src/geanyvc.c:2217 +#: ../geanyvc/src/geanyvc.c:2273 msgid "Show diff of directory" msgstr "ディレクトリの差分を表示" -#: ../geanyvc/src/geanyvc.c:2219 +#: ../geanyvc/src/geanyvc.c:2275 msgid "Show diff of basedir" msgstr "BASEディレクトリの差分を表示" -#: ../geanyvc/src/geanyvc.c:2222 +#: ../geanyvc/src/geanyvc.c:2278 msgid "Commit changes" msgstr "変更を反映" -#: ../geanyvc/src/geanyvc.c:2224 +#: ../geanyvc/src/geanyvc.c:2280 msgid "Show status" msgstr "状態を表示" -#: ../geanyvc/src/geanyvc.c:2226 +#: ../geanyvc/src/geanyvc.c:2282 msgid "Revert single file" msgstr "1つのファイルを元に戻す" -#: ../geanyvc/src/geanyvc.c:2228 +#: ../geanyvc/src/geanyvc.c:2284 msgid "Revert directory" msgstr "ディレクトリを元に戻す" -#: ../geanyvc/src/geanyvc.c:2230 +#: ../geanyvc/src/geanyvc.c:2286 msgid "Revert base directory" msgstr "BASE ディレクトリに戻す" -#: ../geanyvc/src/geanyvc.c:2232 +#: ../geanyvc/src/geanyvc.c:2288 msgid "Update file" msgstr "ファイルを更新" -#: ../geanyvc/src/geanyvc.c:2260 +#: ../geanyvc/src/geanyvc.c:2316 msgid "_VC" msgstr "_VC" -#: ../geanyvc/src/geanyvc.c:2266 +#: ../geanyvc/src/geanyvc.c:2322 msgid "_Version Control" msgstr "バージョン管理(_V)" #. Status of basedir -#: ../geanyvc/src/geanyvc.c:2288 +#: ../geanyvc/src/geanyvc.c:2344 msgid "_Status" msgstr "状態(_S)" -#: ../geanyvc/src/geanyvc.c:2290 +#: ../geanyvc/src/geanyvc.c:2346 msgid "Show status." msgstr "状態を表示" -#: ../geanyvc/src/geanyvc.c:2297 +#: ../geanyvc/src/geanyvc.c:2353 msgid "Update from remote repository." msgstr "外部のレポジトリから更新" #. Commit all changes -#: ../geanyvc/src/geanyvc.c:2302 +#: ../geanyvc/src/geanyvc.c:2358 msgid "_Commit" msgstr "コミット(_C)" -#: ../geanyvc/src/geanyvc.c:2304 +#: ../geanyvc/src/geanyvc.c:2360 msgid "Commit changes." msgstr "変更を反映" @@ -4544,7 +4675,8 @@ "Unable to paste the code. Check your connection and retry.\n" "Error code: %d\n" msgstr "" -"コードの貼り付けができません。インターネット接続を確認してもう一度実行します。\n" +"コードの貼り付けができません。インターネット接続を確認してもう一度実行しま" +"す。\n" "エラーコード: %d\n" #: ../geniuspaste/src/geniuspaste.c:416 @@ -4658,97 +4790,253 @@ msgid "" "Note: set the patterns of files belonging to the project under the Project " "tab." -msgstr "注: プロジェクトタブにプロジェクトに所属するファイルのパターンを設定します" +msgstr "" +"注: プロジェクトタブにプロジェクトに所属するファイルのパターンを設定します" -#: ../gproject/src/gproject-sidebar.c:81 -#: ../gproject/src/gproject-sidebar.c:792 +#: ../gproject/src/gproject-sidebar.c:90 +#: ../gproject/src/gproject-sidebar.c:838 msgid "Find File" msgstr "ファイルを検索" -#: ../gproject/src/gproject-sidebar.c:108 +#: ../gproject/src/gproject-sidebar.c:117 msgid "Search inside:" msgstr "検索範囲:" -#: ../gproject/src/gproject-sidebar.c:120 +#: ../gproject/src/gproject-sidebar.c:129 msgid "C_ase sensitive" msgstr "大文字小文字を区別(_A)" -#: ../gproject/src/gproject-sidebar.c:123 +#: ../gproject/src/gproject-sidebar.c:132 msgid "Search in full path" msgstr "完全パスで検索" -#: ../gproject/src/gproject-sidebar.c:702 +#: ../gproject/src/gproject-sidebar.c:745 msgid "Reload all" msgstr "すべて読み直し" -#: ../gproject/src/gproject-sidebar.c:711 -#: ../treebrowser/src/treebrowser.c:1282 +#: ../gproject/src/gproject-sidebar.c:754 +#: ../treebrowser/src/treebrowser.c:1281 msgid "Expand all" msgstr "すべて展開" -#: ../gproject/src/gproject-sidebar.c:717 -#: ../treebrowser/src/treebrowser.c:1286 +#: ../gproject/src/gproject-sidebar.c:761 +#: ../treebrowser/src/treebrowser.c:1285 msgid "Collapse all" msgstr "すべて閉じる" -#: ../gproject/src/gproject-sidebar.c:726 +#: ../gproject/src/gproject-sidebar.c:771 msgid "Follow active editor" msgstr "アクティブなエディタに従う" -#: ../gproject/src/gproject-sidebar.c:774 +#: ../gproject/src/gproject-sidebar.c:820 msgid "Expand All" msgstr "すべて展開" -#: ../gproject/src/gproject-sidebar.c:783 -#: ../treebrowser/src/treebrowser.c:1234 +#: ../gproject/src/gproject-sidebar.c:829 msgid "Find in Files" msgstr "複数ファイルを検索" #. POSITION OF VIEW -#: ../markdown/src/conf.c:570 +#: ../markdown/src/conf.c:567 msgid "Position:" msgstr "位置:" -#: ../markdown/src/conf.c:576 +#: ../markdown/src/conf.c:573 msgid "Sidebar" msgstr "サイドバー" -#: ../markdown/src/conf.c:584 +#: ../markdown/src/conf.c:581 msgid "Message Window" msgstr "メッセージウィンドウ" -#: ../markdown/src/conf.c:598 +#: ../markdown/src/conf.c:595 msgid "Font:" msgstr "フォント:" -#: ../markdown/src/conf.c:616 +#: ../markdown/src/conf.c:612 msgid "Code Font:" msgstr "コードフォント:" -#: ../markdown/src/conf.c:634 +#: ../markdown/src/conf.c:629 msgid "BG Color:" msgstr "背景色:" -#: ../markdown/src/conf.c:651 +#: ../markdown/src/conf.c:645 msgid "FG Color:" msgstr "前景色:" -#: ../markdown/src/conf.c:670 +#: ../markdown/src/conf.c:663 msgid "Select Template File" msgstr "作業ファイルを選択" -#: ../markdown/src/plugin.c:33 +#: ../markdown/src/plugin.c:35 msgid "Real-time Markdown preview" msgstr "リアルタイム マークダウン プレビュー" -#: ../markdown/src/plugin.c:49 +#: ../markdown/src/plugin.c:51 msgid "Markdown Preview" msgstr "マークダウン プレビュー" -#: ../markdown/src/plugin.c:160 +#: ../markdown/src/plugin.c:162 msgid "The current document does not have a Markdown filetype." msgstr "現在の文書はマークダウンファイルではありません" +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:35 +msgid "Pair Tag Highlighter" +msgstr "" + +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:36 +msgid "Finds and highlights matching opening/closing HTML tag" +msgstr "" + +#: ../pohelper/data/menus.ui.h:1 +msgid "_Translation Helper" +msgstr "" + +#: ../pohelper/data/menus.ui.h:2 +msgid "_Previous String" +msgstr "" + +#: ../pohelper/data/menus.ui.h:3 ../pohelper/src/gph-plugin.c:1031 +#, fuzzy +msgid "Go to previous string" +msgstr "前の頁に移動" + +#: ../pohelper/data/menus.ui.h:4 +msgid "_Next String" +msgstr "" + +#: ../pohelper/data/menus.ui.h:5 ../pohelper/src/gph-plugin.c:1034 +#, fuzzy +msgid "Go to next string" +msgstr "次の頁に移動" + +#: ../pohelper/data/menus.ui.h:6 +msgid "Pre_vious Untranslated" +msgstr "" + +#: ../pohelper/data/menus.ui.h:7 ../pohelper/src/gph-plugin.c:1037 +msgid "Go to previous untranslated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:8 +msgid "Next _Untranslated" +msgstr "" + +#: ../pohelper/data/menus.ui.h:9 ../pohelper/src/gph-plugin.c:1040 +msgid "Go to next untranslated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:10 +msgid "Previous Fu_zzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:11 ../pohelper/src/gph-plugin.c:1043 +msgid "Go to previous fuzzily translated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:12 +msgid "Next _Fuzzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:13 ../pohelper/src/gph-plugin.c:1046 +msgid "Go to next fuzzily translated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:14 +msgid "Previous Untranslated or Fuzz_y" +msgstr "" + +#: ../pohelper/data/menus.ui.h:15 ../pohelper/src/gph-plugin.c:1049 +msgid "Go to previous untranslated or fuzzy string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:16 +msgid "Next Untranslated _or Fuzzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:17 ../pohelper/src/gph-plugin.c:1053 +msgid "Go to next untranslated or fuzzy string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:18 ../pohelper/src/gph-plugin.c:1064 +#, fuzzy +msgid "Toggle current translation fuzziness" +msgstr "文書タブを切り替え" + +#: ../pohelper/data/menus.ui.h:19 +msgid "_Toggle Fuzziness" +msgstr "" + +#: ../pohelper/data/menus.ui.h:20 +msgid "Paste _Message as Translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:21 +msgid "Paste the original untranslated string to the translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:22 ../pohelper/src/gph-plugin.c:1061 +msgid "Reflow the current translation string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:23 +msgid "_Reflow Translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:24 +msgid "" +"Whether to update the translation headers (author, revision date, ...) upon " +"file save" +msgstr "" + +#: ../pohelper/data/menus.ui.h:25 +msgid "Update _Headers Upon Save" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:41 +msgid "Translation Helper" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:42 +msgid "Improves support for GetText translation files." +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1057 +msgid "Paste original untranslated string to translation" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1099 +#, fuzzy, c-format +msgid "Failed to load configuration file: %s" +msgstr "設定の読み込みに失敗: %s" + +#: ../pohelper/src/gph-plugin.c:1124 +#, fuzzy, c-format +msgid "Failed to create configuration directory \"%s\": %s" +msgstr "ファイル種類 \"%s\" 向けの設定ファイルが見つかりません: %s" + +#: ../pohelper/src/gph-plugin.c:1127 +#, fuzzy, c-format +msgid "Failed to save configuration file: %s" +msgstr "設定の保存に失敗: %s" + +#: ../pohelper/src/gph-plugin.c:1182 +#, fuzzy, c-format +msgid "" +"Failed to load UI definition, please check your installation. The error was: " +"%s" +msgstr "" +"プラグイン %s のロードに失敗。\n" +"インストールを確認してください。" + +#: ../pohelper/src/gph-plugin.c:1222 +#, c-format +msgid "" +"Cannot find widget \"%s\" in the UI definition, please check your " +"installation." +msgstr "" + #: ../pretty-printer/src/PluginEntry.c:37 msgid "XML PrettyPrinter" msgstr "XML整形" @@ -5085,255 +5373,331 @@ msgstr "2進(_B)" #: ../scope/data/scope.glade.h:64 +msgid "_Raw" +msgstr "" + +#: ../scope/data/scope.glade.h:65 msgid "_Evaluate/Modify" msgstr "評価/修正(_E)" -#: ../scope/data/scope.glade.h:65 +#: ../scope/data/scope.glade.h:66 msgid "_Watch Expression" msgstr "式をウォッチ(_W)" -#: ../scope/data/scope.glade.h:66 +#: ../scope/data/scope.glade.h:67 msgid "_Inspect Variable" msgstr "変数を検査(_I)" -#: ../scope/data/scope.glade.h:67 -msgid "Program Terminal" -msgstr "プログラム端末" - #: ../scope/data/scope.glade.h:68 msgid "Threads" msgstr "スレッド" -#: ../scope/data/scope.glade.h:70 +#: ../scope/data/scope.glade.h:69 msgid "Stack" msgstr "スタック" -#: ../scope/data/scope.glade.h:71 +#: ../scope/data/scope.glade.h:70 msgid "Locals" msgstr "ロケール" -#: ../scope/data/scope.glade.h:72 +#: ../scope/data/scope.glade.h:71 msgid "Watches" msgstr "監視" -#: ../scope/data/scope.glade.h:73 +#: ../scope/data/scope.glade.h:72 msgid "Memory" msgstr "メモリ" -#: ../scope/data/scope.glade.h:74 -msgid "Debug Console" -msgstr "デバッグコンソール" - -#: ../scope/data/scope.glade.h:75 +#: ../scope/data/scope.glade.h:73 msgid "Enter gdb command:" msgstr "GDB コマンドを入力:" -#: ../scope/data/scope.glade.h:76 +#: ../scope/data/scope.glade.h:74 msgid "Convert _UTF-8 to locale" msgstr "_UTF-8をロケールに変換" -#: ../scope/data/scope.glade.h:77 +#: ../scope/data/scope.glade.h:75 msgid "_Thread" msgstr "スレッド(_T)" -#: ../scope/data/scope.glade.h:78 +#: ../scope/data/scope.glade.h:76 msgid "_Group" msgstr "グループ(_G)" -#: ../scope/data/scope.glade.h:79 +#: ../scope/data/scope.glade.h:77 msgid "_Frame" msgstr "フレーム(_F)" -#: ../scope/data/scope.glade.h:80 +#: ../scope/data/scope.glade.h:78 msgid "Setup Program" msgstr "プログラムを設定" -#: ../scope/data/scope.glade.h:81 +#: ../scope/data/scope.glade.h:79 msgid "_Executable:" msgstr "実行ファイル(_E):" -#: ../scope/data/scope.glade.h:82 +#: ../scope/data/scope.glade.h:80 msgid "_Arguments:" msgstr "引数(_A):" -#: ../scope/data/scope.glade.h:83 +#: ../scope/data/scope.glade.h:81 msgid "En_vironment:" msgstr "環境(_V):" -#: ../scope/data/scope.glade.h:84 +#: ../scope/data/scope.glade.h:82 msgid "_Working dir:" msgstr "作業ディレクトリ(_W):" -#: ../scope/data/scope.glade.h:85 +#: ../scope/data/scope.glade.h:83 msgid "_Load script:" msgstr "スクリプトを読込(_L):" -#: ../scope/data/scope.glade.h:86 +#: ../scope/data/scope.glade.h:84 msgid "Auto _run program/exit gdb" msgstr "自動起動プログラム/gdbを終了(_R)" -#: ../scope/data/scope.glade.h:87 +#: ../scope/data/scope.glade.h:85 msgid "_Non-stop mode" msgstr "ノンストップモード(_N)" -#: ../scope/data/scope.glade.h:88 -msgid "_Temporary breakpoint at:" +#: ../scope/data/scope.glade.h:86 +#, fuzzy +msgid "_Temporary breakpoint on load at:" msgstr "一時的なブレークポイント(_T):" -#: ../scope/data/scope.glade.h:89 -msgid "_Delete all breakpoints, watches and inspects" +#: ../scope/data/scope.glade.h:87 +#, fuzzy +msgid "_Delete all breakpoints, watches, inspects and registers" msgstr "全てのブレークポイント,ウォッチ,検査を削除(_D)" -#: ../scope/data/scope.glade.h:90 ../scope/src/prefs.c:337 +#: ../scope/data/scope.glade.h:88 ../scope/src/scope.c:522 msgid "Program" msgstr "プログラム" -#: ../scope/data/scope.glade.h:91 +#: ../scope/data/scope.glade.h:89 msgid "Open on" msgstr "開く" -#: ../scope/data/scope.glade.h:92 +#: ../scope/data/scope.glade.h:90 msgid "g_db load" msgstr "g_db ロード" -#: ../scope/data/scope.glade.h:93 +#: ../scope/data/scope.glade.h:91 msgid "p_rogram start" msgstr "プログラム開始(_R)" -#: ../scope/data/scope.glade.h:94 +#: ../scope/data/scope.glade.h:92 msgid "Update all _views" msgstr "全ての表示を更新(_V)" -#: ../scope/data/scope.glade.h:95 +#: ../scope/data/scope.glade.h:93 msgid "Panel" msgstr "パネル" -#: ../scope/data/scope.glade.h:96 +#: ../scope/data/scope.glade.h:94 msgid "Default 8-bit text mode:" msgstr "標準8ビットテキストモード:" -#: ../scope/data/scope.glade.h:97 +#: ../scope/data/scope.glade.h:95 msgid "_7-bit \\nnn" msgstr "_7ビット \\nnn" -#: ../scope/data/scope.glade.h:98 +#: ../scope/data/scope.glade.h:96 msgid "Display" msgstr "表示" -#: ../scope/data/scope.glade.h:99 +#: ../scope/data/scope.glade.h:97 msgid "_member" msgstr "メンバー(_M)" -#: ../scope/data/scope.glade.h:100 +#: ../scope/data/scope.glade.h:98 msgid "and" msgstr "および" -#: ../scope/data/scope.glade.h:101 +#: ../scope/data/scope.glade.h:99 msgid "_argument" msgstr "引数(_A)" -#: ../scope/data/scope.glade.h:102 +#: ../scope/data/scope.glade.h:100 msgid "names" msgstr "名前" -#: ../scope/data/scope.glade.h:103 +#: ../scope/data/scope.glade.h:101 msgid "Values" msgstr "値" -#: ../scope/data/scope.glade.h:104 +#: ../scope/data/scope.glade.h:102 msgid "E_xpand on apply" msgstr "展開(_X)" -#: ../scope/data/scope.glade.h:105 +#: ../scope/data/scope.glade.h:103 msgid "S_how" msgstr "表示(_H)" -#: ../scope/data/scope.glade.h:106 +#: ../scope/data/scope.glade.h:104 msgid "children" msgstr "子" -#: ../scope/data/scope.glade.h:107 +#: ../scope/data/scope.glade.h:105 msgid "Inspect" msgstr "検査" -#: ../scope/data/scope.glade.h:108 +#: ../scope/data/scope.glade.h:106 msgid "Show =li_brary messages" msgstr "表示 =ライブラリメッセージ(_I)" -#: ../scope/data/scope.glade.h:109 +#: ../scope/data/scope.glade.h:107 msgid "Show _tooltips" msgstr "ツールチップを表示(_T)" -#: ../scope/data/scope.glade.h:110 +#: ../scope/data/scope.glade.h:108 msgid "Others" msgstr "その他" -#: ../scope/data/scope.glade.h:111 +#: ../scope/data/scope.glade.h:109 msgid "Options" msgstr "オプション" -#: ../scope/data/scope.glade.h:112 +#: ../scope/data/scope.glade.h:110 msgid "_Import" msgstr "読み込み(_I)" -#: ../scope/data/scope.glade.h:113 +#: ../scope/data/scope.glade.h:111 msgid "Enter assignment expression:" msgstr "割当て式を入力:" -#: ../scope/data/scope.glade.h:114 +#: ../scope/data/scope.glade.h:112 msgid "Inspect" msgstr "検証" -#: ../scope/data/scope.glade.h:115 +#: ../scope/data/scope.glade.h:113 msgid "Object:" msgstr "オブジェクト:" -#: ../scope/data/scope.glade.h:117 +#: ../scope/data/scope.glade.h:115 msgid "-" msgstr "-" -#: ../scope/data/scope.glade.h:118 +#: ../scope/data/scope.glade.h:116 msgid "Frame:" msgstr "フレーム:" -#: ../scope/data/scope.glade.h:119 +#: ../scope/data/scope.glade.h:117 msgid "@" msgstr "@" -#: ../scope/data/scope.glade.h:120 +#: ../scope/data/scope.glade.h:118 msgid "_Apply on run" msgstr "実行時に適用(_A)" -#: ../scope/data/scope.glade.h:121 +#: ../scope/data/scope.glade.h:119 msgid "Expand" msgstr "展開" -#: ../scope/data/scope.glade.h:122 +#: ../scope/data/scope.glade.h:120 msgid "Start:" msgstr "開始:" -#: ../scope/data/scope.glade.h:123 +#: ../scope/data/scope.glade.h:121 msgid "Count:" msgstr "回数:" -#: ../scope/data/scope.glade.h:124 +#: ../scope/data/scope.glade.h:122 msgid "_Expand on apply" msgstr "適用時に展開(_E)" -#: ../scope/src/break.c:947 -#, c-format +#: ../scope/data/scope.glade.h:123 ../scope/src/scope.c:522 +msgid "Program Terminal" +msgstr "プログラム端末" + +#: ../scope/data/scope.glade.h:125 +msgid "Registers" +msgstr "" + +#: ../scope/src/break.c:97 +#, fuzzy +msgid "breakpoint" +msgstr "ブレークポイント" + +#: ../scope/src/break.c:98 +#, fuzzy +msgid "hardware breakpoint" +msgstr "ブレークポイントを修正" + +#: ../scope/src/break.c:99 +#, fuzzy +msgid "tracepoint" +msgstr "監視ポイント" + +#: ../scope/src/break.c:100 +#, fuzzy +msgid "fast tracepoint" +msgstr "監視ポイント" + +#: ../scope/src/break.c:101 +#, fuzzy +msgid "write watchpoint" +msgstr "監視ポイントを修正" + +#: ../scope/src/break.c:104 +#, fuzzy +msgid "access watchpoint" +msgstr "監視ポイント" + +#: ../scope/src/break.c:106 +#, fuzzy +msgid "read watchpoint" +msgstr "監視ポイントを修正" + +#: ../scope/src/break.c:108 +#, fuzzy +msgid "catchpoint" +msgstr "監視ポイント" + +#: ../scope/src/break.c:135 ../scope/src/break.c:139 +msgid "CLI" +msgstr "" + +#: ../scope/src/break.c:136 +#, fuzzy +msgid "unsupported MI" +msgstr "ソートしない(_U)" + +#: ../scope/src/break.c:141 +#, fuzzy +msgid "on load" +msgstr "g_db ロード" + +#: ../scope/src/break.c:142 +#, fuzzy +msgid "Run to Cursor" +msgstr "カーソル位置まで実行(_C)" + +#: ../scope/src/break.c:1013 +#, fuzzy, c-format msgid "" "There are two or more breakpoints at %s:%d.\n" +"\n" "Use the breakpoint list to remove the exact one." msgstr "" "%s:%d に複数のブレークポイントがあります。\n" "ブレークポイントリストより1つに変更してください。" -#: ../scope/src/break.c:1200 +#: ../scope/src/break.c:1252 +#, c-format +msgid ", %s" +msgstr "" + +#: ../scope/src/break.c:1278 +#, c-format +msgid "func %s" +msgstr "" + +#: ../scope/src/break.c:1309 msgid "Add Breakpoint" msgstr "ブレークポイントを追加" -#: ../scope/src/break.c:1215 +#: ../scope/src/break.c:1324 msgid "Add Watchpoint" msgstr "監視ポイントを追加" @@ -5345,7 +5709,8 @@ msgid "Enter char # (0..255):" msgstr "文字コード(0...255)を入力:" -#: ../scope/src/conterm.c:466 ../scope/src/scope.c:502 +#: ../scope/src/conterm.c:509 ../scope/src/scope.c:550 +#: ../scope/src/scope.c:551 #, c-format msgid "Scope: %s." msgstr "スコープ: %s" @@ -5364,60 +5729,61 @@ msgid "Program terminated." msgstr "プログラムは終了しました。" -#: ../scope/src/debug.c:468 +#: ../scope/src/debug.c:469 msgid "No breakpoints. Hanging." msgstr "ブレークポイントがありません。中止。" -#: ../scope/src/debug.c:596 ../scope/src/thread.c:97 +#: ../scope/src/debug.c:598 ../scope/src/thread.c:92 #, c-format msgid "%s." msgstr "%s." -#: ../scope/src/inspect.c:77 +#: ../scope/src/inspect.c:66 msgid "..." msgstr "..." -#: ../scope/src/inspect.c:324 +#: ../scope/src/inspect.c:339 msgid "invalid data" msgstr "無効なデータ" -#: ../scope/src/inspect.c:356 +#: ../scope/src/inspect.c:371 msgid "no children in range" msgstr "範囲に子がありません" -#: ../scope/src/inspect.c:440 +#: ../scope/src/inspect.c:454 msgid "out of scope" msgstr "スコープ範囲外" -#: ../scope/src/inspect.c:587 +#: ../scope/src/inspect.c:627 msgid "Duplicate inspect variable name." msgstr "検査変数名が重複" -#: ../scope/src/memory.c:299 +#: ../scope/src/memory.c:292 msgid "Read Memory" msgstr "メモリを読み込み" -#: ../scope/src/memory.c:408 -msgid "Scope: pointer size > 8, Data disabled." +#: ../scope/src/memory.c:396 +#, fuzzy, c-format +msgid "Scope: pointer size > %d, Data disabled." msgstr "スコープ: ポインタサイズ > 8, データ無効" -#: ../scope/src/menu.c:380 +#: ../scope/src/menu.c:375 msgid "Modify" msgstr "修正" -#: ../scope/src/menu.c:490 +#: ../scope/src/menu.c:481 msgid "Evaluate/modify" msgstr "評価/修正" -#: ../scope/src/menu.c:491 +#: ../scope/src/menu.c:482 msgid "Watch expression" msgstr "式を監視" -#: ../scope/src/menu.c:492 +#: ../scope/src/menu.c:483 msgid "Inspect variable" msgstr "変数を検査" -#: ../scope/src/parse.c:416 +#: ../scope/src/parse.c:437 msgid "Undefined GDB error." msgstr "未定義GDBエラー" @@ -5429,34 +5795,26 @@ msgid "Select File" msgstr "ファイルを選択" -#: ../scope/src/prefs.c:338 -msgid "Breaks" -msgstr "ブレーク" - -#: ../scope/src/prefs.c:339 -msgid "Console" -msgstr "コンソール" - -#: ../scope/src/prefs.c:347 ../scope/src/utils.c:570 +#: ../scope/src/prefs.c:294 ../scope/src/utils.c:438 #, c-format msgid "Scope: %s: %s." msgstr "スコープ: %s: %s." -#: ../scope/src/prefs.c:352 +#: ../scope/src/prefs.c:299 msgid "Scope: created configuration file." msgstr "スコープ: 設定ファイルを生成しました。" -#: ../scope/src/program.c:231 +#: ../scope/src/program.c:251 #, c-format msgid "Loaded debug settings for %s." msgstr "%s 用のデバッグ設定を読み込みました" -#: ../scope/src/program.c:239 +#: ../scope/src/program.c:259 #, c-format msgid "Could not load debug settings file %s: %s." msgstr "デバッグ設定ファイル %s の読み込みに失敗: %s" -#: ../scope/src/program.c:359 +#: ../scope/src/program.c:379 #, c-format msgid "" "%s: %s.\n" @@ -5467,15 +5825,16 @@ "\n" "継続しますか?" -#: ../scope/src/program.c:394 -msgid "Delete all breakpoints, watches and inspects?" +#: ../scope/src/program.c:415 +#, fuzzy +msgid "Delete all breakpoints, watches et cetera?" msgstr "全てのブレークポイント、監視、検査を削除しますか?" -#: ../scope/src/program.c:501 +#: ../scope/src/program.c:523 msgid "as _Name=value" msgstr "_Name=value として" -#: ../scope/src/program.c:502 +#: ../scope/src/program.c:524 msgid "as _Name = value" msgstr "_Name = value として" @@ -5484,157 +5843,170 @@ msgstr "スコープデバッガ" #: ../scope/src/scope.c:35 -msgid "Simple GDB front-end." +#, fuzzy +msgid "Relatively simple GDB front-end." msgstr "シンプルなGDBフロントエンド." -#: ../scope/src/scope.c:63 +#: ../scope/src/scope.c:62 msgid "Setup program" msgstr "プログラムを設定" -#: ../scope/src/scope.c:64 +#: ../scope/src/scope.c:63 msgid "Run/continue" msgstr "実行/継続" -#: ../scope/src/scope.c:66 +#: ../scope/src/scope.c:65 msgid "Run to source" msgstr "ソース位置まで実行" -#: ../scope/src/scope.c:70 +#: ../scope/src/scope.c:69 msgid "Terminate" msgstr "終了" -#: ../scope/src/scope.c:71 +#: ../scope/src/scope.c:70 msgid "Toggle breakpoint" msgstr "ブレークポイントを切り替え" -#: ../scope/src/scope.c:73 ../scope/src/scope.c:76 +#: ../scope/src/scope.c:72 ../scope/src/scope.c:75 msgid "GDB command" msgstr "GDBコマンド" -#: ../scope/src/scope.c:74 +#: ../scope/src/scope.c:73 msgid "Show terminal" msgstr "端末を表示" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Busy" msgstr "ビジー" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Ready" msgstr "レディ" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Hang" msgstr "ハング" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Assem" msgstr "Assem" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Load" msgstr "ロード" -#: ../scope/src/scope.c:394 +#: ../scope/src/scope.c:421 msgid "Build action activated. Terminate debugging?" msgstr "ビルドがアクティブになりました.デバッグを終了しますか?" -#: ../scope/src/thread.c:58 +#: ../scope/src/scope.c:524 +msgid "Breaks" +msgstr "ブレーク" + +#: ../scope/src/scope.c:526 +msgid "Console" +msgstr "コンソール" + +#: ../scope/src/scope.c:526 +msgid "Debug Console" +msgstr "デバッグコンソール" + +#: ../scope/src/thread.c:48 #, c-format msgid "Thread group %s started." msgstr "スレッドグループ %s を開始しました。" -#: ../scope/src/thread.c:76 +#: ../scope/src/thread.c:63 msgid "Thread group " msgstr "スレッドグループ " -#: ../scope/src/thread.c:88 +#: ../scope/src/thread.c:83 msgid " exited" msgstr " 終了" -#: ../scope/src/thread.c:91 +#: ../scope/src/thread.c:86 #, c-format msgid " with exit code %s" msgstr " コード %s で終了" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 msgid "Send Signal" msgstr "シグナルを送信" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 msgid "Enter signal #:" msgstr "シグナル番号を入力:" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Terminate Process" msgstr "プロセスを終了" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Enter exit code:" msgstr "終了コードを入力:" -#: ../scope/src/thread.c:937 +#: ../scope/src/thread.c:891 msgid "Running" msgstr "実行中" -#: ../scope/src/thread.c:938 +#: ../scope/src/thread.c:892 msgid "Stopped" msgstr "停止" -#: ../scope/src/utils.c:44 -#, c-format -msgid "%s: error %lu." -msgstr "%s: エラー %lu。" +#: ../scope/src/utils.c:45 +#, fuzzy, c-format +msgid "%s: %s" +msgstr "%s: %s." -#: ../scope/src/utils.c:358 +#: ../scope/src/utils.c:225 #, c-format msgid "Scope: error reading [%s]." msgstr "スコープ: [%s] 読み込み中にエラー。" -#: ../scope/src/views.c:505 +#: ../scope/src/views.c:526 msgid "…" msgstr "..." -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Send" msgstr "送信(_S)" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Busy" msgstr "ビジー(_B)" -#: ../scope/src/views.c:535 +#: ../scope/src/views.c:558 msgid "GDB Command" msgstr "GDBコマンド" -#: ../spellcheck/src/speller.c:94 +#: ../spellcheck/src/speller.c:180 msgid "Try: " msgstr "候補: " -#: ../spellcheck/src/speller.c:173 +#: ../spellcheck/src/speller.c:252 msgid "Checking" msgstr "スペルチェック" -#: ../spellcheck/src/speller.c:186 +#: ../spellcheck/src/speller.c:265 #, c-format msgid "Checking file \"%s\" (lines %d to %d using %s):" msgstr "ファイル \"%s\" を検査( %d から %d 行目に %s を使用):" -#: ../spellcheck/src/speller.c:196 +#: ../spellcheck/src/speller.c:275 #, c-format msgid "Checking file \"%s\" (using %s):" msgstr "ファイル \"%s\" を検査(%s を使用):" -#: ../spellcheck/src/speller.c:223 +#: ../spellcheck/src/speller.c:302 msgid "The checked text is spelled correctly." msgstr "検査した文字の綴りは正しいです。" -#: ../spellcheck/src/speller.c:233 +#: ../spellcheck/src/speller.c:312 #, c-format msgid "The Enchant library couldn't be initialized (%s)." msgstr "Enchantライブラリを初期化できません(%s)。" -#: ../spellcheck/src/speller.c:234 +#: ../spellcheck/src/speller.c:313 msgid "unknown error (maybe the chosen language is not available)" msgstr "不明なエラー(選択した言語は利用できません)" @@ -5728,17 +6100,17 @@ msgid "Ignore All" msgstr "すべて無視" -#: ../spellcheck/src/gui.c:521 +#: ../spellcheck/src/gui.c:526 #, c-format msgid "Default (%s)" msgstr "標準 (%s)" -#: ../spellcheck/src/gui.c:532 +#: ../spellcheck/src/gui.c:537 #, c-format msgid "Toggle spell check while typing (current language: %s)" msgstr "入力中のスペルチェックを有効/無効(現在の言語: %s)" -#: ../spellcheck/src/gui.c:587 +#: ../spellcheck/src/gui.c:592 msgid "Spelling Suggestions" msgstr "正しい単語の候補" @@ -5769,28 +6141,28 @@ #. OK. Something went not as expected. #. * We did have a selection but cannot parse it into rows. #. * Aborting -#: ../tableconvert/src/tableconvert.c:236 +#: ../tableconvert/src/tableconvert.c:237 msgid "Something went wrong on parsing selection. Aborting" msgstr "不明なエラーのため中断" -#: ../tableconvert/src/tableconvert.c:268 +#: ../tableconvert/src/tableconvert.c:269 msgid "Convert selection to table" msgstr "選択範囲をテーブルに変換" #. Build up menu entry -#: ../tableconvert/src/tableconvert.c:281 +#: ../tableconvert/src/tableconvert.c:282 msgid "_Convert to table" msgstr "テーブルに変換(_C)" -#: ../tableconvert/src/tableconvert.c:284 +#: ../tableconvert/src/tableconvert.c:285 msgid "Converts current marked list to a table." msgstr "現在マークしたリストをテーブルに変換." -#: ../treebrowser/src/treebrowser.c:120 +#: ../treebrowser/src/treebrowser.c:124 msgid "TreeBrowser" msgstr "ツリーブラウザ" -#: ../treebrowser/src/treebrowser.c:121 +#: ../treebrowser/src/treebrowser.c:125 msgid "" "This plugin adds a tree browser to Geany, allowing the user to browse files " "using a tree view of the directory being browsed." @@ -5798,30 +6170,30 @@ "このプラグインはGeanyにツリーブラウザを追加し、ディレクトリをツリービューに表" "示して、ユーザがファイルを選択できるようにします。" -#: ../treebrowser/src/treebrowser.c:430 +#: ../treebrowser/src/treebrowser.c:434 #, c-format msgid "%s: no such directory." msgstr "%s: ディレクトリがありません" -#: ../treebrowser/src/treebrowser.c:526 ../treebrowser/src/treebrowser.c:561 -#: ../treebrowser/src/treebrowser.c:663 +#: ../treebrowser/src/treebrowser.c:537 ../treebrowser/src/treebrowser.c:572 +#: ../treebrowser/src/treebrowser.c:670 msgid "(Empty)" msgstr "(空)" -#: ../treebrowser/src/treebrowser.c:966 +#: ../treebrowser/src/treebrowser.c:971 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "設定済みの外部コマンド '%s' が実行できません (%s)." -#: ../treebrowser/src/treebrowser.c:1037 +#: ../treebrowser/src/treebrowser.c:1042 msgid "NewDirectory" msgstr "新規ディレクトリ" -#: ../treebrowser/src/treebrowser.c:1039 +#: ../treebrowser/src/treebrowser.c:1044 msgid "NewFile" msgstr "新規ファイル" -#: ../treebrowser/src/treebrowser.c:1044 +#: ../treebrowser/src/treebrowser.c:1049 #, c-format msgid "" "Target file '%s' exists\n" @@ -5830,96 +6202,103 @@ "対象ファイル '%s' が存在します。\n" "このファイルを空のファイルで上書きしてもいいですか?" -#: ../treebrowser/src/treebrowser.c:1089 +#: ../treebrowser/src/treebrowser.c:1095 #, c-format msgid "Do you really want to delete '%s' ?" msgstr "'%s' を削除してもよいですか?" -#: ../treebrowser/src/treebrowser.c:1208 ../treebrowser/src/treebrowser.c:1692 +#: ../treebrowser/src/treebrowser.c:1207 ../treebrowser/src/treebrowser.c:1738 msgid "Go up" msgstr "上に移動" -#: ../treebrowser/src/treebrowser.c:1212 ../treebrowser/src/treebrowser.c:1707 +#: ../treebrowser/src/treebrowser.c:1211 ../treebrowser/src/treebrowser.c:1753 msgid "Set path from document" msgstr "文書からパスを設定" -#: ../treebrowser/src/treebrowser.c:1216 -msgid "Open externally" +#: ../treebrowser/src/treebrowser.c:1215 +#, fuzzy +msgid "_Open externally" msgstr "外部アプリケーションで開く" -#: ../treebrowser/src/treebrowser.c:1221 +#: ../treebrowser/src/treebrowser.c:1220 msgid "Open Terminal" msgstr "端末で開く" -#: ../treebrowser/src/treebrowser.c:1225 +#: ../treebrowser/src/treebrowser.c:1224 msgid "Set as root" msgstr "rootに設定" -#: ../treebrowser/src/treebrowser.c:1230 ../treebrowser/src/treebrowser.c:1697 -#: ../treebrowser/src/treebrowser.c:2060 +#: ../treebrowser/src/treebrowser.c:1229 ../treebrowser/src/treebrowser.c:1743 +#: ../treebrowser/src/treebrowser.c:2123 msgid "Refresh" msgstr "表示を更新" -#: ../treebrowser/src/treebrowser.c:1242 +#: ../treebrowser/src/treebrowser.c:1233 +#, fuzzy +msgid "_Find in Files" +msgstr "複数ファイルを検索" + +#: ../treebrowser/src/treebrowser.c:1241 msgid "Create new directory" msgstr "ディレクトリを作成" -#: ../treebrowser/src/treebrowser.c:1246 +#: ../treebrowser/src/treebrowser.c:1245 msgid "Create new file" msgstr "ファイルを作成" -#: ../treebrowser/src/treebrowser.c:1250 +#: ../treebrowser/src/treebrowser.c:1249 msgid "Rename" msgstr "名前変更" -#: ../treebrowser/src/treebrowser.c:1255 +#: ../treebrowser/src/treebrowser.c:1254 msgid "Delete" msgstr "削除" -#: ../treebrowser/src/treebrowser.c:1263 +#: ../treebrowser/src/treebrowser.c:1262 #, c-format msgid "Close: %s" msgstr "閉じる: %s" -#: ../treebrowser/src/treebrowser.c:1268 +#: ../treebrowser/src/treebrowser.c:1267 #, c-format msgid "Close Child Documents " msgstr "下位の文書を閉じる" -#: ../treebrowser/src/treebrowser.c:1273 -msgid "Copy full path to clipboard" +#: ../treebrowser/src/treebrowser.c:1272 +#, fuzzy +msgid "_Copy full path to clipboard" msgstr "完全パスをクリップボードにコピー" -#: ../treebrowser/src/treebrowser.c:1293 ../treebrowser/src/treebrowser.c:1974 +#: ../treebrowser/src/treebrowser.c:1292 ../treebrowser/src/treebrowser.c:2032 msgid "Show bookmarks" msgstr "ブックマークを表示" -#: ../treebrowser/src/treebrowser.c:1298 ../treebrowser/src/treebrowser.c:1928 +#: ../treebrowser/src/treebrowser.c:1297 ../treebrowser/src/treebrowser.c:1981 msgid "Show hidden files" msgstr "隠しファイルを表示" -#: ../treebrowser/src/treebrowser.c:1303 +#: ../treebrowser/src/treebrowser.c:1302 msgid "Show toolbars" msgstr "ツールバーを表示" -#: ../treebrowser/src/treebrowser.c:1574 +#: ../treebrowser/src/treebrowser.c:1621 #, c-format msgid "Target file '%s' exists, do you really want to replace it?" msgstr "対象ファイル '%s' が存在します。置き換えてもいいですか?" -#: ../treebrowser/src/treebrowser.c:1702 +#: ../treebrowser/src/treebrowser.c:1748 msgid "Home" msgstr "ホーム" -#: ../treebrowser/src/treebrowser.c:1712 +#: ../treebrowser/src/treebrowser.c:1758 msgid "Track path" msgstr "パスを記録" -#: ../treebrowser/src/treebrowser.c:1717 +#: ../treebrowser/src/treebrowser.c:1763 msgid "Hide bars" msgstr "バーを隠す" -#: ../treebrowser/src/treebrowser.c:1727 +#: ../treebrowser/src/treebrowser.c:1773 msgid "" "Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' " "reverse try for example this '!;*.c;*.h;*.cpp'" @@ -5927,19 +6306,19 @@ "フィルタ(*.c;*.h;*.cpp)と '!' 反転を使った一時フィルタを使用するには次のよう" "にします '!;*.c;*.h;*.cpp'" -#: ../treebrowser/src/treebrowser.c:1735 +#: ../treebrowser/src/treebrowser.c:1781 msgid "Addressbar for example '/projects/my-project'" msgstr "アドレスバーの入力例 '/projects/my-project'" -#: ../treebrowser/src/treebrowser.c:1760 +#: ../treebrowser/src/treebrowser.c:1806 msgid "Tree Browser" msgstr "ツリーブラウザ" -#: ../treebrowser/src/treebrowser.c:1892 +#: ../treebrowser/src/treebrowser.c:1945 msgid "External open command" msgstr "他のプログラムで開く" -#: ../treebrowser/src/treebrowser.c:1897 +#: ../treebrowser/src/treebrowser.c:1950 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -5953,51 +6332,51 @@ "%f は完全パスを含むファイル名に置き換えられます。\n" "%d は選択したファイルがあるパス名に置き換えられます。" -#: ../treebrowser/src/treebrowser.c:1905 +#: ../treebrowser/src/treebrowser.c:1958 msgid "Toolbar" msgstr "ツールバー" -#: ../treebrowser/src/treebrowser.c:1907 +#: ../treebrowser/src/treebrowser.c:1960 msgid "Hidden" msgstr "非表示" -#: ../treebrowser/src/treebrowser.c:1908 +#: ../treebrowser/src/treebrowser.c:1961 msgid "Top" msgstr "上" -#: ../treebrowser/src/treebrowser.c:1909 +#: ../treebrowser/src/treebrowser.c:1962 msgid "Bottom" msgstr "下" -#: ../treebrowser/src/treebrowser.c:1914 +#: ../treebrowser/src/treebrowser.c:1967 msgid "If position is changed, the option require plugin restart." msgstr "位置を変更したときは、プラグインの再起動が必要です。" -#: ../treebrowser/src/treebrowser.c:1918 +#: ../treebrowser/src/treebrowser.c:1971 msgid "Show icons" msgstr "アイコンを表示" -#: ../treebrowser/src/treebrowser.c:1920 +#: ../treebrowser/src/treebrowser.c:1973 msgid "None" msgstr "なし" -#: ../treebrowser/src/treebrowser.c:1921 +#: ../treebrowser/src/treebrowser.c:1974 msgid "Base" msgstr "基本" -#: ../treebrowser/src/treebrowser.c:1922 +#: ../treebrowser/src/treebrowser.c:1975 msgid "Content-type" msgstr "内容" -#: ../treebrowser/src/treebrowser.c:1933 +#: ../treebrowser/src/treebrowser.c:1986 msgid "On Windows, this just hide files that are prefixed with '.' (dot)" msgstr "'.'(ドット)から始まるファイルを隠します" -#: ../treebrowser/src/treebrowser.c:1935 +#: ../treebrowser/src/treebrowser.c:1988 msgid "Hide object files" msgstr "オブジェクトファイルを表示しない" -#: ../treebrowser/src/treebrowser.c:1940 +#: ../treebrowser/src/treebrowser.c:1993 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -6005,47 +6384,56 @@ "ファイルブラウザにオブジェクトファイルを表示しません。除外されるファイルは *." "o, *.obj. *.so, *.dll, *.a, *.lib です。" -#: ../treebrowser/src/treebrowser.c:1942 +#: ../treebrowser/src/treebrowser.c:1995 msgid "Reverse filter" msgstr "フィルタを反転" -#: ../treebrowser/src/treebrowser.c:1947 +#: ../treebrowser/src/treebrowser.c:2000 msgid "Follow current document" msgstr "現在の文書のディレクトリに合わせる" -#: ../treebrowser/src/treebrowser.c:1952 +#: ../treebrowser/src/treebrowser.c:2005 msgid "Single click, open document and focus it" msgstr "シングルクリックで文書を表示" -#: ../treebrowser/src/treebrowser.c:1957 +#: ../treebrowser/src/treebrowser.c:2010 msgid "Double click open directory" msgstr "ダブルクリックでディレクトリを表示" -#: ../treebrowser/src/treebrowser.c:1962 +#: ../treebrowser/src/treebrowser.c:2015 msgid "On delete file, close it if is opened" msgstr "ファイル削除時に、開いていたら閉じる" -#: ../treebrowser/src/treebrowser.c:1967 +#: ../treebrowser/src/treebrowser.c:2020 +msgid "Focus editor on file open" +msgstr "" + +#: ../treebrowser/src/treebrowser.c:2025 msgid "Show tree lines" msgstr "ツリー行数を表示" -#: ../treebrowser/src/treebrowser.c:2050 +#: ../treebrowser/src/treebrowser.c:2037 +#, fuzzy +msgid "Open new files" +msgstr "ファイルを開く" + +#: ../treebrowser/src/treebrowser.c:2113 msgid "Focus File List" msgstr "ファイル覧に切り替え" -#: ../treebrowser/src/treebrowser.c:2052 +#: ../treebrowser/src/treebrowser.c:2115 msgid "Focus Path Entry" msgstr "パス入力に切り替え" -#: ../treebrowser/src/treebrowser.c:2054 +#: ../treebrowser/src/treebrowser.c:2117 msgid "Rename Object" msgstr "オブジェクトの名前変更" -#: ../treebrowser/src/treebrowser.c:2056 +#: ../treebrowser/src/treebrowser.c:2119 msgid "Create New File" msgstr "ファイルを作成" -#: ../treebrowser/src/treebrowser.c:2058 +#: ../treebrowser/src/treebrowser.c:2121 msgid "Create New Directory" msgstr "ディレクトリを作成" @@ -6113,44 +6501,44 @@ msgid "utility" msgstr "ユーティリティ" -#: ../webhelper/src/gwh-settings.c:775 +#: ../webhelper/src/gwh-settings.c:782 #, c-format msgid "%s:" msgstr "%s:" -#: ../webhelper/src/gwh-browser.c:528 +#: ../webhelper/src/gwh-browser.c:534 msgid "_Zoom" msgstr "ズーム(_Z)" -#: ../webhelper/src/gwh-browser.c:550 +#: ../webhelper/src/gwh-browser.c:556 msgid "Full-_content zoom" msgstr "内容全体にズーム(_C)" -#: ../webhelper/src/gwh-browser.c:561 +#: ../webhelper/src/gwh-browser.c:567 msgid "Flip panes orientation" msgstr "ペインの方向を切り替え" -#: ../webhelper/src/gwh-browser.c:808 +#: ../webhelper/src/gwh-browser.c:814 msgid "Back" msgstr "戻る" -#: ../webhelper/src/gwh-browser.c:812 +#: ../webhelper/src/gwh-browser.c:818 msgid "Forward" msgstr "進む" -#: ../webhelper/src/gwh-browser.c:816 +#: ../webhelper/src/gwh-browser.c:822 msgid "Cancel loading" msgstr "読み込みを中断" -#: ../webhelper/src/gwh-browser.c:820 +#: ../webhelper/src/gwh-browser.c:826 msgid "Reload current page" msgstr "現在のページを再読み込み" -#: ../webhelper/src/gwh-browser.c:833 ../webhelper/src/gwh-browser.c:879 +#: ../webhelper/src/gwh-browser.c:839 ../webhelper/src/gwh-browser.c:885 msgid "Web inspector" msgstr "Web検証" -#: ../webhelper/src/gwh-browser.c:834 +#: ../webhelper/src/gwh-browser.c:840 msgid "Toggle web inspector" msgstr "Web検証を切り替え" @@ -6288,6 +6676,9 @@ msgid "Autocompletes XML/HTML tags using snippets." msgstr "スニペットを使用してXML/HTMLタグを自動補完" +#~ msgid "%s: error %lu." +#~ msgstr "%s: エラー %lu。" + #~ msgid "Plugins" #~ msgstr "プラグイン" @@ -6360,9 +6751,6 @@ #~ msgid "tty temporary directory not specified!\n" #~ msgstr "tty 一時ディレクトリが指定されていません!\n" -#~ msgid "tty temporary directory not found!\n" -#~ msgstr "tty 一時ディレクトリがありません!\n" - #~ msgid "tty helper program not specified!\n" #~ msgstr "tty ヘルパープログラムが指定されていません!\n" @@ -6429,21 +6817,12 @@ #~ msgid "No %s selected" #~ msgstr "%s が選ばれていません" -#~ msgid "watchpoint" -#~ msgstr "監視ポイント" - #~ msgid "Delete selected watchpoint?" #~ msgstr "選択した監視ポイントを削除しますか?" #~ msgid "Delete selected breakpoint?" #~ msgstr "選択したブレークポイントを削除しますか?" -#~ msgid "Edit watchpoint" -#~ msgstr "監視ポイントを修正" - -#~ msgid "Edit breakpoint" -#~ msgstr "ブレークポイントを修正" - #~ msgid "Enabled" #~ msgstr "有効" @@ -6873,9 +7252,6 @@ #~ msgid "Couldn't create tempfile" #~ msgstr "一時ファイルを作成できません" -#~ msgid "GeanyPG" -#~ msgstr "GeanyPG" - #~ msgid "Lionel Fuentes" #~ msgstr "Lionel Fuentes" diff -Nru geany-plugins-1.23+dfsg/po/nl.po geany-plugins-1.24+dfsg/po/nl.po --- geany-plugins-1.23+dfsg/po/nl.po 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/po/nl.po 2014-04-13 13:33:33.000000000 +0000 @@ -1,13 +1,13 @@ # Dutch translations for geany-plugins package. # Copyright (C) 2011 THE geany-plugins'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany-plugins package. -# Peter Scholtens , 2011, 2013 +# Peter Scholtens , 2011, 2013-2014 # hans , 2011. msgid "" msgstr "" -"Project-Id-Version: Geany-plugins 1.23\n" +"Project-Id-Version: Geany-plugins 1.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-23 14:32+0100\n" +"POT-Creation-Date: 2014-03-30 19:33+0200\n" "PO-Revision-Date: 2011-09-13 20:24+0100\n" "Last-Translator: Peter Scholtens \n" "Language-Team: Dutch\n" @@ -34,12 +34,12 @@ msgid "Contents" msgstr "Inhoud" -#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:615 +#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:625 msgid "Bookmarks" msgstr "Bladwijzers" #. complete update -#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2295 +#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2351 msgid "_Update" msgstr "" @@ -76,15 +76,15 @@ msgid "Context:" msgstr "Context:" -#: ../addons/src/ao_xmltagging.c:56 +#: ../addons/src/ao_xmltagging.c:54 msgid "XML tagging" msgstr "XML labelen" -#: ../addons/src/ao_xmltagging.c:67 +#: ../addons/src/ao_xmltagging.c:65 msgid "Tag name to be inserted:" msgstr "In te voegen label naam:" -#: ../addons/src/ao_xmltagging.c:71 +#: ../addons/src/ao_xmltagging.c:69 #, c-format msgid "" "%s will be replaced with your current selection. Please keep care on your " @@ -140,11 +140,11 @@ #: ../addons/src/addons.c:296 msgid "Focus Bookmark List" -msgstr "Focus bladwijzerlijst" +msgstr "Schakel naar bladwijzerlijst" #: ../addons/src/addons.c:298 msgid "Focus Tasks List" -msgstr "Focus takenlijst" +msgstr "Schakel naar takenlijst" #: ../addons/src/addons.c:300 msgid "Update Tasks List" @@ -154,11 +154,12 @@ msgid "Run XML tagging" msgstr "XML labelen uitvoeren" -#: ../addons/src/addons.c:417 ../geanylatex/src/geanylatex.c:241 -#: ../geanyprj/src/geanyprj.c:174 ../geanysendmail/src/geanysendmail.c:121 -#: ../geanysendmail/src/geanysendmail.c:287 ../geanyvc/src/geanyvc.c:1798 +#: ../addons/src/addons.c:417 ../autoclose/src/autoclose.c:871 +#: ../geanylatex/src/geanylatex.c:241 ../geanyprj/src/geanyprj.c:174 +#: ../geanysendmail/src/geanysendmail.c:123 +#: ../geanysendmail/src/geanysendmail.c:291 ../geanyvc/src/geanyvc.c:1854 #: ../geniuspaste/src/geniuspaste.c:140 ../spellcheck/src/scplugin.c:146 -#: ../treebrowser/src/treebrowser.c:1880 +#: ../treebrowser/src/treebrowser.c:1933 #: ../updatechecker/src/updatechecker.c:253 msgid "Plugin configuration directory could not be created." msgstr "Plug-in configuratiemap kon niet worden aangemaakt." @@ -249,6 +250,15 @@ msgid "Enclose selection automatically (without having to press a keybinding)" msgstr "" +#: ../autoclose/src/autoclose.c:50 +#, fuzzy +msgid "Auto-close" +msgstr "Auteur:" + +#: ../autoclose/src/autoclose.c:51 +msgid "Auto-close braces and brackets with lot of features" +msgstr "" + #: ../codenav/src/codenavigation.c:52 msgid "Code navigation" msgstr "Code navigatie" @@ -316,8 +326,8 @@ msgid "Various debuggers integration." msgstr "" -#: ../debugger/src/plugin.c:131 ../debugger/src/keys.c:76 -#: ../scope/data/scope.glade.h:125 ../scope/src/scope.c:225 +#: ../debugger/src/plugin.c:133 ../debugger/src/keys.c:76 +#: ../scope/data/scope.glade.h:124 ../scope/src/scope.c:226 msgid "Debug" msgstr "" @@ -449,7 +459,7 @@ msgid "Target" msgstr "Doel" -#: ../debugger/src/tabs.c:135 ../scope/data/scope.glade.h:69 +#: ../debugger/src/tabs.c:135 ../scope/src/scope.c:524 msgid "Breakpoints" msgstr "Breekpunten" @@ -488,22 +498,22 @@ msgstr "Herstart" #: ../debugger/src/keys.c:52 ../debugger/src/btnpanel.c:113 -#: ../scope/src/scope.c:67 +#: ../scope/src/scope.c:66 msgid "Step into" msgstr "Stap erin" #: ../debugger/src/keys.c:53 ../debugger/src/btnpanel.c:110 -#: ../scope/src/scope.c:68 +#: ../scope/src/scope.c:67 msgid "Step over" msgstr "Stap over" #: ../debugger/src/keys.c:54 ../debugger/src/btnpanel.c:122 -#: ../scope/src/scope.c:69 +#: ../scope/src/scope.c:68 msgid "Step out" msgstr "Stap eruit" #: ../debugger/src/keys.c:55 ../debugger/src/btnpanel.c:125 -#: ../scope/src/scope.c:65 +#: ../scope/src/scope.c:64 msgid "Run to cursor" msgstr "Ga door tot cursor" @@ -512,7 +522,7 @@ msgstr "Voeg breekpunt toe (of verwijder)" #: ../debugger/src/keys.c:57 -msgid "Jump to the currect instruction" +msgid "Jump to the current instruction" msgstr "" #: ../debugger/src/watch_model.c:220 @@ -544,6 +554,14 @@ msgid "Save debug session data to a project" msgstr "" +#: ../defineformat/src/defineformat.c:56 +msgid "Define formatter" +msgstr "" + +#: ../defineformat/src/defineformat.c:57 +msgid "Automatically align backslash in multi-line defines" +msgstr "" + #. never search for more than this many chars #: ../devhelp/src/dhp.h:38 msgid "Documentation" @@ -653,7 +671,7 @@ msgstr "Boek:" #. i18n: a documentation book -#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1760 +#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1759 msgid "Book" msgstr "Boek" @@ -782,12 +800,12 @@ msgid "A developers' help browser for GNOME" msgstr "" -#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2010 +#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2066 msgid "_File" msgstr "Bestand" -#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1815 -#: ../geanymacro/src/geanymacro.c:2112 +#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1822 +#: ../geanymacro/src/geanymacro.c:2118 msgid "_Edit" msgstr "Wijzig" @@ -970,55 +988,64 @@ msgid "Column mode, select to line / brace / anchor." msgstr "" -#: ../geanyextrasel/src/extrasel.c:482 +#: ../geanyextrasel/src/extrasel.c:502 msgid "E_xtra Selection" msgstr "" -#: ../geanyextrasel/src/extrasel.c:489 +#: ../geanyextrasel/src/extrasel.c:509 msgid "_Column Mode" msgstr "" -#: ../geanyextrasel/src/extrasel.c:494 +#: ../geanyextrasel/src/extrasel.c:514 msgid "Column mode" msgstr "" -#: ../geanyextrasel/src/extrasel.c:496 +#: ../geanyextrasel/src/extrasel.c:516 msgid "Select to _Line" msgstr "" -#: ../geanyextrasel/src/extrasel.c:500 +#: ../geanyextrasel/src/extrasel.c:520 msgid "Select to line" msgstr "" -#: ../geanyextrasel/src/extrasel.c:502 +#: ../geanyextrasel/src/extrasel.c:522 msgid "Select to Matching _Brace" msgstr "" -#: ../geanyextrasel/src/extrasel.c:506 +#: ../geanyextrasel/src/extrasel.c:526 msgid "Select to matching brace" msgstr "" -#: ../geanyextrasel/src/extrasel.c:510 +#: ../geanyextrasel/src/extrasel.c:528 +msgid "_Toggle Stream/Rectangular" +msgstr "" + +#: ../geanyextrasel/src/extrasel.c:532 +#, fuzzy +msgid "Convert selection" +msgstr "Selecteer een ondertekenaar" + +#: ../geanyextrasel/src/extrasel.c:537 msgid "_Set Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:514 +#: ../geanyextrasel/src/extrasel.c:541 msgid "Set anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:516 +#: ../geanyextrasel/src/extrasel.c:543 msgid "Select to _Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:520 +#: ../geanyextrasel/src/extrasel.c:547 msgid "Select to anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:522 +#: ../geanyextrasel/src/extrasel.c:549 msgid "_Rectangle Select to Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:527 +#: ../geanyextrasel/src/extrasel.c:554 msgid "Rectangle select to anchor" msgstr "" @@ -1405,76 +1432,76 @@ msgid "Default documentation type for languages that does not have one set" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:37 ../geanyinsertnum/src/insertnum.c:329 -#: ../geanyinsertnum/src/insertnum.c:461 +#: ../geanyinsertnum/src/insertnum.c:44 ../geanyinsertnum/src/insertnum.c:337 +#: ../geanyinsertnum/src/insertnum.c:484 msgid "Insert Numbers" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:37 +#: ../geanyinsertnum/src/insertnum.c:44 msgid "Insert/Fill columns with numbers." msgstr "" -#: ../geanyinsertnum/src/insertnum.c:140 +#: ../geanyinsertnum/src/insertnum.c:146 msgid "Counting..." msgstr "" -#: ../geanyinsertnum/src/insertnum.c:188 +#: ../geanyinsertnum/src/insertnum.c:194 msgid "Preparing..." msgstr "" -#: ../geanyinsertnum/src/insertnum.c:194 +#: ../geanyinsertnum/src/insertnum.c:200 msgid "Inserting..." msgstr "" -#: ../geanyinsertnum/src/insertnum.c:318 +#: ../geanyinsertnum/src/insertnum.c:333 msgid "For base 11 and above" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:341 +#: ../geanyinsertnum/src/insertnum.c:353 msgid "_Start:" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:346 +#: ../geanyinsertnum/src/insertnum.c:358 msgid "S_tep:" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:352 +#: ../geanyinsertnum/src/insertnum.c:364 msgid "_Base:" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:363 +#: ../geanyinsertnum/src/insertnum.c:380 msgid "Letters:" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:366 +#: ../geanyinsertnum/src/insertnum.c:383 msgid "_Upper" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:371 +#: ../geanyinsertnum/src/insertnum.c:388 msgid "_Lower" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:376 +#: ../geanyinsertnum/src/insertnum.c:393 msgid "Base _prefix" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:378 +#: ../geanyinsertnum/src/insertnum.c:395 msgid "0 for octal, 0x for hex, + for positive decimal" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:380 +#: ../geanyinsertnum/src/insertnum.c:397 msgid "Padding:" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:382 +#: ../geanyinsertnum/src/insertnum.c:399 msgid "Sp_ace" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:385 +#: ../geanyinsertnum/src/insertnum.c:402 msgid "_Zero" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:454 +#: ../geanyinsertnum/src/insertnum.c:477 msgid "Insert _Numbers" msgstr "" @@ -1904,20 +1931,20 @@ msgid "BibTeX reference name:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1680 +#: ../geanylatex/src/geanylatex.c:1679 msgid "Dear Sir or Madame" msgstr "" -#: ../geanylatex/src/geanylatex.c:1681 +#: ../geanylatex/src/geanylatex.c:1680 msgid "With kind regards" msgstr "" -#: ../geanylatex/src/geanylatex.c:1689 +#: ../geanylatex/src/geanylatex.c:1688 msgid "No template assigned. Aborting" msgstr "" #. Building the wizard-dialog and showing it -#: ../geanylatex/src/geanylatex.c:1716 +#: ../geanylatex/src/geanylatex.c:1715 msgid "LaTeX-Wizard" msgstr "" @@ -1925,78 +1952,78 @@ #. * Adds custom templates if there are any. If there are none just #. * adds default one #. TEMPLATE FILE -#: ../geanylatex/src/geanylatex.c:1731 ../markdown/src/conf.c:666 +#: ../geanylatex/src/geanylatex.c:1730 ../markdown/src/conf.c:659 msgid "Template:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1735 +#: ../geanylatex/src/geanylatex.c:1734 msgid "Set the template which should be used for creating the new document" msgstr "" -#: ../geanylatex/src/geanylatex.c:1744 +#: ../geanylatex/src/geanylatex.c:1743 msgid "Default" msgstr "" #. Documentclass -#: ../geanylatex/src/geanylatex.c:1755 +#: ../geanylatex/src/geanylatex.c:1754 msgid "Documentclass:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1758 +#: ../geanylatex/src/geanylatex.c:1757 msgid "Choose the kind of document you want to write" msgstr "Kies het soort document dat je wilt schrijven" -#: ../geanylatex/src/geanylatex.c:1762 +#: ../geanylatex/src/geanylatex.c:1761 msgid "Article" msgstr "Artikel" -#: ../geanylatex/src/geanylatex.c:1764 +#: ../geanylatex/src/geanylatex.c:1763 msgid "Report" msgstr "Rapport" -#: ../geanylatex/src/geanylatex.c:1766 +#: ../geanylatex/src/geanylatex.c:1765 msgid "Letter" msgstr "Brief" -#: ../geanylatex/src/geanylatex.c:1768 +#: ../geanylatex/src/geanylatex.c:1767 msgid "Presentation" msgstr "Presentatie:" #. Encoding -#: ../geanylatex/src/geanylatex.c:1778 +#: ../geanylatex/src/geanylatex.c:1777 msgid "Encoding:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1782 +#: ../geanylatex/src/geanylatex.c:1781 msgid "Set the encoding for your new document" msgstr "" #. fontsize -#: ../geanylatex/src/geanylatex.c:1798 +#: ../geanylatex/src/geanylatex.c:1797 msgid "Font size" msgstr "" -#: ../geanylatex/src/geanylatex.c:1804 +#: ../geanylatex/src/geanylatex.c:1803 msgid "Set the default font size of your new document" msgstr "" #. Author -#: ../geanylatex/src/geanylatex.c:1816 +#: ../geanylatex/src/geanylatex.c:1815 msgid "Author:" msgstr "Auteur:" -#: ../geanylatex/src/geanylatex.c:1819 +#: ../geanylatex/src/geanylatex.c:1818 msgid "" "Sets the value of the \\author command. In most cases this should be your " "name" msgstr "" #. Date -#: ../geanylatex/src/geanylatex.c:1833 +#: ../geanylatex/src/geanylatex.c:1832 msgid "Date:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1836 +#: ../geanylatex/src/geanylatex.c:1835 msgid "" "Sets the value of the \\date command inside header of your new created LaTeX-" "document. Keeping it at \\today is a good decision if you don't need any " @@ -2004,263 +2031,263 @@ msgstr "" #. Title of the new document -#: ../geanylatex/src/geanylatex.c:1848 +#: ../geanylatex/src/geanylatex.c:1847 msgid "Title:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1851 +#: ../geanylatex/src/geanylatex.c:1850 msgid "Sets the title of your new document." msgstr "" #. Papersize -#: ../geanylatex/src/geanylatex.c:1860 +#: ../geanylatex/src/geanylatex.c:1859 msgid "Paper size:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1863 +#: ../geanylatex/src/geanylatex.c:1862 msgid "Choose the paper format for the newly created document" msgstr "" #. Paper direction -#: ../geanylatex/src/geanylatex.c:1876 +#: ../geanylatex/src/geanylatex.c:1875 msgid "Paper Orientation:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1879 +#: ../geanylatex/src/geanylatex.c:1878 msgid "Choose the paper orientation for the newly created document" msgstr "" -#: ../geanylatex/src/geanylatex.c:1900 +#: ../geanylatex/src/geanylatex.c:1899 msgid "Use KOMA-script classes if possible" msgstr "" -#: ../geanylatex/src/geanylatex.c:1902 +#: ../geanylatex/src/geanylatex.c:1901 msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" "Keep in mind: To compile your document these classes have to be installed " "before." msgstr "" -#: ../geanylatex/src/geanylatex.c:1909 +#: ../geanylatex/src/geanylatex.c:1908 msgid "Use draft mode" msgstr "" -#: ../geanylatex/src/geanylatex.c:1911 +#: ../geanylatex/src/geanylatex.c:1910 msgid "" "Set the draft flag inside new created documents to get documents with a " "number of debugging helpers" msgstr "" -#: ../geanylatex/src/geanylatex.c:1928 +#: ../geanylatex/src/geanylatex.c:1927 msgid "Run LaTeX-Wizard" msgstr "" -#: ../geanylatex/src/geanylatex.c:1930 +#: ../geanylatex/src/geanylatex.c:1929 msgid "Insert \\label" msgstr "" -#: ../geanylatex/src/geanylatex.c:1932 +#: ../geanylatex/src/geanylatex.c:1931 msgid "Insert \\ref" msgstr "" -#: ../geanylatex/src/geanylatex.c:1934 +#: ../geanylatex/src/geanylatex.c:1933 msgid "Insert linebreak \\\\ " msgstr "" -#: ../geanylatex/src/geanylatex.c:1937 +#: ../geanylatex/src/geanylatex.c:1936 msgid "Insert command" msgstr "" -#: ../geanylatex/src/geanylatex.c:1939 +#: ../geanylatex/src/geanylatex.c:1938 msgid "Turn input replacement on/off" msgstr "" -#: ../geanylatex/src/geanylatex.c:1943 +#: ../geanylatex/src/geanylatex.c:1942 msgid "Replace special characters" msgstr "" -#: ../geanylatex/src/geanylatex.c:1946 +#: ../geanylatex/src/geanylatex.c:1945 msgid "Run insert environment dialog" msgstr "" -#: ../geanylatex/src/geanylatex.c:1948 +#: ../geanylatex/src/geanylatex.c:1947 msgid "Insert \\item" msgstr "" -#: ../geanylatex/src/geanylatex.c:1950 +#: ../geanylatex/src/geanylatex.c:1949 msgid "Format selection in bold font face" msgstr "" -#: ../geanylatex/src/geanylatex.c:1952 +#: ../geanylatex/src/geanylatex.c:1951 msgid "Format selection in italic font face" msgstr "" -#: ../geanylatex/src/geanylatex.c:1954 +#: ../geanylatex/src/geanylatex.c:1953 msgid "Format selection in typewriter font face" msgstr "" -#: ../geanylatex/src/geanylatex.c:1956 +#: ../geanylatex/src/geanylatex.c:1955 msgid "Format selection centered" msgstr "" -#: ../geanylatex/src/geanylatex.c:1958 +#: ../geanylatex/src/geanylatex.c:1957 msgid "Format selection left-aligned" msgstr "" -#: ../geanylatex/src/geanylatex.c:1960 +#: ../geanylatex/src/geanylatex.c:1959 msgid "Format selection right-aligned" msgstr "" -#: ../geanylatex/src/geanylatex.c:1963 +#: ../geanylatex/src/geanylatex.c:1962 msgid "Insert description list" msgstr "" -#: ../geanylatex/src/geanylatex.c:1966 +#: ../geanylatex/src/geanylatex.c:1965 msgid "Insert itemize list" msgstr "" -#: ../geanylatex/src/geanylatex.c:1969 +#: ../geanylatex/src/geanylatex.c:1968 msgid "Insert enumerate list" msgstr "" -#: ../geanylatex/src/geanylatex.c:1972 +#: ../geanylatex/src/geanylatex.c:1971 msgid "Set selection one level up" msgstr "" -#: ../geanylatex/src/geanylatex.c:1975 +#: ../geanylatex/src/geanylatex.c:1974 msgid "Set selection one level down" msgstr "" -#: ../geanylatex/src/geanylatex.c:1978 +#: ../geanylatex/src/geanylatex.c:1977 msgid "Insert \\usepackage{}" msgstr "" -#: ../geanylatex/src/geanylatex.c:1981 +#: ../geanylatex/src/geanylatex.c:1980 msgid "Insert BibTeX reference dialog" msgstr "" -#: ../geanylatex/src/geanylatex.c:1988 +#: ../geanylatex/src/geanylatex.c:1987 msgid "" "GeanyLaTeX is a plugin to improve support for LaTeX in Geany.\n" "\n" "Please report all bugs or feature requests to one of the authors." msgstr "" -#: ../geanylatex/src/geanylatex.c:2026 +#: ../geanylatex/src/geanylatex.c:2025 msgid "" "glatex_set_autocompletion_contextsize has been initialized with an invalid " "value. Default value taken. Please check your configuration file" msgstr "" -#: ../geanylatex/src/geanylatex.c:2048 ../geanylatex/src/geanylatex.c:2055 +#: ../geanylatex/src/geanylatex.c:2047 ../geanylatex/src/geanylatex.c:2054 msgid "page \\pageref{{{reference}}}" msgstr "" -#: ../geanylatex/src/geanylatex.c:2052 ../geanylatex/src/geanylatex.c:2059 +#: ../geanylatex/src/geanylatex.c:2051 ../geanylatex/src/geanylatex.c:2058 msgid "\\ref{{{reference}}}, page \\pageref{{{reference}}}" msgstr "" #. Build up menu for menubar -#: ../geanylatex/src/geanylatex.c:2107 +#: ../geanylatex/src/geanylatex.c:2106 msgid "_LaTeX" msgstr "" #. Filling up menubar menus #. LaTeX menu -#: ../geanylatex/src/geanylatex.c:2116 ../geanylatex/src/geanylatex.c:2328 +#: ../geanylatex/src/geanylatex.c:2115 ../geanylatex/src/geanylatex.c:2327 msgid "LaTeX-_Wizard" msgstr "" -#: ../geanylatex/src/geanylatex.c:2119 ../geanylatex/src/geanylatex.c:2331 +#: ../geanylatex/src/geanylatex.c:2118 ../geanylatex/src/geanylatex.c:2330 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "" -#: ../geanylatex/src/geanylatex.c:2124 +#: ../geanylatex/src/geanylatex.c:2123 msgid "I_nsert Special Character" msgstr "" -#: ../geanylatex/src/geanylatex.c:2126 +#: ../geanylatex/src/geanylatex.c:2125 msgid "Helps to use some not very common letters and signs" msgstr "" -#: ../geanylatex/src/geanylatex.c:2136 +#: ../geanylatex/src/geanylatex.c:2135 msgid "Insert _Reference" msgstr "" -#: ../geanylatex/src/geanylatex.c:2138 +#: ../geanylatex/src/geanylatex.c:2137 msgid "Inserting references to the document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2143 +#: ../geanylatex/src/geanylatex.c:2142 msgid "Insert _Label" msgstr "" -#: ../geanylatex/src/geanylatex.c:2145 +#: ../geanylatex/src/geanylatex.c:2144 msgid "Helps at inserting labels to a document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2151 +#: ../geanylatex/src/geanylatex.c:2150 msgid "Insert _Environment" msgstr "" -#: ../geanylatex/src/geanylatex.c:2153 +#: ../geanylatex/src/geanylatex.c:2152 msgid "Helps at inserting an environment a document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2159 +#: ../geanylatex/src/geanylatex.c:2158 msgid "Insert P_ackage" msgstr "" -#: ../geanylatex/src/geanylatex.c:2161 +#: ../geanylatex/src/geanylatex.c:2160 msgid "A small dialog to insert \\usepackage{} into header of current file" msgstr "" -#: ../geanylatex/src/geanylatex.c:2166 ../scope/data/scope.glade.h:58 +#: ../geanylatex/src/geanylatex.c:2165 ../scope/data/scope.glade.h:58 msgid "_Format" msgstr "" #. Add font size menu -#: ../geanylatex/src/geanylatex.c:2183 +#: ../geanylatex/src/geanylatex.c:2182 msgid "F_ont size" msgstr "" -#: ../geanylatex/src/geanylatex.c:2201 +#: ../geanylatex/src/geanylatex.c:2200 msgid "_Special Character Replacement" msgstr "" -#: ../geanylatex/src/geanylatex.c:2209 +#: ../geanylatex/src/geanylatex.c:2208 msgid "Bulk _Replace Special Characters" msgstr "" -#: ../geanylatex/src/geanylatex.c:2211 +#: ../geanylatex/src/geanylatex.c:2210 msgid "_Replace selected special characters with TeX substitutes" msgstr "" -#: ../geanylatex/src/geanylatex.c:2219 +#: ../geanylatex/src/geanylatex.c:2218 msgid "Toggle _Special Character Replacement" msgstr "" -#: ../geanylatex/src/geanylatex.c:2230 +#: ../geanylatex/src/geanylatex.c:2229 msgid "Insert _Command" msgstr "" -#: ../geanylatex/src/geanylatex.c:2232 +#: ../geanylatex/src/geanylatex.c:2231 msgid "Inserting costumized command to document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2257 +#: ../geanylatex/src/geanylatex.c:2256 msgid "_BibTeX" msgstr "" -#: ../geanylatex/src/geanylatex.c:2265 +#: ../geanylatex/src/geanylatex.c:2264 msgid "Insert B_ibTeX reference" msgstr "" -#: ../geanylatex/src/geanylatex.c:2267 +#: ../geanylatex/src/geanylatex.c:2266 msgid "Helps to insert a reference out of BibTeX files" msgstr "" -#: ../geanylatex/src/geanylatex.c:2272 +#: ../geanylatex/src/geanylatex.c:2271 msgid "_BibTeX entries" msgstr "" @@ -2417,16 +2444,16 @@ msgid "Creating dummy text with Geany" msgstr "" -#: ../geanylipsum/src/geanylipsum.c:86 +#: ../geanylipsum/src/geanylipsum.c:89 msgid "Lipsum-Generator" msgstr "" -#: ../geanylipsum/src/geanylipsum.c:87 +#: ../geanylipsum/src/geanylipsum.c:90 msgid "Enter the length of Lipsum text here" msgstr "" #. Building menu entry -#: ../geanylipsum/src/geanylipsum.c:163 +#: ../geanylipsum/src/geanylipsum.c:164 msgid "_Lipsum" msgstr "" @@ -2550,19 +2577,19 @@ msgid "Browse..." msgstr "" -#: ../geanylua/gsdlg.c:175 +#: ../geanylua/gsdlg.c:176 msgid "Select Color" msgstr "" -#: ../geanylua/gsdlg.c:205 +#: ../geanylua/gsdlg.c:207 msgid "Choose..." msgstr "" -#: ../geanylua/gsdlg.c:226 +#: ../geanylua/gsdlg.c:228 msgid "Select Font" msgstr "" -#: ../geanylua/gsdlg.c:253 +#: ../geanylua/gsdlg.c:255 msgid "Select..." msgstr "" @@ -2587,7 +2614,7 @@ "not enough arguments for command \"%s\".\n" msgstr "" -#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:398 +#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:396 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2622,14 +2649,14 @@ msgid "Save file" msgstr "" -#: ../geanylua/glspi_dlg.c:436 +#: ../geanylua/glspi_dlg.c:438 #, c-format msgid "" "Error in module \"%s\" at function pickfile():\n" "failed to parse filter string at argument #3.\n" msgstr "" -#: ../geanylua/glspi_dlg.c:486 +#: ../geanylua/glspi_dlg.c:489 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2668,21 +2695,21 @@ "Please check your installation." msgstr "" -#: ../geanylua/glspi_app.c:19 +#: ../geanylua/glspi_app.c:21 #, c-format msgid "" "%s %s: %s\n" "Copyright (c) 2007-2010 " msgstr "" -#: ../geanylua/glspi_app.c:149 +#: ../geanylua/glspi_app.c:151 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" "widget \"%s\" not found for argument #1.\n" msgstr "" -#: ../geanylua/glspi_app.c:158 +#: ../geanylua/glspi_app.c:160 #, c-format msgid "" "Error in module \"%s\" at function %s() argument #2:\n" @@ -3022,6 +3049,21 @@ "duplicate line" msgstr "" +#: ../geanymacro/src/geanymacro.c:150 +#, fuzzy +msgid "Search for next \"\"" +msgstr "Zoek naar:" + +#: ../geanymacro/src/geanymacro.c:151 +#, fuzzy +msgid "Search for previous \"\"" +msgstr "Zoek naar begin van een woord:" + +#: ../geanymacro/src/geanymacro.c:152 +#, fuzzy +msgid "Set start of search to beginning of selection" +msgstr "Verwijder tot aan het begin van de regel" + #: ../geanymacro/src/geanymacro.c:181 msgid "Macros" msgstr "" @@ -3222,12 +3264,12 @@ #. create buttons #: ../geanymacro/src/geanymacro.c:1393 ../geanymacro/src/geanymacro.c:1536 -#: ../geanymacro/src/geanymacro.c:1819 ../geanymacro/src/geanymacro.c:2116 +#: ../geanymacro/src/geanymacro.c:1826 ../geanymacro/src/geanymacro.c:2122 msgid "_Ok" msgstr "" #: ../geanymacro/src/geanymacro.c:1394 ../geanymacro/src/geanymacro.c:1537 -#: ../geanymacro/src/geanymacro.c:1820 +#: ../geanymacro/src/geanymacro.c:1827 msgid "_Cancel" msgstr "" @@ -3244,7 +3286,7 @@ msgid "Search for contents of clipboard" msgstr "Zoek naar inoud van klembord" -#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:92 +#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:101 msgid "Search for:" msgstr "Zoek naar:" @@ -3278,59 +3320,59 @@ msgid "Text:" msgstr "" -#: ../geanymacro/src/geanymacro.c:1571 ../geanymacro/src/geanymacro.c:1755 +#: ../geanymacro/src/geanymacro.c:1570 ../geanymacro/src/geanymacro.c:1758 #, c-format msgid "Insert/replace with \"%s\"" msgstr "" #. create dialog box -#: ../geanymacro/src/geanymacro.c:1731 +#: ../geanymacro/src/geanymacro.c:1735 #, c-format msgid "Edit: %s" msgstr "" #. add column -#: ../geanymacro/src/geanymacro.c:1794 +#: ../geanymacro/src/geanymacro.c:1801 msgid "Event" msgstr "" #. add buttons -#: ../geanymacro/src/geanymacro.c:1809 +#: ../geanymacro/src/geanymacro.c:1816 msgid "Move _Up" msgstr "" -#: ../geanymacro/src/geanymacro.c:1811 +#: ../geanymacro/src/geanymacro.c:1818 msgid "Move Do_wn" msgstr "" -#: ../geanymacro/src/geanymacro.c:1813 +#: ../geanymacro/src/geanymacro.c:1820 msgid "New _Above" msgstr "" -#: ../geanymacro/src/geanymacro.c:1814 +#: ../geanymacro/src/geanymacro.c:1821 msgid "New _Below" msgstr "" -#: ../geanymacro/src/geanymacro.c:1817 ../geanymacro/src/geanymacro.c:2114 +#: ../geanymacro/src/geanymacro.c:1824 ../geanymacro/src/geanymacro.c:2120 #, fuzzy msgid "_Delete" msgstr "Verwijder" #. create dialog box -#: ../geanymacro/src/geanymacro.c:2059 +#: ../geanymacro/src/geanymacro.c:2065 msgid "Edit Macros" msgstr "" -#: ../geanymacro/src/geanymacro.c:2089 +#: ../geanymacro/src/geanymacro.c:2095 msgid "Macro Name" msgstr "" -#: ../geanymacro/src/geanymacro.c:2095 +#: ../geanymacro/src/geanymacro.c:2101 msgid "Key Trigger" msgstr "" #. add buttons -#: ../geanymacro/src/geanymacro.c:2110 +#: ../geanymacro/src/geanymacro.c:2116 msgid "_Re-Record" msgstr "" @@ -3349,6 +3391,33 @@ msgid "_Edit Macros" msgstr "" +#. *< \brief It's the information message about geany mini script +#: ../geanyminiscript/src/gms_gui.c:129 +msgid "" +"GMS : Geany Mini-Script filter Plugin\n" +"This plugin is a tool to apply a script filter on:\n" +" o the text selection,\n" +" o the current document,\n" +" o all documents of the current session.\n" +"\n" +"The filter type can be:\n" +" o Unix shell script,\n" +" o perl script,\n" +" o python script,\n" +" o sed commands,\n" +" o awk script.\n" +"\n" +"AUTHOR\n" +" Written by Pascal BURLOT (December,2008)\n" +"\n" +"LICENSE:\n" +"This program is free software; you can redistribute\n" +"it and/or modify it under the terms of the GNU \n" +"General Public License as published by the Free\n" +"Software Foundation; either version 2 of the License,\n" +"or (at your option) any later version." +msgstr "" + #: ../geanyminiscript/src/gms_gui.c:253 msgid "Load Mini-Script File" msgstr "" @@ -3357,111 +3426,110 @@ msgid "Save Mini-Script File" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:418 +#: ../geanyminiscript/src/gms_gui.c:419 msgid "Mini-Script Filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:446 +#: ../geanyminiscript/src/gms_gui.c:445 msgid "Clear the mini-script window" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:451 +#: ../geanyminiscript/src/gms_gui.c:450 msgid "Load a mini-script into this window" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:456 +#: ../geanyminiscript/src/gms_gui.c:455 msgid "Save the mini-script into a file" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:461 +#: ../geanyminiscript/src/gms_gui.c:460 msgid "Display a information about the mini-script plugin" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:469 +#: ../geanyminiscript/src/gms_gui.c:468 msgid "select the mini-script type" msgstr "" #. Hbox : Radio bouttons for choosing the input: #. * selection/current document/all documents of the current session -#: ../geanyminiscript/src/gms_gui.c:500 +#: ../geanyminiscript/src/gms_gui.c:499 msgid "filter input" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:502 +#: ../geanyminiscript/src/gms_gui.c:501 msgid "select the input of mini-script filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:508 +#: ../geanyminiscript/src/gms_gui.c:507 #, fuzzy msgid "selection" msgstr "Selecteer een ondertekenaar" -#: ../geanyminiscript/src/gms_gui.c:509 +#: ../geanyminiscript/src/gms_gui.c:508 #, fuzzy msgid "document" msgstr "Documentatie" -#: ../geanyminiscript/src/gms_gui.c:510 +#: ../geanyminiscript/src/gms_gui.c:509 msgid "session" msgstr "" #. Hbox : Radio bouttons for choosing the output: #. * current document/ or new document -#: ../geanyminiscript/src/gms_gui.c:519 +#: ../geanyminiscript/src/gms_gui.c:518 msgid "filter output" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:521 +#: ../geanyminiscript/src/gms_gui.c:520 msgid "select the output of mini-script filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:527 +#: ../geanyminiscript/src/gms_gui.c:526 msgid "Current Doc." msgstr "" -#: ../geanyminiscript/src/gms_gui.c:528 +#: ../geanyminiscript/src/gms_gui.c:527 msgid "New Doc." msgstr "" -#: ../geanyminiscript/src/gms_gui.c:749 +#: ../geanyminiscript/src/gms_gui.c:748 msgid "script configuration" msgstr "" -#. All plugins must set name, description, version and author. #: ../geanyminiscript/src/gms.c:58 msgid "Mini Script" msgstr "" -#: ../geanyminiscript/src/gms.c:58 +#: ../geanyminiscript/src/gms.c:59 msgid "" "A tool to apply a script filter on a text selection or current document(s)" msgstr "" -#: ../geanyminiscript/src/gms.c:59 +#: ../geanyminiscript/src/gms.c:60 msgid "Pascal BURLOT, a Geany user" msgstr "" #. Add an item to the Tools menu -#: ../geanyminiscript/src/gms.c:278 +#: ../geanyminiscript/src/gms.c:249 msgid "_Mini-Script" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:58 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:61 msgid "Numbered Bookmarks for Geany" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:923 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:927 #, c-format msgid "Unable to apply all markers to '%s' as all being used." msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:925 -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:969 -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1392 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:929 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:973 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1396 msgid "_Okay" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:967 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:971 #, c-format msgid "" "'%s' has been edited since it was last saved by geany. Marker positions may " @@ -3469,54 +3537,54 @@ "Press Ignore to try an load markers anyway." msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:970 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:974 msgid "_Ignore" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1215 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1219 msgid "remember fold state" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1221 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1225 msgid "Center view when goto bookmark" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1228 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1232 #, fuzzy msgid "Move to start of line" msgstr "Ga naar begin van de regel" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1229 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1233 msgid "Move to remembered position in line" msgstr "Ga naar bewaarde positie op de regel" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1230 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1234 msgid "Move to position in current line" msgstr "Ga naar positie in huidige regel" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1231 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1235 #, fuzzy msgid "Move to End of line" msgstr "Ga naar het eind van de regel" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1237 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1241 msgid "Save file settings with program settings" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1238 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1242 msgid "Save file settings to filename with suffix" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1243 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1247 msgid "remember normal Bookmarks" msgstr "" #. create dialog box -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1263 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1267 msgid "Numbered Bookmarks help" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1270 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1274 msgid "" "This Plugin implements Numbered Bookmarks in Geany, as well as remembering " "the state of folds, and positions of standard non-numbered bookmarks when a " @@ -3532,7 +3600,7 @@ "previously set bookmark, press Ctrl+a number from 0 to 9." msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1391 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1395 msgid "Unable to apply markers as all being used." msgstr "" @@ -3613,36 +3681,36 @@ msgstr "Selecteer een ondertekenaar" #. shouldn't get here -#: ../geanypg/src/pinentry.c:107 +#: ../geanypg/src/pinentry.c:111 msgid "Could not use pinentry." msgstr "pinentry kan niet gebruikt worden" -#: ../geanypg/src/pinentry.c:119 +#: ../geanypg/src/pinentry.c:123 msgid "Unexpected output from pinentry." msgstr "Onverwachte output van pinentry" #. read the rest of the first line after OK -#: ../geanypg/src/pinentry.c:127 +#: ../geanypg/src/pinentry.c:131 msgid "Passphrase entry" msgstr "Wachtwoord invoeren" -#: ../geanypg/src/pinentry.c:131 +#: ../geanypg/src/pinentry.c:135 msgid "Passphrase" msgstr "Wachtwoord" -#: ../geanypg/src/pinentry.c:136 +#: ../geanypg/src/pinentry.c:140 msgid "Enter passphrase for" msgstr "Voer wachtwoord in voor" -#: ../geanypg/src/pinentry.c:167 +#: ../geanypg/src/pinentry.c:171 msgid "pinentry gave error" msgstr "er is een fout opgetreden in pinentry " -#: ../geanypg/src/pinentry.c:170 +#: ../geanypg/src/pinentry.c:174 msgid "Unexpected error from pinentry." msgstr "Onverwachte fout in pinentry" -#: ../geanypg/src/pinentry.c:195 +#: ../geanypg/src/pinentry.c:199 msgid "" "Error, Passphrase input without using gpg-agent is not supported on Windows " "yet." @@ -3654,8 +3722,8 @@ msgid "a key with fingerprint" msgstr "een sleutel met vingerafdruk" -#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:522 -#: ../spellcheck/src/gui.c:533 +#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:527 +#: ../spellcheck/src/gui.c:538 msgid "unknown" msgstr "onbekend" @@ -3822,7 +3890,7 @@ msgstr "Open handtekeningsbestand" #: ../geanyprj/src/geanyprj.c:38 ../geanyprj/src/sidebar.c:456 -#: ../gproject/src/gproject-sidebar.c:822 +#: ../gproject/src/gproject-sidebar.c:870 msgid "Project" msgstr "" @@ -3851,7 +3919,7 @@ msgid "C_reate" msgstr "Creër" -#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:116 +#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:114 msgid "Name:" msgstr "Naam:" @@ -3872,9 +3940,10 @@ "Base directory of all files that make up the project. This can be a new " "path, or an existing directory tree. You can use paths relative to the " "project filename." -msgstr "Basismap van alle bestanden die samen het project vormen. Dit kan " -"zowel een nieuw of bestaande map zijn. Je kunt de paden relatief kiezen" -"ten opzichte van het projektbestand." +msgstr "" +"Basismap van alle bestanden die samen het project vormen. Dit kan zowel een " +"nieuw of bestaande map zijn. Je kunt de paden relatief kiezenten opzichte " +"van het projektbestand." #: ../geanyprj/src/menu.c:163 msgid "Choose Project Base Path" @@ -3924,7 +3993,7 @@ msgid "Remove File" msgstr "Verwijder bestand" -#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:803 +#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:849 msgid "H_ide Sidebar" msgstr "Verberg zijbalk" @@ -3933,6 +4002,49 @@ msgid "Project \"%s\" opened." msgstr "Projekt \"%s\" geopend." +#: ../geanypy/src/geanypy-plugin.c:34 +#, fuzzy +msgid "GeanyPy" +msgstr "GeanyVB" + +#: ../geanypy/src/geanypy-plugin.c:35 +msgid "Python plugins support" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:77 +#, fuzzy, c-format +msgid "Unable to pre-load Python library: %s." +msgstr "Kon configuratie map niet creëren op '%s'" + +#: ../geanypy/src/geanypy-plugin.c:157 +msgid "Failed to import manager module" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:166 +msgid "Failed to retrieve PluginManager from manager module" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:182 +msgid "System plugin directory not found." +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:211 +msgid "Unable to instantiate new PluginManager" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:227 +msgid "Unable to get show_all() method on plugin manager" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:255 +#, fuzzy, c-format +msgid "Unable to create Python plugins directory: %s: %s" +msgstr "Kon configuratie map niet creëren op '%s'" + +#: ../geanypy/src/geanypy-plugin.c:266 +msgid "Python Plugin Manager" +msgstr "" + #: ../geanysendmail/src/geanysendmail.c:43 msgid "GeanySendMail" msgstr "" @@ -3951,42 +4063,42 @@ msgid "Enter the recipient's e-mail address:" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:136 +#: ../geanysendmail/src/geanysendmail.c:138 msgid "Filename placeholder not found. The executed command might have failed." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:142 +#: ../geanysendmail/src/geanysendmail.c:144 msgid "" "Recipient address placeholder not found. The executed command might have " "failed." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:157 +#: ../geanysendmail/src/geanysendmail.c:159 msgid "Could not execute mailer. Please check your configuration." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:166 +#: ../geanysendmail/src/geanysendmail.c:168 msgid "Please define a mail client first." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:171 +#: ../geanysendmail/src/geanysendmail.c:173 msgid "File has to be saved before sending." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:187 +#: ../geanysendmail/src/geanysendmail.c:191 msgid "Mail" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:218 +#: ../geanysendmail/src/geanysendmail.c:222 msgid "Send by mail" msgstr "" #. add a label and a text entry to the dialog -#: ../geanysendmail/src/geanysendmail.c:308 +#: ../geanysendmail/src/geanysendmail.c:312 msgid "Path and options for the mail client:" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:316 +#: ../geanysendmail/src/geanysendmail.c:320 msgid "" "Note: \n" "\t%f will be replaced by your file.\n" @@ -3997,29 +4109,29 @@ "\tmutt -s \"Sending '%b'\" -a \"%f\" \"%r\"" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:326 +#: ../geanysendmail/src/geanysendmail.c:330 msgid "Show toolbar icon" msgstr "Laat Hulpmiddelenbalk pictogram" -#: ../geanysendmail/src/geanysendmail.c:328 +#: ../geanysendmail/src/geanysendmail.c:332 msgid "Shows a icon in the toolbar to send file more easy." msgstr "" "Laat in de hulpmiddelenbalk een pictogram zien om een bestand te versturen." -#: ../geanysendmail/src/geanysendmail.c:334 +#: ../geanysendmail/src/geanysendmail.c:338 msgid "Use dialog for entering email address of recipients" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:356 +#: ../geanysendmail/src/geanysendmail.c:360 msgid "Send file by mail" msgstr "" #. Build up menu entry -#: ../geanysendmail/src/geanysendmail.c:379 +#: ../geanysendmail/src/geanysendmail.c:383 msgid "_Mail document" msgstr "" -#: ../geanysendmail/src/geanysendmail.c:382 +#: ../geanysendmail/src/geanysendmail.c:386 msgid "" "Sends the opened file as unzipped attachment by any mailer from your $PATH" msgstr "" @@ -4037,77 +4149,96 @@ msgid "geanyvc: s_spawn_sync error: %s" msgstr "" -#: ../geanyvc/src/geanyvc.c:609 ../geanyvc/src/geanyvc.c:620 +#: ../geanyvc/src/geanyvc.c:561 +#, c-format +msgid "File %s: action %s executed via %s." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:614 ../geanyvc/src/geanyvc.c:625 #, c-format msgid "geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'" msgstr "geanyvc: vcdiff_file_activated: Kon \"%s\" niet hernoemen tot \"%s\"" -#: ../geanyvc/src/geanyvc.c:646 ../geanyvc/src/geanyvc.c:696 +#: ../geanyvc/src/geanyvc.c:651 ../geanyvc/src/geanyvc.c:701 msgid "No changes were made." msgstr "Er zijn geen wijzigingen gemaakt." -#: ../geanyvc/src/geanyvc.c:723 +#: ../geanyvc/src/geanyvc.c:728 #, fuzzy msgid "No history available" msgstr "Geen geschiedenis beschikbaar." -#: ../geanyvc/src/geanyvc.c:916 ../geanyvc/src/geanyvc.c:924 +#: ../geanyvc/src/geanyvc.c:921 ../geanyvc/src/geanyvc.c:929 #, c-format msgid "Do you really want to revert: %s?" msgstr "Wil je echt de wijzigingen in \"%s\" terugdraaien?" -#: ../geanyvc/src/geanyvc.c:932 +#: ../geanyvc/src/geanyvc.c:937 #, c-format msgid "Do you really want to add: %s?" msgstr "Wil je echt \"%s\" toevoegen?" -#: ../geanyvc/src/geanyvc.c:939 +#: ../geanyvc/src/geanyvc.c:944 #, c-format msgid "Do you really want to remove: %s?" msgstr "Wil je echt \"%s\" verwijderen" -#: ../geanyvc/src/geanyvc.c:962 +#: ../geanyvc/src/geanyvc.c:967 msgid "Do you really want to update?" msgstr "Wil je echt updaten?" -#: ../geanyvc/src/geanyvc.c:1225 +#: ../geanyvc/src/geanyvc.c:1094 +msgid "" +"The resulting differences cannot be displayed because the changes are too " +"big to display here and would slow down the UI significantly.\n" +"\n" +"To view the differences, cancel this dialog and open the differences in " +"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:1243 msgid "Commit Y/N" msgstr "Doorvoeren J/N" -#: ../geanyvc/src/geanyvc.c:1235 +#: ../geanyvc/src/geanyvc.c:1253 msgid "Status" msgstr "Toestand" -#: ../geanyvc/src/geanyvc.c:1242 +#: ../geanyvc/src/geanyvc.c:1260 msgid "Path" msgstr "Pad" -#: ../geanyvc/src/geanyvc.c:1330 +#: ../geanyvc/src/geanyvc.c:1324 +#, c-format +msgid "Line: %d Column: %d" +msgstr "" + +#: ../geanyvc/src/geanyvc.c:1370 msgid "Commit" msgstr "Doorvoeren" -#: ../geanyvc/src/geanyvc.c:1372 +#: ../geanyvc/src/geanyvc.c:1412 msgid "_De-/select all files" msgstr "(De-)selecteer alle bestanden" -#: ../geanyvc/src/geanyvc.c:1413 +#: ../geanyvc/src/geanyvc.c:1456 msgid "Commit message:" msgstr "Doorvoer commentaar:" -#: ../geanyvc/src/geanyvc.c:1426 +#: ../geanyvc/src/geanyvc.c:1475 msgid "C_ommit" msgstr "Doorvoeren" -#: ../geanyvc/src/geanyvc.c:1500 +#: ../geanyvc/src/geanyvc.c:1556 msgid "Nothing to commit." msgstr "Niets door te voeren." -#: ../geanyvc/src/geanyvc.c:1546 +#: ../geanyvc/src/geanyvc.c:1602 #, c-format msgid "Error initializing spell checking: %s" msgstr "Fout tijdens spellingscontrole-initialisatie: \"%s\"" -#: ../geanyvc/src/geanyvc.c:1558 +#: ../geanyvc/src/geanyvc.c:1614 #, c-format msgid "" "Error while setting up language for spellchecking. Please check " @@ -4116,12 +4247,12 @@ "Controleer configuratie: er is een fout opgetreden bij het instellen van de " "taal voor de spellingscontrole. Foutmelding: \"%s\"" -#: ../geanyvc/src/geanyvc.c:1834 +#: ../geanyvc/src/geanyvc.c:1890 msgid "Set Changed-flag for document tabs created by the plugin" msgstr "" "Zet vlag 'gewijzigd' bij tabbladen van de door plugin gecreërde documenten." -#: ../geanyvc/src/geanyvc.c:1837 +#: ../geanyvc/src/geanyvc.c:1893 msgid "" "If this option is activated, every new by the VC-plugin created document tab " "will be marked as changed. Even this option is useful in some cases, it " @@ -4132,256 +4263,256 @@ "gevallen, zal het mogelijkerwijs ook een groot aantal hinderlijke 'Wil je " "dit bewaren' dialogen veroorzaken." -#: ../geanyvc/src/geanyvc.c:1845 +#: ../geanyvc/src/geanyvc.c:1901 msgid "Confirm adding new files to a VCS" msgstr "Bevestig het toevoegen van nieuwe bestanden aan VBS." -#: ../geanyvc/src/geanyvc.c:1848 +#: ../geanyvc/src/geanyvc.c:1904 msgid "Shows a confirmation dialog on adding a new (created) file to VCS." msgstr "" "Laat een bevestigingsdialoog zien bij het toevoegen van een nieuw (gecreërd) " "bestand aan het VBS." -#: ../geanyvc/src/geanyvc.c:1854 +#: ../geanyvc/src/geanyvc.c:1910 msgid "Maximize commit dialog" msgstr "Maximaliseer doorvoer dialoog." -#: ../geanyvc/src/geanyvc.c:1855 +#: ../geanyvc/src/geanyvc.c:1911 msgid "Show commit dialog maximize." msgstr "Laat doorvoer dialoog maximalisatie zien." -#: ../geanyvc/src/geanyvc.c:1861 +#: ../geanyvc/src/geanyvc.c:1917 msgid "Use external diff viewer" msgstr "Gebruik externe diff viewer" -#: ../geanyvc/src/geanyvc.c:1863 +#: ../geanyvc/src/geanyvc.c:1919 msgid "Use external diff viewer for file diff." msgstr "Gebruik externe diff viewer voor bestanden." -#: ../geanyvc/src/geanyvc.c:1869 +#: ../geanyvc/src/geanyvc.c:1925 msgid "Show VC entries at editor menu" msgstr "Laat VB entries zien bij editor menu" -#: ../geanyvc/src/geanyvc.c:1871 +#: ../geanyvc/src/geanyvc.c:1927 msgid "Show entries for VC functions inside editor menu" msgstr "Laat entries voor VB functies in editor menu" -#: ../geanyvc/src/geanyvc.c:1876 +#: ../geanyvc/src/geanyvc.c:1932 msgid "Attach menu to menubar" msgstr "" -#: ../geanyvc/src/geanyvc.c:1878 +#: ../geanyvc/src/geanyvc.c:1934 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " "directly inside Geany's menubar.Will take in account after next start of " "GeanyVC" msgstr "" -#: ../geanyvc/src/geanyvc.c:1886 +#: ../geanyvc/src/geanyvc.c:1942 msgid "Enable CVS" msgstr "" -#: ../geanyvc/src/geanyvc.c:1891 +#: ../geanyvc/src/geanyvc.c:1947 msgid "Enable GIT" msgstr "" -#: ../geanyvc/src/geanyvc.c:1896 +#: ../geanyvc/src/geanyvc.c:1952 msgid "Enable SVN" msgstr "" -#: ../geanyvc/src/geanyvc.c:1901 +#: ../geanyvc/src/geanyvc.c:1957 msgid "Enable SVK" msgstr "" -#: ../geanyvc/src/geanyvc.c:1906 +#: ../geanyvc/src/geanyvc.c:1962 msgid "Enable Bazaar" msgstr "" -#: ../geanyvc/src/geanyvc.c:1911 +#: ../geanyvc/src/geanyvc.c:1967 msgid "Enable Mercurial" msgstr "" -#: ../geanyvc/src/geanyvc.c:1917 +#: ../geanyvc/src/geanyvc.c:1973 msgid "Spellcheck language" msgstr "Spellingscontroletaal" -#: ../geanyvc/src/geanyvc.c:2008 +#: ../geanyvc/src/geanyvc.c:2064 msgid "_VC file Actions" msgstr "VB bestandhandelingen" #. Diff of current file #. Diff of the current dir #. Complete diff of base directory -#: ../geanyvc/src/geanyvc.c:2014 ../geanyvc/src/geanyvc.c:2091 -#: ../geanyvc/src/geanyvc.c:2131 +#: ../geanyvc/src/geanyvc.c:2070 ../geanyvc/src/geanyvc.c:2147 +#: ../geanyvc/src/geanyvc.c:2187 msgid "_Diff" msgstr "" -#: ../geanyvc/src/geanyvc.c:2017 +#: ../geanyvc/src/geanyvc.c:2073 msgid "Make a diff from the current active file" msgstr "Maak een 'diff' van het huidige actieve bestand" #. Revert current file #. Revert current dir #. Revert everything -#: ../geanyvc/src/geanyvc.c:2022 ../geanyvc/src/geanyvc.c:2100 -#: ../geanyvc/src/geanyvc.c:2139 +#: ../geanyvc/src/geanyvc.c:2078 ../geanyvc/src/geanyvc.c:2156 +#: ../geanyvc/src/geanyvc.c:2195 msgid "_Revert" msgstr "Draai terug" -#: ../geanyvc/src/geanyvc.c:2025 +#: ../geanyvc/src/geanyvc.c:2081 msgid "Restore pristine working copy file (undo local edits)." msgstr "Herstel oorspronkelijke werkversie (maak lokale wijzigingen ongedaan)." #. Blame for current file -#: ../geanyvc/src/geanyvc.c:2034 +#: ../geanyvc/src/geanyvc.c:2090 msgid "_Blame" msgstr "" -#: ../geanyvc/src/geanyvc.c:2037 +#: ../geanyvc/src/geanyvc.c:2093 msgid "Shows the changes made at one file per revision and author." msgstr "Laat de wijzigingen van een bestand per revisie en auteur zien." #. History/log of current file #. History/log of the current dir #. Complete History/Log of base directory -#: ../geanyvc/src/geanyvc.c:2044 ../geanyvc/src/geanyvc.c:2110 -#: ../geanyvc/src/geanyvc.c:2151 +#: ../geanyvc/src/geanyvc.c:2100 ../geanyvc/src/geanyvc.c:2166 +#: ../geanyvc/src/geanyvc.c:2207 msgid "_History (log)" msgstr "" -#: ../geanyvc/src/geanyvc.c:2047 +#: ../geanyvc/src/geanyvc.c:2103 msgid "Shows the log of the current file" msgstr "Laat de log van het huidige bestand zien" #. base version of the current file -#: ../geanyvc/src/geanyvc.c:2052 +#: ../geanyvc/src/geanyvc.c:2108 msgid "_Original" msgstr "Origineel" -#: ../geanyvc/src/geanyvc.c:2055 +#: ../geanyvc/src/geanyvc.c:2111 #, fuzzy msgid "Shows the original of the current file" msgstr "Laat het origineel van het huidige bestand zien" #. add current file -#: ../geanyvc/src/geanyvc.c:2063 +#: ../geanyvc/src/geanyvc.c:2119 msgid "_Add to Version Control" msgstr "Voeg aan Versie Beheer toe" -#: ../geanyvc/src/geanyvc.c:2065 +#: ../geanyvc/src/geanyvc.c:2121 msgid "Add file to repository." msgstr "Voeg bestand aan opslagplaats toe." #. remove current file -#: ../geanyvc/src/geanyvc.c:2071 +#: ../geanyvc/src/geanyvc.c:2127 msgid "_Remove from Version Control" msgstr "Verwijder van Versie Beheer" -#: ../geanyvc/src/geanyvc.c:2073 +#: ../geanyvc/src/geanyvc.c:2129 msgid "Remove file from repository." msgstr "Verwijder bestand van opslagplaats." -#: ../geanyvc/src/geanyvc.c:2088 +#: ../geanyvc/src/geanyvc.c:2144 msgid "_Directory" msgstr "Map" -#: ../geanyvc/src/geanyvc.c:2094 +#: ../geanyvc/src/geanyvc.c:2150 msgid "Make a diff from the directory of the current active file" msgstr "" -#: ../geanyvc/src/geanyvc.c:2103 +#: ../geanyvc/src/geanyvc.c:2159 msgid "Restore original files in the current folder (undo local edits)." msgstr "" -#: ../geanyvc/src/geanyvc.c:2113 +#: ../geanyvc/src/geanyvc.c:2169 msgid "Shows the log of the current directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2127 +#: ../geanyvc/src/geanyvc.c:2183 msgid "_Base Directory" msgstr "Basismap" -#: ../geanyvc/src/geanyvc.c:2133 +#: ../geanyvc/src/geanyvc.c:2189 msgid "Make a diff from the top VC directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2141 +#: ../geanyvc/src/geanyvc.c:2197 msgid "Revert any local edits." msgstr "" -#: ../geanyvc/src/geanyvc.c:2154 +#: ../geanyvc/src/geanyvc.c:2210 msgid "Shows the log of the top VC directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2180 +#: ../geanyvc/src/geanyvc.c:2236 msgid "VC _Commit" msgstr "VB doorvoeren" -#: ../geanyvc/src/geanyvc.c:2215 +#: ../geanyvc/src/geanyvc.c:2271 msgid "Show diff of file" msgstr "Laat verschil tussen bestanden zien" -#: ../geanyvc/src/geanyvc.c:2217 +#: ../geanyvc/src/geanyvc.c:2273 msgid "Show diff of directory" msgstr "Laat verschil tussen mappen zien" -#: ../geanyvc/src/geanyvc.c:2219 +#: ../geanyvc/src/geanyvc.c:2275 msgid "Show diff of basedir" msgstr "Laat verschil van basismap zien" -#: ../geanyvc/src/geanyvc.c:2222 +#: ../geanyvc/src/geanyvc.c:2278 msgid "Commit changes" msgstr "Voer wijzigingen door" -#: ../geanyvc/src/geanyvc.c:2224 +#: ../geanyvc/src/geanyvc.c:2280 msgid "Show status" msgstr "Laat toestand zien" -#: ../geanyvc/src/geanyvc.c:2226 +#: ../geanyvc/src/geanyvc.c:2282 msgid "Revert single file" msgstr "Draai wijzigingen van bestand terug" -#: ../geanyvc/src/geanyvc.c:2228 +#: ../geanyvc/src/geanyvc.c:2284 msgid "Revert directory" msgstr "Draai wijzigingen map terug" -#: ../geanyvc/src/geanyvc.c:2230 +#: ../geanyvc/src/geanyvc.c:2286 msgid "Revert base directory" msgstr "Draai wijzigingen basismap terug" -#: ../geanyvc/src/geanyvc.c:2232 +#: ../geanyvc/src/geanyvc.c:2288 msgid "Update file" msgstr "Update bestand" -#: ../geanyvc/src/geanyvc.c:2260 +#: ../geanyvc/src/geanyvc.c:2316 msgid "_VC" msgstr "VB" -#: ../geanyvc/src/geanyvc.c:2266 +#: ../geanyvc/src/geanyvc.c:2322 #, fuzzy msgid "_Version Control" msgstr "Voeg aan Versie Beheer toe" #. Status of basedir -#: ../geanyvc/src/geanyvc.c:2288 +#: ../geanyvc/src/geanyvc.c:2344 msgid "_Status" msgstr "Toestand" -#: ../geanyvc/src/geanyvc.c:2290 +#: ../geanyvc/src/geanyvc.c:2346 msgid "Show status." msgstr "Laat toestand zien." -#: ../geanyvc/src/geanyvc.c:2297 +#: ../geanyvc/src/geanyvc.c:2353 msgid "Update from remote repository." msgstr "Update van opslagplaats op afstand" #. Commit all changes -#: ../geanyvc/src/geanyvc.c:2302 +#: ../geanyvc/src/geanyvc.c:2358 msgid "_Commit" msgstr "Doorvoeren" -#: ../geanyvc/src/geanyvc.c:2304 +#: ../geanyvc/src/geanyvc.c:2360 msgid "Commit changes." msgstr "Voer wijzigingen door." @@ -4452,19 +4583,19 @@ #: ../gproject/src/gproject-menu.c:353 msgid "Find in Project Files" -msgstr "" +msgstr "Zoek in projectbestanden" #: ../gproject/src/gproject-menu.c:359 msgid "Find in project files" -msgstr "" +msgstr "Zoek in projectbestanden" #: ../gproject/src/gproject-menu.c:363 msgid "Find Project File" -msgstr "" +msgstr "Zoek projectfile" #: ../gproject/src/gproject-menu.c:369 msgid "Find project file" -msgstr "" +msgstr "Zoek projectfile" #: ../gproject/src/gproject-menu.c:371 msgid "Swap Header/Source" @@ -4524,98 +4655,251 @@ "tab." msgstr "" -#: ../gproject/src/gproject-sidebar.c:81 -#: ../gproject/src/gproject-sidebar.c:792 +#: ../gproject/src/gproject-sidebar.c:90 +#: ../gproject/src/gproject-sidebar.c:838 msgid "Find File" msgstr "Zoek bestand" -#: ../gproject/src/gproject-sidebar.c:108 +#: ../gproject/src/gproject-sidebar.c:117 msgid "Search inside:" msgstr "Zoek in:" -#: ../gproject/src/gproject-sidebar.c:120 +#: ../gproject/src/gproject-sidebar.c:129 msgid "C_ase sensitive" msgstr "Hoofdlettergevoelig" -#: ../gproject/src/gproject-sidebar.c:123 +#: ../gproject/src/gproject-sidebar.c:132 msgid "Search in full path" msgstr "" -#: ../gproject/src/gproject-sidebar.c:702 +#: ../gproject/src/gproject-sidebar.c:745 msgid "Reload all" msgstr "" -#: ../gproject/src/gproject-sidebar.c:711 -#: ../treebrowser/src/treebrowser.c:1282 +#: ../gproject/src/gproject-sidebar.c:754 +#: ../treebrowser/src/treebrowser.c:1281 msgid "Expand all" msgstr "Alles uitvouwen" -#: ../gproject/src/gproject-sidebar.c:717 -#: ../treebrowser/src/treebrowser.c:1286 +#: ../gproject/src/gproject-sidebar.c:761 +#: ../treebrowser/src/treebrowser.c:1285 msgid "Collapse all" msgstr "Alles samenvouwen" -#: ../gproject/src/gproject-sidebar.c:726 +#: ../gproject/src/gproject-sidebar.c:771 msgid "Follow active editor" msgstr "" -#: ../gproject/src/gproject-sidebar.c:774 +#: ../gproject/src/gproject-sidebar.c:820 msgid "Expand All" msgstr "Alles uitvouwen" -#: ../gproject/src/gproject-sidebar.c:783 -#: ../treebrowser/src/treebrowser.c:1234 +#: ../gproject/src/gproject-sidebar.c:829 msgid "Find in Files" msgstr "Zoek in bestanden" #. POSITION OF VIEW -#: ../markdown/src/conf.c:570 +#: ../markdown/src/conf.c:567 #, fuzzy msgid "Position:" msgstr "Conditie" -#: ../markdown/src/conf.c:576 +#: ../markdown/src/conf.c:573 msgid "Sidebar" msgstr "" -#: ../markdown/src/conf.c:584 +#: ../markdown/src/conf.c:581 #, fuzzy msgid "Message Window" msgstr "_Verberg berichtenvenster" -#: ../markdown/src/conf.c:598 +#: ../markdown/src/conf.c:595 msgid "Font:" msgstr "" -#: ../markdown/src/conf.c:616 +#: ../markdown/src/conf.c:612 msgid "Code Font:" msgstr "" -#: ../markdown/src/conf.c:634 +#: ../markdown/src/conf.c:629 msgid "BG Color:" msgstr "" -#: ../markdown/src/conf.c:651 +#: ../markdown/src/conf.c:645 msgid "FG Color:" msgstr "" -#: ../markdown/src/conf.c:670 +#: ../markdown/src/conf.c:663 #, fuzzy msgid "Select Template File" msgstr "Selecteer een ondertekenaar" -#: ../markdown/src/plugin.c:33 +#: ../markdown/src/plugin.c:35 msgid "Real-time Markdown preview" msgstr "" -#: ../markdown/src/plugin.c:49 +#: ../markdown/src/plugin.c:51 msgid "Markdown Preview" msgstr "" -#: ../markdown/src/plugin.c:160 +#: ../markdown/src/plugin.c:162 msgid "The current document does not have a Markdown filetype." msgstr "" +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:35 +msgid "Pair Tag Highlighter" +msgstr "" + +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:36 +msgid "Finds and highlights matching opening/closing HTML tag" +msgstr "" + +#: ../pohelper/data/menus.ui.h:1 +msgid "_Translation Helper" +msgstr "Vertalingshulp" + +#: ../pohelper/data/menus.ui.h:2 +msgid "_Previous String" +msgstr "Vorige string" + +#: ../pohelper/data/menus.ui.h:3 ../pohelper/src/gph-plugin.c:1031 +msgid "Go to previous string" +msgstr "Ga naar vorige string" + +#: ../pohelper/data/menus.ui.h:4 +msgid "_Next String" +msgstr "Volgende string" + +#: ../pohelper/data/menus.ui.h:5 ../pohelper/src/gph-plugin.c:1034 +msgid "Go to next string" +msgstr "Ga naar volgende string" + +#: ../pohelper/data/menus.ui.h:6 +msgid "Pre_vious Untranslated" +msgstr "Vorige onvertaalde string" + +#: ../pohelper/data/menus.ui.h:7 ../pohelper/src/gph-plugin.c:1037 +msgid "Go to previous untranslated string" +msgstr "Ga naar vorige onvertaalde string" + +#: ../pohelper/data/menus.ui.h:8 +msgid "Next _Untranslated" +msgstr "Volgende onvertaalde string" + +#: ../pohelper/data/menus.ui.h:9 ../pohelper/src/gph-plugin.c:1040 +msgid "Go to next untranslated string" +msgstr "Ga naar volgende onvertaalde string" + +#: ../pohelper/data/menus.ui.h:10 +msgid "Previous Fu_zzy" +msgstr "Vorige onduidelijkheid" + +#: ../pohelper/data/menus.ui.h:11 ../pohelper/src/gph-plugin.c:1043 +msgid "Go to previous fuzzily translated string" +msgstr "Ga naar de vorige onduidelijk vertaalde string" + +#: ../pohelper/data/menus.ui.h:12 +msgid "Next _Fuzzy" +msgstr "Volgende onduidelijkheid" + +#: ../pohelper/data/menus.ui.h:13 ../pohelper/src/gph-plugin.c:1046 +msgid "Go to next fuzzily translated string" +msgstr "Ga naar volgende onduidelijk vertaalde string" + +#: ../pohelper/data/menus.ui.h:14 +msgid "Previous Untranslated or Fuzz_y" +msgstr "Vorige onvertaalde of onduidelijke string" + +#: ../pohelper/data/menus.ui.h:15 ../pohelper/src/gph-plugin.c:1049 +msgid "Go to previous untranslated or fuzzy string" +msgstr "Ga naar vorige onvertaalde of onduidelijke string" + +#: ../pohelper/data/menus.ui.h:16 +msgid "Next Untranslated _or Fuzzy" +msgstr "Volgende onvertaalde of onduidelijke string" + +#: ../pohelper/data/menus.ui.h:17 ../pohelper/src/gph-plugin.c:1053 +msgid "Go to next untranslated or fuzzy string" +msgstr "Ga naar volgende onvertaalde of onduidelijke string" + +#: ../pohelper/data/menus.ui.h:18 ../pohelper/src/gph-plugin.c:1064 +msgid "Toggle current translation fuzziness" +msgstr "Markeer huidige vertaling als (on)duidelijk" + +#: ../pohelper/data/menus.ui.h:19 +msgid "_Toggle Fuzziness" +msgstr "Zet (on)duidelijkheid" + +#: ../pohelper/data/menus.ui.h:20 +msgid "Paste _Message as Translation" +msgstr "Plak bericht als vertaling" + +#: ../pohelper/data/menus.ui.h:21 +msgid "Paste the original untranslated string to the translation" +msgstr "Plak de orginele onvertaalde string naar de vertaling" + +#: ../pohelper/data/menus.ui.h:22 ../pohelper/src/gph-plugin.c:1061 +msgid "Reflow the current translation string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:23 +msgid "_Reflow Translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:24 +msgid "" +"Whether to update the translation headers (author, revision date, ...) upon " +"file save" +msgstr "" +"Of de vertalingsinformatie (auteur, revisiedatum, ...) aangepast moet worden " +"bij het wegschrijven" + +#: ../pohelper/data/menus.ui.h:25 +msgid "Update _Headers Upon Save" +msgstr "Pas vertalingsinfo aan bij wegschrijven" + +#: ../pohelper/src/gph-plugin.c:41 +msgid "Translation Helper" +msgstr "Vertalingshulp" + +#: ../pohelper/src/gph-plugin.c:42 +msgid "Improves support for GetText translation files." +msgstr "Verbetert ondersteuning van GetText vertalingsbestanden." + +#: ../pohelper/src/gph-plugin.c:1057 +msgid "Paste original untranslated string to translation" +msgstr "Plak originele onvertaalde string naar vertalingsveld" + +#: ../pohelper/src/gph-plugin.c:1099 +msgid "Failed to load configuration file: %s" +msgstr "Kon configuratie bestand '%s' niet inlezen" + +#: ../pohelper/src/gph-plugin.c:1124 +msgid "Failed to create configuration directory \"%s\": %s" +msgstr "Kon configuratie map niet creëren op \"%s\": '%s'" + +#: ../pohelper/src/gph-plugin.c:1127 +msgid "Failed to save configuration file: %s" +msgstr "Kon configuratiebestand niet wegschrijven: %s" + +#: ../pohelper/src/gph-plugin.c:1182 +#, c-format +msgid "" +"Failed to load UI definition, please check your installation. The error was: " +"%s" +msgstr "" +"Kon definitie van grafische interface niet lezen. Controleer de installatie." +"Foutmelding '%s'" + +#: ../pohelper/src/gph-plugin.c:1222 +#, c-format +msgid "" +"Cannot find widget \"%s\" in the UI definition, please check your " +"installation." +msgstr "" +"Kon widget '%s' niet vinden in grafische interface definitie. Controleer de " +"installatie." + #: ../pretty-printer/src/PluginEntry.c:37 msgid "XML PrettyPrinter" msgstr "" @@ -4968,272 +5252,340 @@ msgstr "" #: ../scope/data/scope.glade.h:64 -msgid "_Evaluate/Modify" +msgid "_Raw" msgstr "" #: ../scope/data/scope.glade.h:65 -msgid "_Watch Expression" +msgid "_Evaluate/Modify" msgstr "" #: ../scope/data/scope.glade.h:66 -#, fuzzy -msgid "_Inspect Variable" -msgstr "Omgevingsvariabelen" +msgid "_Watch Expression" +msgstr "" #: ../scope/data/scope.glade.h:67 #, fuzzy -msgid "Program Terminal" -msgstr "Debug terminaalvenster" +msgid "_Inspect Variable" +msgstr "Omgevingsvariabelen" #: ../scope/data/scope.glade.h:68 msgid "Threads" msgstr "" -#: ../scope/data/scope.glade.h:70 +#: ../scope/data/scope.glade.h:69 msgid "Stack" msgstr "" -#: ../scope/data/scope.glade.h:71 +#: ../scope/data/scope.glade.h:70 msgid "Locals" msgstr "Lokale variabelen" -#: ../scope/data/scope.glade.h:72 +#: ../scope/data/scope.glade.h:71 msgid "Watches" msgstr "" -#: ../scope/data/scope.glade.h:73 +#: ../scope/data/scope.glade.h:72 msgid "Memory" msgstr "" -#: ../scope/data/scope.glade.h:74 -msgid "Debug Console" -msgstr "" - -#: ../scope/data/scope.glade.h:75 +#: ../scope/data/scope.glade.h:73 #, fuzzy msgid "Enter gdb command:" msgstr "Extern commando op te openen" -#: ../scope/data/scope.glade.h:76 +#: ../scope/data/scope.glade.h:74 msgid "Convert _UTF-8 to locale" msgstr "" -#: ../scope/data/scope.glade.h:77 +#: ../scope/data/scope.glade.h:75 msgid "_Thread" msgstr "" -#: ../scope/data/scope.glade.h:78 +#: ../scope/data/scope.glade.h:76 msgid "_Group" msgstr "" -#: ../scope/data/scope.glade.h:79 +#: ../scope/data/scope.glade.h:77 msgid "_Frame" msgstr "" -#: ../scope/data/scope.glade.h:80 +#: ../scope/data/scope.glade.h:78 msgid "Setup Program" msgstr "" -#: ../scope/data/scope.glade.h:81 +#: ../scope/data/scope.glade.h:79 msgid "_Executable:" msgstr "" -#: ../scope/data/scope.glade.h:82 +#: ../scope/data/scope.glade.h:80 #, fuzzy msgid "_Arguments:" msgstr "Uitlijning" -#: ../scope/data/scope.glade.h:83 +#: ../scope/data/scope.glade.h:81 #, fuzzy msgid "En_vironment:" msgstr "Omgevingsvariabelen" -#: ../scope/data/scope.glade.h:84 +#: ../scope/data/scope.glade.h:82 msgid "_Working dir:" msgstr "" -#: ../scope/data/scope.glade.h:85 +#: ../scope/data/scope.glade.h:83 msgid "_Load script:" msgstr "" -#: ../scope/data/scope.glade.h:86 +#: ../scope/data/scope.glade.h:84 msgid "Auto _run program/exit gdb" msgstr "" -#: ../scope/data/scope.glade.h:87 +#: ../scope/data/scope.glade.h:85 msgid "_Non-stop mode" msgstr "" -#: ../scope/data/scope.glade.h:88 -msgid "_Temporary breakpoint at:" +#: ../scope/data/scope.glade.h:86 +msgid "_Temporary breakpoint on load at:" msgstr "" -#: ../scope/data/scope.glade.h:89 -msgid "_Delete all breakpoints, watches and inspects" +#: ../scope/data/scope.glade.h:87 +msgid "_Delete all breakpoints, watches, inspects and registers" msgstr "" -#: ../scope/data/scope.glade.h:90 ../scope/src/prefs.c:337 +#: ../scope/data/scope.glade.h:88 ../scope/src/scope.c:522 msgid "Program" msgstr "" -#: ../scope/data/scope.glade.h:91 +#: ../scope/data/scope.glade.h:89 #, fuzzy msgid "Open on" msgstr "Open URI" -#: ../scope/data/scope.glade.h:92 +#: ../scope/data/scope.glade.h:90 msgid "g_db load" msgstr "" -#: ../scope/data/scope.glade.h:93 +#: ../scope/data/scope.glade.h:91 msgid "p_rogram start" msgstr "" -#: ../scope/data/scope.glade.h:94 +#: ../scope/data/scope.glade.h:92 #, fuzzy msgid "Update all _views" msgstr "Update takenlijst" -#: ../scope/data/scope.glade.h:95 +#: ../scope/data/scope.glade.h:93 msgid "Panel" msgstr "" -#: ../scope/data/scope.glade.h:96 +#: ../scope/data/scope.glade.h:94 msgid "Default 8-bit text mode:" msgstr "" -#: ../scope/data/scope.glade.h:97 +#: ../scope/data/scope.glade.h:95 msgid "_7-bit \\nnn" msgstr "" -#: ../scope/data/scope.glade.h:98 +#: ../scope/data/scope.glade.h:96 msgid "Display" msgstr "" -#: ../scope/data/scope.glade.h:99 +#: ../scope/data/scope.glade.h:97 msgid "_member" msgstr "" -#: ../scope/data/scope.glade.h:100 +#: ../scope/data/scope.glade.h:98 #, fuzzy msgid "and" msgstr "fout" -#: ../scope/data/scope.glade.h:101 +#: ../scope/data/scope.glade.h:99 msgid "_argument" msgstr "" -#: ../scope/data/scope.glade.h:102 +#: ../scope/data/scope.glade.h:100 #, fuzzy msgid "names" msgstr "Hernoem" -#: ../scope/data/scope.glade.h:103 +#: ../scope/data/scope.glade.h:101 msgid "Values" msgstr "" -#: ../scope/data/scope.glade.h:104 +#: ../scope/data/scope.glade.h:102 #, fuzzy msgid "E_xpand on apply" msgstr "Alles uitvouwen" -#: ../scope/data/scope.glade.h:105 +#: ../scope/data/scope.glade.h:103 msgid "S_how" msgstr "" -#: ../scope/data/scope.glade.h:106 +#: ../scope/data/scope.glade.h:104 msgid "children" msgstr "" -#: ../scope/data/scope.glade.h:107 +#: ../scope/data/scope.glade.h:105 msgid "Inspect" msgstr "" -#: ../scope/data/scope.glade.h:108 +#: ../scope/data/scope.glade.h:106 msgid "Show =li_brary messages" msgstr "" -#: ../scope/data/scope.glade.h:109 +#: ../scope/data/scope.glade.h:107 #, fuzzy msgid "Show _tooltips" msgstr "Laat balk met hulpmiddelen zien" -#: ../scope/data/scope.glade.h:110 +#: ../scope/data/scope.glade.h:108 msgid "Others" msgstr "" -#: ../scope/data/scope.glade.h:111 +#: ../scope/data/scope.glade.h:109 #, fuzzy msgid "Options" msgstr "Zoektermen:" -#: ../scope/data/scope.glade.h:112 +#: ../scope/data/scope.glade.h:110 #, fuzzy msgid "_Import" msgstr "Rapport" -#: ../scope/data/scope.glade.h:113 +#: ../scope/data/scope.glade.h:111 #, fuzzy msgid "Enter assignment expression:" msgstr "Kan expressie niet evalueren" -#: ../scope/data/scope.glade.h:114 +#: ../scope/data/scope.glade.h:112 msgid "Inspect" msgstr "" -#: ../scope/data/scope.glade.h:115 +#: ../scope/data/scope.glade.h:113 #, fuzzy msgid "Object:" msgstr "Hernoem object" -#: ../scope/data/scope.glade.h:117 +#: ../scope/data/scope.glade.h:115 msgid "-" msgstr "" -#: ../scope/data/scope.glade.h:118 +#: ../scope/data/scope.glade.h:116 msgid "Frame:" msgstr "" -#: ../scope/data/scope.glade.h:119 +#: ../scope/data/scope.glade.h:117 msgid "@" msgstr "" -#: ../scope/data/scope.glade.h:120 +#: ../scope/data/scope.glade.h:118 msgid "_Apply on run" msgstr "" -#: ../scope/data/scope.glade.h:121 +#: ../scope/data/scope.glade.h:119 #, fuzzy msgid "Expand" msgstr "Alles uitvouwen" -#: ../scope/data/scope.glade.h:122 +#: ../scope/data/scope.glade.h:120 #, fuzzy msgid "Start:" msgstr "Herstart" -#: ../scope/data/scope.glade.h:123 +#: ../scope/data/scope.glade.h:121 msgid "Count:" msgstr "" -#: ../scope/data/scope.glade.h:124 +#: ../scope/data/scope.glade.h:122 #, fuzzy msgid "_Expand on apply" msgstr "Alles uitvouwen" -#: ../scope/src/break.c:947 +#: ../scope/data/scope.glade.h:123 ../scope/src/scope.c:522 +#, fuzzy +msgid "Program Terminal" +msgstr "Debug terminaalvenster" + +#: ../scope/data/scope.glade.h:125 +msgid "Registers" +msgstr "" + +#: ../scope/src/break.c:97 +#, fuzzy +msgid "breakpoint" +msgstr "Breekpunten" + +#: ../scope/src/break.c:98 +#, fuzzy +msgid "hardware breakpoint" +msgstr "Breekpunten" + +#: ../scope/src/break.c:99 +#, fuzzy +msgid "tracepoint" +msgstr "Breekpunten" + +#: ../scope/src/break.c:100 +msgid "fast tracepoint" +msgstr "" + +#: ../scope/src/break.c:101 +msgid "write watchpoint" +msgstr "" + +#: ../scope/src/break.c:104 +msgid "access watchpoint" +msgstr "" + +#: ../scope/src/break.c:106 +#, fuzzy +msgid "read watchpoint" +msgstr "Breekpunten" + +#: ../scope/src/break.c:108 +msgid "catchpoint" +msgstr "" + +#: ../scope/src/break.c:135 ../scope/src/break.c:139 +msgid "CLI" +msgstr "" + +#: ../scope/src/break.c:136 +msgid "unsupported MI" +msgstr "" + +#: ../scope/src/break.c:141 +msgid "on load" +msgstr "" + +#: ../scope/src/break.c:142 +#, fuzzy +msgid "Run to Cursor" +msgstr "Ga door tot cursor" + +#: ../scope/src/break.c:1013 #, c-format msgid "" "There are two or more breakpoints at %s:%d.\n" +"\n" "Use the breakpoint list to remove the exact one." msgstr "" -#: ../scope/src/break.c:1200 +#: ../scope/src/break.c:1252 +#, c-format +msgid ", %s" +msgstr "" + +#: ../scope/src/break.c:1278 +#, c-format +msgid "func %s" +msgstr "" + +#: ../scope/src/break.c:1309 #, fuzzy msgid "Add Breakpoint" msgstr "Breekpunten" -#: ../scope/src/break.c:1215 +#: ../scope/src/break.c:1324 msgid "Add Watchpoint" msgstr "" @@ -5246,7 +5598,8 @@ msgid "Enter char # (0..255):" msgstr "" -#: ../scope/src/conterm.c:466 ../scope/src/scope.c:502 +#: ../scope/src/conterm.c:509 ../scope/src/scope.c:550 +#: ../scope/src/scope.c:551 #, fuzzy, c-format msgid "Scope: %s." msgstr "Sluit: %s" @@ -5265,62 +5618,63 @@ msgid "Program terminated." msgstr "" -#: ../scope/src/debug.c:468 +#: ../scope/src/debug.c:469 msgid "No breakpoints. Hanging." msgstr "" -#: ../scope/src/debug.c:596 ../scope/src/thread.c:97 +#: ../scope/src/debug.c:598 ../scope/src/thread.c:92 #, c-format msgid "%s." msgstr "" -#: ../scope/src/inspect.c:77 +#: ../scope/src/inspect.c:66 msgid "..." msgstr "" -#: ../scope/src/inspect.c:324 +#: ../scope/src/inspect.c:339 msgid "invalid data" msgstr "" -#: ../scope/src/inspect.c:356 +#: ../scope/src/inspect.c:371 msgid "no children in range" msgstr "" -#: ../scope/src/inspect.c:440 +#: ../scope/src/inspect.c:454 msgid "out of scope" msgstr "" -#: ../scope/src/inspect.c:587 +#: ../scope/src/inspect.c:627 msgid "Duplicate inspect variable name." msgstr "" -#: ../scope/src/memory.c:299 +#: ../scope/src/memory.c:292 msgid "Read Memory" msgstr "" -#: ../scope/src/memory.c:408 -msgid "Scope: pointer size > 8, Data disabled." +#: ../scope/src/memory.c:396 +#, c-format +msgid "Scope: pointer size > %d, Data disabled." msgstr "" -#: ../scope/src/menu.c:380 +#: ../scope/src/menu.c:375 msgid "Modify" msgstr "" -#: ../scope/src/menu.c:490 +#: ../scope/src/menu.c:481 msgid "Evaluate/modify" msgstr "" -#: ../scope/src/menu.c:491 +#: ../scope/src/menu.c:482 #, fuzzy msgid "Watch expression" msgstr "Kan expressie niet evalueren" -#: ../scope/src/menu.c:492 +#: ../scope/src/menu.c:483 #, fuzzy msgid "Inspect variable" msgstr "Verwijder variabele?" -#: ../scope/src/parse.c:416 +#: ../scope/src/parse.c:437 msgid "Undefined GDB error." msgstr "" @@ -5334,36 +5688,27 @@ msgid "Select File" msgstr "Selecteer een ondertekenaar" -#: ../scope/src/prefs.c:338 -#, fuzzy -msgid "Breaks" -msgstr "Breekpunten" - -#: ../scope/src/prefs.c:339 -msgid "Console" -msgstr "" - -#: ../scope/src/prefs.c:347 ../scope/src/utils.c:570 +#: ../scope/src/prefs.c:294 ../scope/src/utils.c:438 #, c-format msgid "Scope: %s: %s." msgstr "" -#: ../scope/src/prefs.c:352 +#: ../scope/src/prefs.c:299 #, fuzzy msgid "Scope: created configuration file." msgstr "Fout gedurende inladen configuratie bestand" -#: ../scope/src/program.c:231 +#: ../scope/src/program.c:251 #, c-format msgid "Loaded debug settings for %s." msgstr "" -#: ../scope/src/program.c:239 +#: ../scope/src/program.c:259 #, c-format msgid "Could not load debug settings file %s: %s." msgstr "" -#: ../scope/src/program.c:359 +#: ../scope/src/program.c:379 #, fuzzy, c-format msgid "" "%s: %s.\n" @@ -5371,15 +5716,15 @@ "Continue?" msgstr "Ga door" -#: ../scope/src/program.c:394 -msgid "Delete all breakpoints, watches and inspects?" +#: ../scope/src/program.c:415 +msgid "Delete all breakpoints, watches et cetera?" msgstr "" -#: ../scope/src/program.c:501 +#: ../scope/src/program.c:523 msgid "as _Name=value" msgstr "" -#: ../scope/src/program.c:502 +#: ../scope/src/program.c:524 msgid "as _Name = value" msgstr "" @@ -5388,165 +5733,178 @@ msgstr "" #: ../scope/src/scope.c:35 -msgid "Simple GDB front-end." +msgid "Relatively simple GDB front-end." msgstr "" -#: ../scope/src/scope.c:63 +#: ../scope/src/scope.c:62 msgid "Setup program" msgstr "" # -#: ../scope/src/scope.c:64 +#: ../scope/src/scope.c:63 #, fuzzy msgid "Run/continue" msgstr "Start / Ga door" -#: ../scope/src/scope.c:66 +#: ../scope/src/scope.c:65 #, fuzzy msgid "Run to source" msgstr "Ga door tot cursor" -#: ../scope/src/scope.c:70 +#: ../scope/src/scope.c:69 #, fuzzy msgid "Terminate" msgstr "Open terminalvenster" -#: ../scope/src/scope.c:71 +#: ../scope/src/scope.c:70 #, fuzzy msgid "Toggle breakpoint" msgstr "Breekpunten" -#: ../scope/src/scope.c:73 ../scope/src/scope.c:76 +#: ../scope/src/scope.c:72 ../scope/src/scope.c:75 msgid "GDB command" msgstr "" -#: ../scope/src/scope.c:74 +#: ../scope/src/scope.c:73 #, fuzzy msgid "Show terminal" msgstr "Laat regels van boom zien" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Busy" msgstr "" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Ready" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Hang" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Assem" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Load" msgstr "" -#: ../scope/src/scope.c:394 +#: ../scope/src/scope.c:421 msgid "Build action activated. Terminate debugging?" msgstr "" -#: ../scope/src/thread.c:58 +#: ../scope/src/scope.c:524 +#, fuzzy +msgid "Breaks" +msgstr "Breekpunten" + +#: ../scope/src/scope.c:526 +msgid "Console" +msgstr "" + +#: ../scope/src/scope.c:526 +msgid "Debug Console" +msgstr "" + +#: ../scope/src/thread.c:48 #, c-format msgid "Thread group %s started." msgstr "" -#: ../scope/src/thread.c:76 +#: ../scope/src/thread.c:63 msgid "Thread group " msgstr "" -#: ../scope/src/thread.c:88 +#: ../scope/src/thread.c:83 msgid " exited" msgstr "" -#: ../scope/src/thread.c:91 +#: ../scope/src/thread.c:86 #, c-format msgid " with exit code %s" msgstr "" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 msgid "Send Signal" msgstr "" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 msgid "Enter signal #:" msgstr "" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Terminate Process" msgstr "" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Enter exit code:" msgstr "" -#: ../scope/src/thread.c:937 +#: ../scope/src/thread.c:891 msgid "Running" msgstr "" -#: ../scope/src/thread.c:938 +#: ../scope/src/thread.c:892 #, fuzzy msgid "Stopped" msgstr "Stop" -#: ../scope/src/utils.c:44 -#, c-format -msgid "%s: error %lu." -msgstr "" +#: ../scope/src/utils.c:45 +#, fuzzy, c-format +msgid "%s: %s" +msgstr "Sluit: %s" -#: ../scope/src/utils.c:358 +#: ../scope/src/utils.c:225 #, c-format msgid "Scope: error reading [%s]." msgstr "" -#: ../scope/src/views.c:505 +#: ../scope/src/views.c:526 msgid "…" msgstr "" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Send" msgstr "" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Busy" msgstr "" -#: ../scope/src/views.c:535 +#: ../scope/src/views.c:558 #, fuzzy msgid "GDB Command" msgstr "Commando 0:" -#: ../spellcheck/src/speller.c:94 +#: ../spellcheck/src/speller.c:180 msgid "Try: " msgstr "" -#: ../spellcheck/src/speller.c:173 +#: ../spellcheck/src/speller.c:252 msgid "Checking" msgstr "" -#: ../spellcheck/src/speller.c:186 +#: ../spellcheck/src/speller.c:265 #, c-format msgid "Checking file \"%s\" (lines %d to %d using %s):" msgstr "Controleert bestand \"%s\" (regels %d t/m %d dmv. %s):" -#: ../spellcheck/src/speller.c:196 +#: ../spellcheck/src/speller.c:275 #, c-format msgid "Checking file \"%s\" (using %s):" msgstr "Controleert bestand \"%s\" (dmv. %s):" -#: ../spellcheck/src/speller.c:223 +#: ../spellcheck/src/speller.c:302 msgid "The checked text is spelled correctly." msgstr "The gecontroleerde tekst is korrekt gespeld" -#: ../spellcheck/src/speller.c:233 +#: ../spellcheck/src/speller.c:312 #, c-format msgid "The Enchant library couldn't be initialized (%s)." msgstr "De Enchant bibliotheek kon niet geïnitialiseerd worden (%s)" -#: ../spellcheck/src/speller.c:234 +#: ../spellcheck/src/speller.c:313 msgid "unknown error (maybe the chosen language is not available)" msgstr "onbekende fout (misschien is de gekozen taal niet beschikbaar)" @@ -5636,17 +5994,17 @@ msgid "Ignore All" msgstr "Negeer alles" -#: ../spellcheck/src/gui.c:521 +#: ../spellcheck/src/gui.c:526 #, c-format msgid "Default (%s)" msgstr "" -#: ../spellcheck/src/gui.c:532 +#: ../spellcheck/src/gui.c:537 #, c-format msgid "Toggle spell check while typing (current language: %s)" msgstr "" -#: ../spellcheck/src/gui.c:587 +#: ../spellcheck/src/gui.c:592 msgid "Spelling Suggestions" msgstr "Spellingssuggesties" @@ -5677,28 +6035,28 @@ #. OK. Something went not as expected. #. * We did have a selection but cannot parse it into rows. #. * Aborting -#: ../tableconvert/src/tableconvert.c:236 +#: ../tableconvert/src/tableconvert.c:237 msgid "Something went wrong on parsing selection. Aborting" msgstr "" -#: ../tableconvert/src/tableconvert.c:268 +#: ../tableconvert/src/tableconvert.c:269 msgid "Convert selection to table" msgstr "" #. Build up menu entry -#: ../tableconvert/src/tableconvert.c:281 +#: ../tableconvert/src/tableconvert.c:282 msgid "_Convert to table" msgstr "" -#: ../tableconvert/src/tableconvert.c:284 +#: ../tableconvert/src/tableconvert.c:285 msgid "Converts current marked list to a table." msgstr "" -#: ../treebrowser/src/treebrowser.c:120 +#: ../treebrowser/src/treebrowser.c:124 msgid "TreeBrowser" msgstr "" -#: ../treebrowser/src/treebrowser.c:121 +#: ../treebrowser/src/treebrowser.c:125 msgid "" "This plugin adds a tree browser to Geany, allowing the user to browse files " "using a tree view of the directory being browsed." @@ -5706,30 +6064,30 @@ "Deze plug-in voegt een TreeBrowser toe aan Geany, waardoor de gebruiker door " "de boomstructuur van de huidige map heen kan bladeren." -#: ../treebrowser/src/treebrowser.c:430 +#: ../treebrowser/src/treebrowser.c:434 #, c-format msgid "%s: no such directory." msgstr "%s: map bestaat niet." -#: ../treebrowser/src/treebrowser.c:526 ../treebrowser/src/treebrowser.c:561 -#: ../treebrowser/src/treebrowser.c:663 +#: ../treebrowser/src/treebrowser.c:537 ../treebrowser/src/treebrowser.c:572 +#: ../treebrowser/src/treebrowser.c:670 msgid "(Empty)" msgstr "(Leeg)" -#: ../treebrowser/src/treebrowser.c:966 +#: ../treebrowser/src/treebrowser.c:971 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Kon extern geconfigureerde commando '%s' (%s) niet uitvoeren." -#: ../treebrowser/src/treebrowser.c:1037 +#: ../treebrowser/src/treebrowser.c:1042 msgid "NewDirectory" msgstr "NieuweMap" -#: ../treebrowser/src/treebrowser.c:1039 +#: ../treebrowser/src/treebrowser.c:1044 msgid "NewFile" msgstr "NieuwBestand" -#: ../treebrowser/src/treebrowser.c:1044 +#: ../treebrowser/src/treebrowser.c:1049 #, c-format msgid "" "Target file '%s' exists\n" @@ -5738,96 +6096,100 @@ "Doelbestand '%s' bestaat reeds,\n" "wil je het echt vervangen door een leeg bestand?" -#: ../treebrowser/src/treebrowser.c:1089 +#: ../treebrowser/src/treebrowser.c:1095 #, c-format msgid "Do you really want to delete '%s' ?" msgstr "Wil je echt '%s' verwijderen?" -#: ../treebrowser/src/treebrowser.c:1208 ../treebrowser/src/treebrowser.c:1692 +#: ../treebrowser/src/treebrowser.c:1207 ../treebrowser/src/treebrowser.c:1738 msgid "Go up" msgstr "Ga naar boven" -#: ../treebrowser/src/treebrowser.c:1212 ../treebrowser/src/treebrowser.c:1707 +#: ../treebrowser/src/treebrowser.c:1211 ../treebrowser/src/treebrowser.c:1753 msgid "Set path from document" msgstr "Zet pad van document" -#: ../treebrowser/src/treebrowser.c:1216 -msgid "Open externally" -msgstr "" +#: ../treebrowser/src/treebrowser.c:1215 +msgid "_Open externally" +msgstr "Open extern" -#: ../treebrowser/src/treebrowser.c:1221 +#: ../treebrowser/src/treebrowser.c:1220 msgid "Open Terminal" msgstr "Open terminalvenster" -#: ../treebrowser/src/treebrowser.c:1225 +#: ../treebrowser/src/treebrowser.c:1224 msgid "Set as root" msgstr "Stel in als begin" -#: ../treebrowser/src/treebrowser.c:1230 ../treebrowser/src/treebrowser.c:1697 -#: ../treebrowser/src/treebrowser.c:2060 +#: ../treebrowser/src/treebrowser.c:1229 ../treebrowser/src/treebrowser.c:1743 +#: ../treebrowser/src/treebrowser.c:2123 msgid "Refresh" msgstr "Ververs" -#: ../treebrowser/src/treebrowser.c:1242 +#: ../treebrowser/src/treebrowser.c:1233 +msgid "_Find in Files" +msgstr "Zoek in bestanden" + +#: ../treebrowser/src/treebrowser.c:1241 msgid "Create new directory" msgstr "Creër nieuwe map" -#: ../treebrowser/src/treebrowser.c:1246 +#: ../treebrowser/src/treebrowser.c:1245 msgid "Create new file" msgstr "Creër nieuw bestand" -#: ../treebrowser/src/treebrowser.c:1250 +#: ../treebrowser/src/treebrowser.c:1249 msgid "Rename" msgstr "Hernoem" -#: ../treebrowser/src/treebrowser.c:1255 +#: ../treebrowser/src/treebrowser.c:1254 msgid "Delete" msgstr "Verwijder" -#: ../treebrowser/src/treebrowser.c:1263 +#: ../treebrowser/src/treebrowser.c:1262 #, c-format msgid "Close: %s" msgstr "Sluit: %s" -#: ../treebrowser/src/treebrowser.c:1268 +#: ../treebrowser/src/treebrowser.c:1267 #, c-format msgid "Close Child Documents " msgstr "Sluit " -#: ../treebrowser/src/treebrowser.c:1273 -msgid "Copy full path to clipboard" -msgstr "Kopiëer volledig pad naar klembord" +#: ../treebrowser/src/treebrowser.c:1272 +msgid "_Copy full path to clipboard" +msgstr "Kopiëer volledig padnaam naar klembord" -#: ../treebrowser/src/treebrowser.c:1293 ../treebrowser/src/treebrowser.c:1974 +#: ../treebrowser/src/treebrowser.c:1292 ../treebrowser/src/treebrowser.c:2032 msgid "Show bookmarks" msgstr "Laat bladwijzers zien" -#: ../treebrowser/src/treebrowser.c:1298 ../treebrowser/src/treebrowser.c:1928 +#: ../treebrowser/src/treebrowser.c:1297 ../treebrowser/src/treebrowser.c:1981 msgid "Show hidden files" msgstr "Laat verborgen bestanden zien" -#: ../treebrowser/src/treebrowser.c:1303 +#: ../treebrowser/src/treebrowser.c:1302 msgid "Show toolbars" msgstr "Laat balk met hulpmiddelen zien" -#: ../treebrowser/src/treebrowser.c:1574 +#: ../treebrowser/src/treebrowser.c:1621 #, c-format msgid "Target file '%s' exists, do you really want to replace it?" msgstr "Doelbestand '%s' bestaat, wil je het echt vervangen?" -#: ../treebrowser/src/treebrowser.c:1702 +#: ../treebrowser/src/treebrowser.c:1748 msgid "Home" msgstr "Thuis" -#: ../treebrowser/src/treebrowser.c:1712 +#: ../treebrowser/src/treebrowser.c:1758 msgid "Track path" msgstr "Volg pad" -#: ../treebrowser/src/treebrowser.c:1717 +#: ../treebrowser/src/treebrowser.c:1763 msgid "Hide bars" msgstr "Verberg balken" -#: ../treebrowser/src/treebrowser.c:1727 +#: ../treebrowser/src/treebrowser.c:1773 msgid "" "Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' " "reverse try for example this '!;*.c;*.h;*.cpp'" @@ -5835,19 +6197,19 @@ "Filter (*.c;*.h;*.cpp), en als je tijdelijk andersom wilt filteren gebruik " "'!' zoals bijvoorbeeld '!;*.c;*.h;*.cpp'" -#: ../treebrowser/src/treebrowser.c:1735 +#: ../treebrowser/src/treebrowser.c:1781 msgid "Addressbar for example '/projects/my-project'" msgstr "Adresregel, bijvoorbeeld '/projecten/mijn-project'" -#: ../treebrowser/src/treebrowser.c:1760 +#: ../treebrowser/src/treebrowser.c:1806 msgid "Tree Browser" msgstr "" -#: ../treebrowser/src/treebrowser.c:1892 +#: ../treebrowser/src/treebrowser.c:1945 msgid "External open command" msgstr "Extern commando op te openen" -#: ../treebrowser/src/treebrowser.c:1897 +#: ../treebrowser/src/treebrowser.c:1950 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -5861,51 +6223,51 @@ "%f zal vervangen worden door de bestandsnaam inclusief volledig pad\n" "%d zal vervangen worden door slechts de padnaam van de geselecteerde bestand." -#: ../treebrowser/src/treebrowser.c:1905 +#: ../treebrowser/src/treebrowser.c:1958 msgid "Toolbar" msgstr "Hulpmiddelenbalk" -#: ../treebrowser/src/treebrowser.c:1907 +#: ../treebrowser/src/treebrowser.c:1960 msgid "Hidden" msgstr "Verborgen" -#: ../treebrowser/src/treebrowser.c:1908 +#: ../treebrowser/src/treebrowser.c:1961 msgid "Top" msgstr "Bovenaan" -#: ../treebrowser/src/treebrowser.c:1909 +#: ../treebrowser/src/treebrowser.c:1962 msgid "Bottom" msgstr "Onderaan" -#: ../treebrowser/src/treebrowser.c:1914 +#: ../treebrowser/src/treebrowser.c:1967 msgid "If position is changed, the option require plugin restart." msgstr "De plug-in moet herstart worden als de positie gewijzigd is." -#: ../treebrowser/src/treebrowser.c:1918 +#: ../treebrowser/src/treebrowser.c:1971 msgid "Show icons" msgstr "Laat pictogrammen zien" -#: ../treebrowser/src/treebrowser.c:1920 +#: ../treebrowser/src/treebrowser.c:1973 msgid "None" msgstr "Geen" -#: ../treebrowser/src/treebrowser.c:1921 +#: ../treebrowser/src/treebrowser.c:1974 msgid "Base" msgstr "Basis" -#: ../treebrowser/src/treebrowser.c:1922 +#: ../treebrowser/src/treebrowser.c:1975 msgid "Content-type" msgstr "Inhouds-type" -#: ../treebrowser/src/treebrowser.c:1933 +#: ../treebrowser/src/treebrowser.c:1986 msgid "On Windows, this just hide files that are prefixed with '.' (dot)" msgstr "Dit verbergt bestanden, in Windows, die beginnen met een '.' (punt)" -#: ../treebrowser/src/treebrowser.c:1935 +#: ../treebrowser/src/treebrowser.c:1988 msgid "Hide object files" msgstr "Verberg object bestanden" -#: ../treebrowser/src/treebrowser.c:1940 +#: ../treebrowser/src/treebrowser.c:1993 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -5913,51 +6275,56 @@ "Laat geen gegenereerde object bestanden zien in de bestandsbrowser, " "waaronder *.o, *.obj. *.so, *.dll, *.a, *.lib" -#: ../treebrowser/src/treebrowser.c:1942 +#: ../treebrowser/src/treebrowser.c:1995 msgid "Reverse filter" msgstr "Keer filter om" -#: ../treebrowser/src/treebrowser.c:1947 +#: ../treebrowser/src/treebrowser.c:2000 msgid "Follow current document" msgstr "Volg huidige directory" -#: ../treebrowser/src/treebrowser.c:1952 +#: ../treebrowser/src/treebrowser.c:2005 msgid "Single click, open document and focus it" msgstr "Enkele klik, open document en zet op de voorgrond" -#: ../treebrowser/src/treebrowser.c:1957 +#: ../treebrowser/src/treebrowser.c:2010 msgid "Double click open directory" msgstr "Dubbelklik, open map" -#: ../treebrowser/src/treebrowser.c:1962 +#: ../treebrowser/src/treebrowser.c:2015 msgid "On delete file, close it if is opened" msgstr "Sluit bestand af wanneer het wordt verwijderd en nog geopend is." -#: ../treebrowser/src/treebrowser.c:1967 +#: ../treebrowser/src/treebrowser.c:2020 +msgid "Focus editor on file open" +msgstr "" + +#: ../treebrowser/src/treebrowser.c:2025 msgid "Show tree lines" msgstr "Laat regels van boom zien" -#: ../treebrowser/src/treebrowser.c:2050 +#: ../treebrowser/src/treebrowser.c:2037 #, fuzzy +msgid "Open new files" +msgstr "Creër nieuw bestand" + +#: ../treebrowser/src/treebrowser.c:2113 msgid "Focus File List" -msgstr "Voorgrond bestandslijst" +msgstr "Zet bestandslijst op voorgrond" -#: ../treebrowser/src/treebrowser.c:2052 -#, fuzzy +#: ../treebrowser/src/treebrowser.c:2115 msgid "Focus Path Entry" -msgstr "Voorgrond pad" +msgstr "Zet pad entry op voorgrond" -#: ../treebrowser/src/treebrowser.c:2054 +#: ../treebrowser/src/treebrowser.c:2117 msgid "Rename Object" msgstr "Hernoem object" -#: ../treebrowser/src/treebrowser.c:2056 -#, fuzzy +#: ../treebrowser/src/treebrowser.c:2119 msgid "Create New File" msgstr "Creër nieuw bestand" -#: ../treebrowser/src/treebrowser.c:2058 -#, fuzzy +#: ../treebrowser/src/treebrowser.c:2121 msgid "Create New Directory" msgstr "Creër nieuwe map" @@ -6023,44 +6390,44 @@ msgid "utility" msgstr "" -#: ../webhelper/src/gwh-settings.c:775 +#: ../webhelper/src/gwh-settings.c:782 #, c-format msgid "%s:" msgstr "" -#: ../webhelper/src/gwh-browser.c:528 +#: ../webhelper/src/gwh-browser.c:534 msgid "_Zoom" msgstr "" -#: ../webhelper/src/gwh-browser.c:550 +#: ../webhelper/src/gwh-browser.c:556 msgid "Full-_content zoom" msgstr "" -#: ../webhelper/src/gwh-browser.c:561 +#: ../webhelper/src/gwh-browser.c:567 msgid "Flip panes orientation" msgstr "" -#: ../webhelper/src/gwh-browser.c:808 +#: ../webhelper/src/gwh-browser.c:814 msgid "Back" msgstr "" -#: ../webhelper/src/gwh-browser.c:812 +#: ../webhelper/src/gwh-browser.c:818 msgid "Forward" msgstr "" -#: ../webhelper/src/gwh-browser.c:816 +#: ../webhelper/src/gwh-browser.c:822 msgid "Cancel loading" msgstr "" -#: ../webhelper/src/gwh-browser.c:820 +#: ../webhelper/src/gwh-browser.c:826 msgid "Reload current page" msgstr "Herlaad huidige bladzijde" -#: ../webhelper/src/gwh-browser.c:833 ../webhelper/src/gwh-browser.c:879 +#: ../webhelper/src/gwh-browser.c:839 ../webhelper/src/gwh-browser.c:885 msgid "Web inspector" msgstr "" -#: ../webhelper/src/gwh-browser.c:834 +#: ../webhelper/src/gwh-browser.c:840 msgid "Toggle web inspector" msgstr "" @@ -6189,11 +6556,11 @@ #: ../xmlsnippets/src/plugin.c:45 msgid "XML Snippets" -msgstr "" +msgstr "XML Snippers" #: ../xmlsnippets/src/plugin.c:46 msgid "Autocompletes XML/HTML tags using snippets." -msgstr "" +msgstr "Completeerd automatisch XML/HTML labels." #~ msgid "Unknown signal" #~ msgstr "Onbekend signaal" diff -Nru geany-plugins-1.23+dfsg/po/POTFILES.in geany-plugins-1.24+dfsg/po/POTFILES.in --- geany-plugins-1.23+dfsg/po/POTFILES.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/po/POTFILES.in 2014-04-12 14:28:39.000000000 +0000 @@ -12,6 +12,9 @@ addons/src/ao_doclist.c addons/src/addons.c +# Autoclose +autoclose/src/autoclose.c + # codenav codenav/src/codenavigation.c codenav/src/goto_file.c @@ -49,6 +52,9 @@ debugger/src/atree.h debugger/src/atree.c +# defineformat +defineformat/src/defineformat.c + # devhelp devhelp/src/dhp.h devhelp/src/dhp-object.c @@ -184,6 +190,9 @@ geanyprj/src/utils.c geanyprj/src/xproject.c +# Geanypy +geanypy/src/geanypy-plugin.c + # geanysendmail geanysendmail/src/geanysendmail.c @@ -207,11 +216,17 @@ gproject/src/gproject-project.c gproject/src/gproject-sidebar.c -# Markdown +# Markdown markdown/src/conf.c markdown/src/plugin.c +# Pairtaghighlighter +pairtaghighlighter/src/pair_tag_highlighter.c +# PoHelper +[type: gettext/glade]pohelper/data/menus.ui +pohelper/src/gph-plugin.c + # Pretty-printer pretty-printer/src/PrettyPrinter.c pretty-printer/src/PluginEntry.c @@ -233,6 +248,7 @@ scope/src/thread.c scope/src/utils.c scope/src/views.c +scope/src/store/scptreestore.c # Spell Check spellcheck/src/speller.c diff -Nru geany-plugins-1.23+dfsg/po/pt_BR.po geany-plugins-1.24+dfsg/po/pt_BR.po --- geany-plugins-1.23+dfsg/po/pt_BR.po 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/po/pt_BR.po 2014-04-12 14:28:39.000000000 +0000 @@ -4,9 +4,9 @@ # Adrovane Marques Kade , 2009. msgid "" msgstr "" -"Project-Id-Version: Geany-plugins 1.23\n" +"Project-Id-Version: Geany-plugins 1.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-23 14:32+0100\n" +"POT-Creation-Date: 2014-03-30 19:33+0200\n" "PO-Revision-Date: \n" "Last-Translator: Adrovane Marques Kade \n" "Language-Team: Adrovane Marques Kade \n" @@ -34,12 +34,12 @@ msgid "Contents" msgstr "Conteúdos" -#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:615 +#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:625 msgid "Bookmarks" msgstr "Marcadores" #. complete update -#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2295 +#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2351 msgid "_Update" msgstr "At_ualizar" @@ -76,15 +76,15 @@ msgid "Context:" msgstr "Contexto:" -#: ../addons/src/ao_xmltagging.c:56 +#: ../addons/src/ao_xmltagging.c:54 msgid "XML tagging" msgstr "Rotulação XML" -#: ../addons/src/ao_xmltagging.c:67 +#: ../addons/src/ao_xmltagging.c:65 msgid "Tag name to be inserted:" msgstr "Nome de rótulo a ser inserido:" -#: ../addons/src/ao_xmltagging.c:71 +#: ../addons/src/ao_xmltagging.c:69 #, c-format msgid "" "%s will be replaced with your current selection. Please keep care on your " @@ -155,11 +155,12 @@ msgid "Run XML tagging" msgstr "Executar rotulação de XML" -#: ../addons/src/addons.c:417 ../geanylatex/src/geanylatex.c:241 -#: ../geanyprj/src/geanyprj.c:174 ../geanysendmail/src/geanysendmail.c:121 -#: ../geanysendmail/src/geanysendmail.c:287 ../geanyvc/src/geanyvc.c:1798 +#: ../addons/src/addons.c:417 ../autoclose/src/autoclose.c:871 +#: ../geanylatex/src/geanylatex.c:241 ../geanyprj/src/geanyprj.c:174 +#: ../geanysendmail/src/geanysendmail.c:123 +#: ../geanysendmail/src/geanysendmail.c:291 ../geanyvc/src/geanyvc.c:1854 #: ../geniuspaste/src/geniuspaste.c:140 ../spellcheck/src/scplugin.c:146 -#: ../treebrowser/src/treebrowser.c:1880 +#: ../treebrowser/src/treebrowser.c:1933 #: ../updatechecker/src/updatechecker.c:253 msgid "Plugin configuration directory could not be created." msgstr "O diretório de configuração de plugins não pôde ser criado." @@ -254,6 +255,14 @@ msgid "Enclose selection automatically (without having to press a keybinding)" msgstr "" +#: ../autoclose/src/autoclose.c:50 +msgid "Auto-close" +msgstr "" + +#: ../autoclose/src/autoclose.c:51 +msgid "Auto-close braces and brackets with lot of features" +msgstr "" + #: ../codenav/src/codenavigation.c:52 msgid "Code navigation" msgstr "Navegação no Código" @@ -324,8 +333,8 @@ msgid "Various debuggers integration." msgstr "" -#: ../debugger/src/plugin.c:131 ../debugger/src/keys.c:76 -#: ../scope/data/scope.glade.h:125 ../scope/src/scope.c:225 +#: ../debugger/src/plugin.c:133 ../debugger/src/keys.c:76 +#: ../scope/data/scope.glade.h:124 ../scope/src/scope.c:226 msgid "Debug" msgstr "Depurar" @@ -469,7 +478,7 @@ msgid "Target" msgstr "large" -#: ../debugger/src/tabs.c:135 ../scope/data/scope.glade.h:69 +#: ../debugger/src/tabs.c:135 ../scope/src/scope.c:524 msgid "Breakpoints" msgstr "Pontos de quebra" @@ -512,24 +521,24 @@ msgstr "iniciando" #: ../debugger/src/keys.c:52 ../debugger/src/btnpanel.c:113 -#: ../scope/src/scope.c:67 +#: ../scope/src/scope.c:66 #, fuzzy msgid "Step into" msgstr "Step _in" #: ../debugger/src/keys.c:53 ../debugger/src/btnpanel.c:110 -#: ../scope/src/scope.c:68 +#: ../scope/src/scope.c:67 msgid "Step over" msgstr "" #: ../debugger/src/keys.c:54 ../debugger/src/btnpanel.c:122 -#: ../scope/src/scope.c:69 +#: ../scope/src/scope.c:68 #, fuzzy msgid "Step out" msgstr "Step _in" #: ../debugger/src/keys.c:55 ../debugger/src/btnpanel.c:125 -#: ../scope/src/scope.c:65 +#: ../scope/src/scope.c:64 #, fuzzy msgid "Run to cursor" msgstr "Executar até o local" @@ -541,7 +550,7 @@ #: ../debugger/src/keys.c:57 #, fuzzy -msgid "Jump to the currect instruction" +msgid "Jump to the current instruction" msgstr "Completa a função atualmente em execução." #: ../debugger/src/watch_model.c:220 @@ -576,6 +585,14 @@ msgid "Save debug session data to a project" msgstr "" +#: ../defineformat/src/defineformat.c:56 +msgid "Define formatter" +msgstr "" + +#: ../defineformat/src/defineformat.c:57 +msgid "Automatically align backslash in multi-line defines" +msgstr "" + #. never search for more than this many chars #: ../devhelp/src/dhp.h:38 #, fuzzy @@ -690,7 +707,7 @@ msgstr "Book" #. i18n: a documentation book -#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1760 +#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1759 msgid "Book" msgstr "Book" @@ -821,12 +838,12 @@ msgid "A developers' help browser for GNOME" msgstr "" -#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2010 +#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2066 msgid "_File" msgstr "_Arquivo" -#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1815 -#: ../geanymacro/src/geanymacro.c:2112 +#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1822 +#: ../geanymacro/src/geanymacro.c:2118 #, fuzzy msgid "_Edit" msgstr "Editor" @@ -1019,57 +1036,66 @@ msgid "Column mode, select to line / brace / anchor." msgstr "Modo coluna, seleção até a linha / colchete casado." -#: ../geanyextrasel/src/extrasel.c:482 +#: ../geanyextrasel/src/extrasel.c:502 msgid "E_xtra Selection" msgstr "Seleção E_xtra" -#: ../geanyextrasel/src/extrasel.c:489 +#: ../geanyextrasel/src/extrasel.c:509 msgid "_Column Mode" msgstr "Modo _Coluna" -#: ../geanyextrasel/src/extrasel.c:494 +#: ../geanyextrasel/src/extrasel.c:514 msgid "Column mode" msgstr "Modo coluna" -#: ../geanyextrasel/src/extrasel.c:496 +#: ../geanyextrasel/src/extrasel.c:516 msgid "Select to _Line" msgstr "Selecionar até _Linha" -#: ../geanyextrasel/src/extrasel.c:500 +#: ../geanyextrasel/src/extrasel.c:520 msgid "Select to line" msgstr "Seleciona até a linha" -#: ../geanyextrasel/src/extrasel.c:502 +#: ../geanyextrasel/src/extrasel.c:522 msgid "Select to Matching _Brace" msgstr "Selecionar até o C_olchete Casado" -#: ../geanyextrasel/src/extrasel.c:506 +#: ../geanyextrasel/src/extrasel.c:526 msgid "Select to matching brace" msgstr "Selecionar até o colchete casado" -#: ../geanyextrasel/src/extrasel.c:510 +#: ../geanyextrasel/src/extrasel.c:528 +msgid "_Toggle Stream/Rectangular" +msgstr "" + +#: ../geanyextrasel/src/extrasel.c:532 +#, fuzzy +msgid "Convert selection" +msgstr "Formatar seleção alinhado à esquerda" + +#: ../geanyextrasel/src/extrasel.c:537 msgid "_Set Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:514 +#: ../geanyextrasel/src/extrasel.c:541 msgid "Set anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:516 +#: ../geanyextrasel/src/extrasel.c:543 #, fuzzy msgid "Select to _Anchor" msgstr "Selecionar até _Linha" -#: ../geanyextrasel/src/extrasel.c:520 +#: ../geanyextrasel/src/extrasel.c:547 #, fuzzy msgid "Select to anchor" msgstr "Seleciona até a linha" -#: ../geanyextrasel/src/extrasel.c:522 +#: ../geanyextrasel/src/extrasel.c:549 msgid "_Rectangle Select to Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:527 +#: ../geanyextrasel/src/extrasel.c:554 msgid "Rectangle select to anchor" msgstr "" @@ -1482,76 +1508,76 @@ msgstr "" "Tipo de documentação padrão para linguagens que não tem um tipo definido" -#: ../geanyinsertnum/src/insertnum.c:37 ../geanyinsertnum/src/insertnum.c:329 -#: ../geanyinsertnum/src/insertnum.c:461 +#: ../geanyinsertnum/src/insertnum.c:44 ../geanyinsertnum/src/insertnum.c:337 +#: ../geanyinsertnum/src/insertnum.c:484 msgid "Insert Numbers" msgstr "Inserir Números" -#: ../geanyinsertnum/src/insertnum.c:37 +#: ../geanyinsertnum/src/insertnum.c:44 msgid "Insert/Fill columns with numbers." msgstr "Inserir/Preencher colunas com números." -#: ../geanyinsertnum/src/insertnum.c:140 +#: ../geanyinsertnum/src/insertnum.c:146 msgid "Counting..." msgstr "Contando..." -#: ../geanyinsertnum/src/insertnum.c:188 +#: ../geanyinsertnum/src/insertnum.c:194 msgid "Preparing..." msgstr "Preparando..." -#: ../geanyinsertnum/src/insertnum.c:194 +#: ../geanyinsertnum/src/insertnum.c:200 msgid "Inserting..." msgstr "Inserindo..." -#: ../geanyinsertnum/src/insertnum.c:318 +#: ../geanyinsertnum/src/insertnum.c:333 msgid "For base 11 and above" msgstr "Para base 11 e acima" -#: ../geanyinsertnum/src/insertnum.c:341 +#: ../geanyinsertnum/src/insertnum.c:353 msgid "_Start:" msgstr "_Início:" -#: ../geanyinsertnum/src/insertnum.c:346 +#: ../geanyinsertnum/src/insertnum.c:358 msgid "S_tep:" msgstr "_Passo:" -#: ../geanyinsertnum/src/insertnum.c:352 +#: ../geanyinsertnum/src/insertnum.c:364 msgid "_Base:" msgstr "_Base:" -#: ../geanyinsertnum/src/insertnum.c:363 +#: ../geanyinsertnum/src/insertnum.c:380 msgid "Letters:" msgstr "Letras:" -#: ../geanyinsertnum/src/insertnum.c:366 +#: ../geanyinsertnum/src/insertnum.c:383 msgid "_Upper" msgstr "Maiúsc_ulas" -#: ../geanyinsertnum/src/insertnum.c:371 +#: ../geanyinsertnum/src/insertnum.c:388 msgid "_Lower" msgstr "_Minúscul_o" -#: ../geanyinsertnum/src/insertnum.c:376 +#: ../geanyinsertnum/src/insertnum.c:393 msgid "Base _prefix" msgstr "_Prefixo base" -#: ../geanyinsertnum/src/insertnum.c:378 +#: ../geanyinsertnum/src/insertnum.c:395 msgid "0 for octal, 0x for hex, + for positive decimal" msgstr "0 para octal, 0x para hexa, + para decimal positivo" -#: ../geanyinsertnum/src/insertnum.c:380 +#: ../geanyinsertnum/src/insertnum.c:397 msgid "Padding:" msgstr "Padding:" -#: ../geanyinsertnum/src/insertnum.c:382 +#: ../geanyinsertnum/src/insertnum.c:399 msgid "Sp_ace" msgstr "Esp_aço" -#: ../geanyinsertnum/src/insertnum.c:385 +#: ../geanyinsertnum/src/insertnum.c:402 msgid "_Zero" msgstr "_Zero" -#: ../geanyinsertnum/src/insertnum.c:454 +#: ../geanyinsertnum/src/insertnum.c:477 msgid "Insert _Numbers" msgstr "Inserir _Números" @@ -1990,20 +2016,20 @@ msgid "BibTeX reference name:" msgstr "Nome da referência:" -#: ../geanylatex/src/geanylatex.c:1680 +#: ../geanylatex/src/geanylatex.c:1679 msgid "Dear Sir or Madame" msgstr "Prezado Sr. ou Sra." -#: ../geanylatex/src/geanylatex.c:1681 +#: ../geanylatex/src/geanylatex.c:1680 msgid "With kind regards" msgstr "Atenciosamente" -#: ../geanylatex/src/geanylatex.c:1689 +#: ../geanylatex/src/geanylatex.c:1688 msgid "No template assigned. Aborting" msgstr "Nenhum template atribuído. Abortando." #. Building the wizard-dialog and showing it -#: ../geanylatex/src/geanylatex.c:1716 +#: ../geanylatex/src/geanylatex.c:1715 msgid "LaTeX-Wizard" msgstr "LaTeX-Wizard" @@ -2011,68 +2037,68 @@ #. * Adds custom templates if there are any. If there are none just #. * adds default one #. TEMPLATE FILE -#: ../geanylatex/src/geanylatex.c:1731 ../markdown/src/conf.c:666 +#: ../geanylatex/src/geanylatex.c:1730 ../markdown/src/conf.c:659 msgid "Template:" msgstr "Template:" -#: ../geanylatex/src/geanylatex.c:1735 +#: ../geanylatex/src/geanylatex.c:1734 msgid "Set the template which should be used for creating the new document" msgstr "Definir o template que deve ser usado para criar o novo documento" -#: ../geanylatex/src/geanylatex.c:1744 +#: ../geanylatex/src/geanylatex.c:1743 msgid "Default" msgstr "Padrão" #. Documentclass -#: ../geanylatex/src/geanylatex.c:1755 +#: ../geanylatex/src/geanylatex.c:1754 msgid "Documentclass:" msgstr "Documentclass:" -#: ../geanylatex/src/geanylatex.c:1758 +#: ../geanylatex/src/geanylatex.c:1757 msgid "Choose the kind of document you want to write" msgstr "Escolha o tipo de documento que você quer escrever" -#: ../geanylatex/src/geanylatex.c:1762 +#: ../geanylatex/src/geanylatex.c:1761 msgid "Article" msgstr "Article" -#: ../geanylatex/src/geanylatex.c:1764 +#: ../geanylatex/src/geanylatex.c:1763 msgid "Report" msgstr "Report" -#: ../geanylatex/src/geanylatex.c:1766 +#: ../geanylatex/src/geanylatex.c:1765 msgid "Letter" msgstr "Letter" -#: ../geanylatex/src/geanylatex.c:1768 +#: ../geanylatex/src/geanylatex.c:1767 msgid "Presentation" msgstr "Apresentação" #. Encoding -#: ../geanylatex/src/geanylatex.c:1778 +#: ../geanylatex/src/geanylatex.c:1777 msgid "Encoding:" msgstr "Codificação" -#: ../geanylatex/src/geanylatex.c:1782 +#: ../geanylatex/src/geanylatex.c:1781 msgid "Set the encoding for your new document" msgstr "Define a codificação para o seu novo documento" #. fontsize -#: ../geanylatex/src/geanylatex.c:1798 +#: ../geanylatex/src/geanylatex.c:1797 #, fuzzy msgid "Font size" msgstr "Tamanho da fonte:" -#: ../geanylatex/src/geanylatex.c:1804 +#: ../geanylatex/src/geanylatex.c:1803 msgid "Set the default font size of your new document" msgstr "Define o tamanho da fonte padrão do seu novo documento" #. Author -#: ../geanylatex/src/geanylatex.c:1816 +#: ../geanylatex/src/geanylatex.c:1815 msgid "Author:" msgstr "Autor:" -#: ../geanylatex/src/geanylatex.c:1819 +#: ../geanylatex/src/geanylatex.c:1818 msgid "" "Sets the value of the \\author command. In most cases this should be your " "name" @@ -2080,11 +2106,11 @@ "Define o valor do comando \\author. Na maioria dos casos, deve ser o seu nome" #. Date -#: ../geanylatex/src/geanylatex.c:1833 +#: ../geanylatex/src/geanylatex.c:1832 msgid "Date:" msgstr "Data:" -#: ../geanylatex/src/geanylatex.c:1836 +#: ../geanylatex/src/geanylatex.c:1835 msgid "" "Sets the value of the \\date command inside header of your new created LaTeX-" "document. Keeping it at \\today is a good decision if you don't need any " @@ -2095,37 +2121,37 @@ "data fixa." #. Title of the new document -#: ../geanylatex/src/geanylatex.c:1848 +#: ../geanylatex/src/geanylatex.c:1847 msgid "Title:" msgstr "Título:" -#: ../geanylatex/src/geanylatex.c:1851 +#: ../geanylatex/src/geanylatex.c:1850 msgid "Sets the title of your new document." msgstr "Define o título do seu documento." #. Papersize -#: ../geanylatex/src/geanylatex.c:1860 +#: ../geanylatex/src/geanylatex.c:1859 msgid "Paper size:" msgstr "Tamanho do papel:" -#: ../geanylatex/src/geanylatex.c:1863 +#: ../geanylatex/src/geanylatex.c:1862 msgid "Choose the paper format for the newly created document" msgstr "Escolha o formato de papel para o seu novo documento" #. Paper direction -#: ../geanylatex/src/geanylatex.c:1876 +#: ../geanylatex/src/geanylatex.c:1875 msgid "Paper Orientation:" msgstr "Orientação do Papel:" -#: ../geanylatex/src/geanylatex.c:1879 +#: ../geanylatex/src/geanylatex.c:1878 msgid "Choose the paper orientation for the newly created document" msgstr "Escolha a orientação do papel para o seu novo documento" -#: ../geanylatex/src/geanylatex.c:1900 +#: ../geanylatex/src/geanylatex.c:1899 msgid "Use KOMA-script classes if possible" msgstr "Usar classes KOMA-script se possível" -#: ../geanylatex/src/geanylatex.c:1902 +#: ../geanylatex/src/geanylatex.c:1901 msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" "Keep in mind: To compile your document these classes have to be installed " @@ -2135,11 +2161,11 @@ "Lembre-se: para compilar o seu documento essas classes devem estar " "previamente instaladas." -#: ../geanylatex/src/geanylatex.c:1909 +#: ../geanylatex/src/geanylatex.c:1908 msgid "Use draft mode" msgstr "Usar modo rascunho" -#: ../geanylatex/src/geanylatex.c:1911 +#: ../geanylatex/src/geanylatex.c:1910 msgid "" "Set the draft flag inside new created documents to get documents with a " "number of debugging helpers" @@ -2147,96 +2173,96 @@ "Define o flag draft dentro de novos documentos para obter documentos com " "ajudantes de depuração" -#: ../geanylatex/src/geanylatex.c:1928 +#: ../geanylatex/src/geanylatex.c:1927 msgid "Run LaTeX-Wizard" msgstr "Executar LaTeX-Wizard" -#: ../geanylatex/src/geanylatex.c:1930 +#: ../geanylatex/src/geanylatex.c:1929 msgid "Insert \\label" msgstr "Inserir \\label" -#: ../geanylatex/src/geanylatex.c:1932 +#: ../geanylatex/src/geanylatex.c:1931 msgid "Insert \\ref" msgstr "Inserir \\ref" -#: ../geanylatex/src/geanylatex.c:1934 +#: ../geanylatex/src/geanylatex.c:1933 msgid "Insert linebreak \\\\ " msgstr "Inserir quebra de linha \\\\" -#: ../geanylatex/src/geanylatex.c:1937 +#: ../geanylatex/src/geanylatex.c:1936 msgid "Insert command" msgstr "Inserir comando" -#: ../geanylatex/src/geanylatex.c:1939 +#: ../geanylatex/src/geanylatex.c:1938 msgid "Turn input replacement on/off" msgstr "Liga/Desliga a substituição de entrada" -#: ../geanylatex/src/geanylatex.c:1943 +#: ../geanylatex/src/geanylatex.c:1942 msgid "Replace special characters" msgstr "Substituir caracteres especiais" -#: ../geanylatex/src/geanylatex.c:1946 +#: ../geanylatex/src/geanylatex.c:1945 msgid "Run insert environment dialog" msgstr "Executar o diálogo Inserir Ambiente" -#: ../geanylatex/src/geanylatex.c:1948 +#: ../geanylatex/src/geanylatex.c:1947 msgid "Insert \\item" msgstr "Inserir \\item" -#: ../geanylatex/src/geanylatex.c:1950 +#: ../geanylatex/src/geanylatex.c:1949 msgid "Format selection in bold font face" msgstr "Formatar seleção em negrito" -#: ../geanylatex/src/geanylatex.c:1952 +#: ../geanylatex/src/geanylatex.c:1951 msgid "Format selection in italic font face" msgstr "Formatar seleção em itálico" -#: ../geanylatex/src/geanylatex.c:1954 +#: ../geanylatex/src/geanylatex.c:1953 msgid "Format selection in typewriter font face" msgstr "Formatar seleção em fonte máquina de escrever" -#: ../geanylatex/src/geanylatex.c:1956 +#: ../geanylatex/src/geanylatex.c:1955 msgid "Format selection centered" msgstr "Formatar seleção centralizado" -#: ../geanylatex/src/geanylatex.c:1958 +#: ../geanylatex/src/geanylatex.c:1957 msgid "Format selection left-aligned" msgstr "Formatar seleção alinhado à esquerda" -#: ../geanylatex/src/geanylatex.c:1960 +#: ../geanylatex/src/geanylatex.c:1959 msgid "Format selection right-aligned" msgstr "Formatar seleção alinhada à direita" -#: ../geanylatex/src/geanylatex.c:1963 +#: ../geanylatex/src/geanylatex.c:1962 msgid "Insert description list" msgstr "Inserir lista de descrição" -#: ../geanylatex/src/geanylatex.c:1966 +#: ../geanylatex/src/geanylatex.c:1965 msgid "Insert itemize list" msgstr "Inserir lista itemize" -#: ../geanylatex/src/geanylatex.c:1969 +#: ../geanylatex/src/geanylatex.c:1968 msgid "Insert enumerate list" msgstr "Inserir lista enumerate" -#: ../geanylatex/src/geanylatex.c:1972 +#: ../geanylatex/src/geanylatex.c:1971 msgid "Set selection one level up" msgstr "Definir seleção um nível acima" -#: ../geanylatex/src/geanylatex.c:1975 +#: ../geanylatex/src/geanylatex.c:1974 msgid "Set selection one level down" msgstr "Definir seleção um nível para baixo" -#: ../geanylatex/src/geanylatex.c:1978 +#: ../geanylatex/src/geanylatex.c:1977 msgid "Insert \\usepackage{}" msgstr "Inserir \\usepackage{}" -#: ../geanylatex/src/geanylatex.c:1981 +#: ../geanylatex/src/geanylatex.c:1980 #, fuzzy msgid "Insert BibTeX reference dialog" msgstr "Inserir Referẽncia" -#: ../geanylatex/src/geanylatex.c:1988 +#: ../geanylatex/src/geanylatex.c:1987 msgid "" "GeanyLaTeX is a plugin to improve support for LaTeX in Geany.\n" "\n" @@ -2246,7 +2272,7 @@ "\n" "Por favor, informe todos os erros ou pedidos de recursos a um dos autores." -#: ../geanylatex/src/geanylatex.c:2026 +#: ../geanylatex/src/geanylatex.c:2025 msgid "" "glatex_set_autocompletion_contextsize has been initialized with an invalid " "value. Default value taken. Please check your configuration file" @@ -2255,118 +2281,118 @@ "inválido. Assumido valor padrão. Por favor, verifique o seu arquivo de " "configuração" -#: ../geanylatex/src/geanylatex.c:2048 ../geanylatex/src/geanylatex.c:2055 +#: ../geanylatex/src/geanylatex.c:2047 ../geanylatex/src/geanylatex.c:2054 msgid "page \\pageref{{{reference}}}" msgstr "página \\pageref{{{reference}}}" -#: ../geanylatex/src/geanylatex.c:2052 ../geanylatex/src/geanylatex.c:2059 +#: ../geanylatex/src/geanylatex.c:2051 ../geanylatex/src/geanylatex.c:2058 msgid "\\ref{{{reference}}}, page \\pageref{{{reference}}}" msgstr "\\ref{{{reference}}}, página \\pageref{{{reference}}}" #. Build up menu for menubar -#: ../geanylatex/src/geanylatex.c:2107 +#: ../geanylatex/src/geanylatex.c:2106 msgid "_LaTeX" msgstr "_LaTeX" #. Filling up menubar menus #. LaTeX menu -#: ../geanylatex/src/geanylatex.c:2116 ../geanylatex/src/geanylatex.c:2328 +#: ../geanylatex/src/geanylatex.c:2115 ../geanylatex/src/geanylatex.c:2327 msgid "LaTeX-_Wizard" msgstr "LaTeX-_Wizard" -#: ../geanylatex/src/geanylatex.c:2119 ../geanylatex/src/geanylatex.c:2331 +#: ../geanylatex/src/geanylatex.c:2118 ../geanylatex/src/geanylatex.c:2330 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "Inicia um Assistente para criar facilmente documentos LaTeX" -#: ../geanylatex/src/geanylatex.c:2124 +#: ../geanylatex/src/geanylatex.c:2123 msgid "I_nsert Special Character" msgstr "I_nserir Caracter Especial" -#: ../geanylatex/src/geanylatex.c:2126 +#: ../geanylatex/src/geanylatex.c:2125 msgid "Helps to use some not very common letters and signs" msgstr "Ajuda a usar algumas letras e símbolos não muito comuns" -#: ../geanylatex/src/geanylatex.c:2136 +#: ../geanylatex/src/geanylatex.c:2135 msgid "Insert _Reference" msgstr "Inserir _Referência" -#: ../geanylatex/src/geanylatex.c:2138 +#: ../geanylatex/src/geanylatex.c:2137 msgid "Inserting references to the document" msgstr "Inserindo referências no documento" -#: ../geanylatex/src/geanylatex.c:2143 +#: ../geanylatex/src/geanylatex.c:2142 msgid "Insert _Label" msgstr "Inserir Rótu_lo" -#: ../geanylatex/src/geanylatex.c:2145 +#: ../geanylatex/src/geanylatex.c:2144 msgid "Helps at inserting labels to a document" msgstr "Ajuda a inserir rótulos em um documento" -#: ../geanylatex/src/geanylatex.c:2151 +#: ../geanylatex/src/geanylatex.c:2150 msgid "Insert _Environment" msgstr "Inserir Ambi_ente" -#: ../geanylatex/src/geanylatex.c:2153 +#: ../geanylatex/src/geanylatex.c:2152 msgid "Helps at inserting an environment a document" msgstr "Ajuda a inserir um ambiente no documento" -#: ../geanylatex/src/geanylatex.c:2159 +#: ../geanylatex/src/geanylatex.c:2158 msgid "Insert P_ackage" msgstr "Inserir P_acote" -#: ../geanylatex/src/geanylatex.c:2161 +#: ../geanylatex/src/geanylatex.c:2160 msgid "A small dialog to insert \\usepackage{} into header of current file" msgstr "" "Um pequeno diálogo para inserir \\usepackage{} no cabeçalho do arquivo atual" -#: ../geanylatex/src/geanylatex.c:2166 ../scope/data/scope.glade.h:58 +#: ../geanylatex/src/geanylatex.c:2165 ../scope/data/scope.glade.h:58 msgid "_Format" msgstr "_Formatar" #. Add font size menu -#: ../geanylatex/src/geanylatex.c:2183 +#: ../geanylatex/src/geanylatex.c:2182 msgid "F_ont size" msgstr "Tamanh_o da fonte" -#: ../geanylatex/src/geanylatex.c:2201 +#: ../geanylatex/src/geanylatex.c:2200 msgid "_Special Character Replacement" msgstr "_Substituir Caracteres Especiais" -#: ../geanylatex/src/geanylatex.c:2209 +#: ../geanylatex/src/geanylatex.c:2208 msgid "Bulk _Replace Special Characters" msgstr "Substitui_r Caracteres Especiais em Volume" -#: ../geanylatex/src/geanylatex.c:2211 +#: ../geanylatex/src/geanylatex.c:2210 msgid "_Replace selected special characters with TeX substitutes" msgstr "Substitui_r os caracteres especiais selecionados com substitutos TeX" -#: ../geanylatex/src/geanylatex.c:2219 +#: ../geanylatex/src/geanylatex.c:2218 msgid "Toggle _Special Character Replacement" msgstr "Alternar _Substituição de Caracteres Especiais" -#: ../geanylatex/src/geanylatex.c:2230 +#: ../geanylatex/src/geanylatex.c:2229 msgid "Insert _Command" msgstr "Inserir _Comando" -#: ../geanylatex/src/geanylatex.c:2232 +#: ../geanylatex/src/geanylatex.c:2231 msgid "Inserting costumized command to document" msgstr "Inserindo comandos personalizados no documento" -#: ../geanylatex/src/geanylatex.c:2257 +#: ../geanylatex/src/geanylatex.c:2256 #, fuzzy msgid "_BibTeX" msgstr "_BibTeX" -#: ../geanylatex/src/geanylatex.c:2265 +#: ../geanylatex/src/geanylatex.c:2264 #, fuzzy msgid "Insert B_ibTeX reference" msgstr "Inserir _Referência" -#: ../geanylatex/src/geanylatex.c:2267 +#: ../geanylatex/src/geanylatex.c:2266 msgid "Helps to insert a reference out of BibTeX files" msgstr "" -#: ../geanylatex/src/geanylatex.c:2272 +#: ../geanylatex/src/geanylatex.c:2271 #, fuzzy msgid "_BibTeX entries" msgstr "_BibTeX" @@ -2525,16 +2551,16 @@ msgid "Creating dummy text with Geany" msgstr "Criação de texto modelo com o Geany" -#: ../geanylipsum/src/geanylipsum.c:86 +#: ../geanylipsum/src/geanylipsum.c:89 msgid "Lipsum-Generator" msgstr "Lipsum-Generator" -#: ../geanylipsum/src/geanylipsum.c:87 +#: ../geanylipsum/src/geanylipsum.c:90 msgid "Enter the length of Lipsum text here" msgstr "Informe o tamanho do texto Lipsum" #. Building menu entry -#: ../geanylipsum/src/geanylipsum.c:163 +#: ../geanylipsum/src/geanylipsum.c:164 msgid "_Lipsum" msgstr "_Lipsum" @@ -2672,19 +2698,19 @@ msgid "Browse..." msgstr "Navegar..." -#: ../geanylua/gsdlg.c:175 +#: ../geanylua/gsdlg.c:176 msgid "Select Color" msgstr "Selecionar Cor" -#: ../geanylua/gsdlg.c:205 +#: ../geanylua/gsdlg.c:207 msgid "Choose..." msgstr "Escolher..." -#: ../geanylua/gsdlg.c:226 +#: ../geanylua/gsdlg.c:228 msgid "Select Font" msgstr "Selecionar Fonte" -#: ../geanylua/gsdlg.c:253 +#: ../geanylua/gsdlg.c:255 msgid "Select..." msgstr "Selecionar..." @@ -2715,7 +2741,7 @@ "Erro no módulo \"%s\" na função %s():\n" "argumentos insuficientes para o comando \"%s\".\n" -#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:398 +#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:396 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2755,7 +2781,7 @@ msgid "Save file" msgstr "Salvar arquivo" -#: ../geanylua/glspi_dlg.c:436 +#: ../geanylua/glspi_dlg.c:438 #, c-format msgid "" "Error in module \"%s\" at function pickfile():\n" @@ -2764,7 +2790,7 @@ "Erro no módulo \"%s\" na função pickfile():\n" "falhou ao reconhecer string de filtro no argumento #3.\n" -#: ../geanylua/glspi_dlg.c:486 +#: ../geanylua/glspi_dlg.c:489 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2810,7 +2836,7 @@ "O plugin %s falhou em carregar apropriadamente.\n" "Por favor, verifique a sua instalação." -#: ../geanylua/glspi_app.c:19 +#: ../geanylua/glspi_app.c:21 #, fuzzy, c-format msgid "" "%s %s: %s\n" @@ -2819,7 +2845,7 @@ "%s %s: %s\n" "Copyright (c) 2007-2008 " -#: ../geanylua/glspi_app.c:149 +#: ../geanylua/glspi_app.c:151 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2828,7 +2854,7 @@ "Erro no módulo \"%s\" na função %s():\n" "widget \"%s\" não encontrado para o argumento #1.\n" -#: ../geanylua/glspi_app.c:158 +#: ../geanylua/glspi_app.c:160 #, c-format msgid "" "Error in module \"%s\" at function %s() argument #2:\n" @@ -3206,6 +3232,21 @@ "duplicate line" msgstr "" +#: ../geanymacro/src/geanymacro.c:150 +#, fuzzy +msgid "Search for next \"\"" +msgstr "Pesquisar símbolos:" + +#: ../geanymacro/src/geanymacro.c:151 +#, fuzzy +msgid "Search for previous \"\"" +msgstr "Pesquisar símbolos:" + +#: ../geanymacro/src/geanymacro.c:152 +#, fuzzy +msgid "Set start of search to beginning of selection" +msgstr "Seleciona até a linha" + #: ../geanymacro/src/geanymacro.c:181 #, fuzzy msgid "Macros" @@ -3411,12 +3452,12 @@ #. create buttons #: ../geanymacro/src/geanymacro.c:1393 ../geanymacro/src/geanymacro.c:1536 -#: ../geanymacro/src/geanymacro.c:1819 ../geanymacro/src/geanymacro.c:2116 +#: ../geanymacro/src/geanymacro.c:1826 ../geanymacro/src/geanymacro.c:2122 msgid "_Ok" msgstr "" #: ../geanymacro/src/geanymacro.c:1394 ../geanymacro/src/geanymacro.c:1537 -#: ../geanymacro/src/geanymacro.c:1820 +#: ../geanymacro/src/geanymacro.c:1827 #, fuzzy msgid "_Cancel" msgstr "Codificação" @@ -3437,7 +3478,7 @@ msgid "Search for contents of clipboard" msgstr "Copiar caminho completo" -#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:92 +#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:101 #, fuzzy msgid "Search for:" msgstr "Pesquisar símbolos:" @@ -3477,61 +3518,61 @@ msgid "Text:" msgstr "Contexto:" -#: ../geanymacro/src/geanymacro.c:1571 ../geanymacro/src/geanymacro.c:1755 +#: ../geanymacro/src/geanymacro.c:1570 ../geanymacro/src/geanymacro.c:1758 #, c-format msgid "Insert/replace with \"%s\"" msgstr "" #. create dialog box -#: ../geanymacro/src/geanymacro.c:1731 +#: ../geanymacro/src/geanymacro.c:1735 #, fuzzy, c-format msgid "Edit: %s" msgstr "Editar ponto de observação" #. add column -#: ../geanymacro/src/geanymacro.c:1794 +#: ../geanymacro/src/geanymacro.c:1801 msgid "Event" msgstr "" #. add buttons -#: ../geanymacro/src/geanymacro.c:1809 +#: ../geanymacro/src/geanymacro.c:1816 msgid "Move _Up" msgstr "" -#: ../geanymacro/src/geanymacro.c:1811 +#: ../geanymacro/src/geanymacro.c:1818 msgid "Move Do_wn" msgstr "" -#: ../geanymacro/src/geanymacro.c:1813 +#: ../geanymacro/src/geanymacro.c:1820 msgid "New _Above" msgstr "" -#: ../geanymacro/src/geanymacro.c:1814 +#: ../geanymacro/src/geanymacro.c:1821 msgid "New _Below" msgstr "" -#: ../geanymacro/src/geanymacro.c:1817 ../geanymacro/src/geanymacro.c:2114 +#: ../geanymacro/src/geanymacro.c:1824 ../geanymacro/src/geanymacro.c:2120 #, fuzzy msgid "_Delete" msgstr "Excluir" #. create dialog box -#: ../geanymacro/src/geanymacro.c:2059 +#: ../geanymacro/src/geanymacro.c:2065 #, fuzzy msgid "Edit Macros" msgstr "Editar ponto de observação" -#: ../geanymacro/src/geanymacro.c:2089 +#: ../geanymacro/src/geanymacro.c:2095 msgid "Macro Name" msgstr "" -#: ../geanymacro/src/geanymacro.c:2095 +#: ../geanymacro/src/geanymacro.c:2101 #, fuzzy msgid "Key Trigger" msgstr "Gatilho de acesso:" #. add buttons -#: ../geanymacro/src/geanymacro.c:2110 +#: ../geanymacro/src/geanymacro.c:2116 msgid "_Re-Record" msgstr "" @@ -3550,6 +3591,33 @@ msgid "_Edit Macros" msgstr "" +#. *< \brief It's the information message about geany mini script +#: ../geanyminiscript/src/gms_gui.c:129 +msgid "" +"GMS : Geany Mini-Script filter Plugin\n" +"This plugin is a tool to apply a script filter on:\n" +" o the text selection,\n" +" o the current document,\n" +" o all documents of the current session.\n" +"\n" +"The filter type can be:\n" +" o Unix shell script,\n" +" o perl script,\n" +" o python script,\n" +" o sed commands,\n" +" o awk script.\n" +"\n" +"AUTHOR\n" +" Written by Pascal BURLOT (December,2008)\n" +"\n" +"LICENSE:\n" +"This program is free software; you can redistribute\n" +"it and/or modify it under the terms of the GNU \n" +"General Public License as published by the Free\n" +"Software Foundation; either version 2 of the License,\n" +"or (at your option) any later version." +msgstr "" + #: ../geanyminiscript/src/gms_gui.c:253 msgid "Load Mini-Script File" msgstr "" @@ -3558,115 +3626,114 @@ msgid "Save Mini-Script File" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:418 +#: ../geanyminiscript/src/gms_gui.c:419 msgid "Mini-Script Filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:446 +#: ../geanyminiscript/src/gms_gui.c:445 msgid "Clear the mini-script window" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:451 +#: ../geanyminiscript/src/gms_gui.c:450 msgid "Load a mini-script into this window" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:456 +#: ../geanyminiscript/src/gms_gui.c:455 msgid "Save the mini-script into a file" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:461 +#: ../geanyminiscript/src/gms_gui.c:460 #, fuzzy msgid "Display a information about the mini-script plugin" msgstr "Exibir informações adicionais sobre o item selecionado." -#: ../geanyminiscript/src/gms_gui.c:469 +#: ../geanyminiscript/src/gms_gui.c:468 msgid "select the mini-script type" msgstr "" #. Hbox : Radio bouttons for choosing the input: #. * selection/current document/all documents of the current session -#: ../geanyminiscript/src/gms_gui.c:500 +#: ../geanyminiscript/src/gms_gui.c:499 msgid "filter input" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:502 +#: ../geanyminiscript/src/gms_gui.c:501 msgid "select the input of mini-script filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:508 +#: ../geanyminiscript/src/gms_gui.c:507 #, fuzzy msgid "selection" msgstr "Selecionar Fonte" -#: ../geanyminiscript/src/gms_gui.c:509 +#: ../geanyminiscript/src/gms_gui.c:508 #, fuzzy msgid "document" msgstr "Enviar docu_mento" -#: ../geanyminiscript/src/gms_gui.c:510 +#: ../geanyminiscript/src/gms_gui.c:509 msgid "session" msgstr "" #. Hbox : Radio bouttons for choosing the output: #. * current document/ or new document -#: ../geanyminiscript/src/gms_gui.c:519 +#: ../geanyminiscript/src/gms_gui.c:518 msgid "filter output" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:521 +#: ../geanyminiscript/src/gms_gui.c:520 msgid "select the output of mini-script filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:527 +#: ../geanyminiscript/src/gms_gui.c:526 msgid "Current Doc." msgstr "" -#: ../geanyminiscript/src/gms_gui.c:528 +#: ../geanyminiscript/src/gms_gui.c:527 #, fuzzy msgid "New Doc." msgstr "Novo Projeto" -#: ../geanyminiscript/src/gms_gui.c:749 +#: ../geanyminiscript/src/gms_gui.c:748 #, fuzzy msgid "script configuration" msgstr "Falha ao carregar configuração: %s" -#. All plugins must set name, description, version and author. #: ../geanyminiscript/src/gms.c:58 #, fuzzy msgid "Mini Script" msgstr "Script Lua" -#: ../geanyminiscript/src/gms.c:58 +#: ../geanyminiscript/src/gms.c:59 msgid "" "A tool to apply a script filter on a text selection or current document(s)" msgstr "" -#: ../geanyminiscript/src/gms.c:59 +#: ../geanyminiscript/src/gms.c:60 msgid "Pascal BURLOT, a Geany user" msgstr "" #. Add an item to the Tools menu -#: ../geanyminiscript/src/gms.c:278 +#: ../geanyminiscript/src/gms.c:249 msgid "_Mini-Script" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:58 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:61 msgid "Numbered Bookmarks for Geany" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:923 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:927 #, c-format msgid "Unable to apply all markers to '%s' as all being used." msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:925 -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:969 -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1392 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:929 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:973 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1396 msgid "_Okay" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:967 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:971 #, c-format msgid "" "'%s' has been edited since it was last saved by geany. Marker positions may " @@ -3674,55 +3741,55 @@ "Press Ignore to try an load markers anyway." msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:970 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:974 #, fuzzy msgid "_Ignore" msgstr "Ignorar Tudo" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1215 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1219 msgid "remember fold state" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1221 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1225 msgid "Center view when goto bookmark" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1228 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1232 #, fuzzy msgid "Move to start of line" msgstr "Formatar seleção alinhado à esquerda" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1229 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1233 msgid "Move to remembered position in line" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1230 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1234 msgid "Move to position in current line" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1231 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1235 #, fuzzy msgid "Move to End of line" msgstr "Formatar seleção alinhado à esquerda" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1237 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1241 msgid "Save file settings with program settings" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1238 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1242 msgid "Save file settings to filename with suffix" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1243 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1247 msgid "remember normal Bookmarks" msgstr "" #. create dialog box -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1263 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1267 msgid "Numbered Bookmarks help" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1270 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1274 msgid "" "This Plugin implements Numbered Bookmarks in Geany, as well as remembering " "the state of folds, and positions of standard non-numbered bookmarks when a " @@ -3738,7 +3805,7 @@ "previously set bookmark, press Ctrl+a number from 0 to 9." msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1391 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1395 msgid "Unable to apply markers as all being used." msgstr "" @@ -3822,36 +3889,36 @@ msgstr "Selecionar arquivo" #. shouldn't get here -#: ../geanypg/src/pinentry.c:107 +#: ../geanypg/src/pinentry.c:111 msgid "Could not use pinentry." msgstr "" -#: ../geanypg/src/pinentry.c:119 +#: ../geanypg/src/pinentry.c:123 msgid "Unexpected output from pinentry." msgstr "" #. read the rest of the first line after OK -#: ../geanypg/src/pinentry.c:127 +#: ../geanypg/src/pinentry.c:131 msgid "Passphrase entry" msgstr "" -#: ../geanypg/src/pinentry.c:131 +#: ../geanypg/src/pinentry.c:135 msgid "Passphrase" msgstr "" -#: ../geanypg/src/pinentry.c:136 +#: ../geanypg/src/pinentry.c:140 msgid "Enter passphrase for" msgstr "" -#: ../geanypg/src/pinentry.c:167 +#: ../geanypg/src/pinentry.c:171 msgid "pinentry gave error" msgstr "" -#: ../geanypg/src/pinentry.c:170 +#: ../geanypg/src/pinentry.c:174 msgid "Unexpected error from pinentry." msgstr "" -#: ../geanypg/src/pinentry.c:195 +#: ../geanypg/src/pinentry.c:199 msgid "" "Error, Passphrase input without using gpg-agent is not supported on Windows " "yet." @@ -3861,8 +3928,8 @@ msgid "a key with fingerprint" msgstr "" -#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:522 -#: ../spellcheck/src/gui.c:533 +#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:527 +#: ../spellcheck/src/gui.c:538 msgid "unknown" msgstr "desconhecido" @@ -4024,7 +4091,7 @@ msgstr "Abrir arquivo" #: ../geanyprj/src/geanyprj.c:38 ../geanyprj/src/sidebar.c:456 -#: ../gproject/src/gproject-sidebar.c:822 +#: ../gproject/src/gproject-sidebar.c:870 msgid "Project" msgstr "Projeto" @@ -4053,7 +4120,7 @@ msgid "C_reate" msgstr "C_riar" -#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:116 +#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:114 msgid "Name:" msgstr "Nome:" @@ -4132,7 +4199,7 @@ msgid "Remove File" msgstr "Remover arquivo" -#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:803 +#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:849 msgid "H_ide Sidebar" msgstr "Ocultar S_idebar" @@ -4141,6 +4208,50 @@ msgid "Project \"%s\" opened." msgstr "Projeto \"%s\" aberto." +#: ../geanypy/src/geanypy-plugin.c:34 +#, fuzzy +msgid "GeanyPy" +msgstr "GeanyGDB" + +#: ../geanypy/src/geanypy-plugin.c:35 +msgid "Python plugins support" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:77 +#, fuzzy, c-format +msgid "Unable to pre-load Python library: %s." +msgstr "Falha ao salvar configuração: %s" + +#: ../geanypy/src/geanypy-plugin.c:157 +msgid "Failed to import manager module" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:166 +msgid "Failed to retrieve PluginManager from manager module" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:182 +#, fuzzy +msgid "System plugin directory not found." +msgstr "diretório temporário tty não encontrado!\n" + +#: ../geanypy/src/geanypy-plugin.c:211 +msgid "Unable to instantiate new PluginManager" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:227 +msgid "Unable to get show_all() method on plugin manager" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:255 +#, fuzzy, c-format +msgid "Unable to create Python plugins directory: %s: %s" +msgstr "Falha ao salvar configuração: %s" + +#: ../geanypy/src/geanypy-plugin.c:266 +msgid "Python Plugin Manager" +msgstr "" + #: ../geanysendmail/src/geanysendmail.c:43 msgid "GeanySendMail" msgstr "GeanySendMail" @@ -4162,13 +4273,13 @@ msgid "Enter the recipient's e-mail address:" msgstr "Insira o endereço de e-mail do destinatário:" -#: ../geanysendmail/src/geanysendmail.c:136 +#: ../geanysendmail/src/geanysendmail.c:138 msgid "Filename placeholder not found. The executed command might have failed." msgstr "" "Placeholder de nome de arquivo não encontrado. O comando executado deve ter " "falhado." -#: ../geanysendmail/src/geanysendmail.c:142 +#: ../geanysendmail/src/geanysendmail.c:144 msgid "" "Recipient address placeholder not found. The executed command might have " "failed." @@ -4176,34 +4287,34 @@ "Posicionador do endereço de destinatário não encontrado. O comando executado " "pode ter falhado." -#: ../geanysendmail/src/geanysendmail.c:157 +#: ../geanysendmail/src/geanysendmail.c:159 msgid "Could not execute mailer. Please check your configuration." msgstr "" "Não foi possível executar o programa de correio. Por favor, verifique sua " "configuração." -#: ../geanysendmail/src/geanysendmail.c:166 +#: ../geanysendmail/src/geanysendmail.c:168 msgid "Please define a mail client first." msgstr "Por favor, primeiro defina um cliente de e-mail." -#: ../geanysendmail/src/geanysendmail.c:171 +#: ../geanysendmail/src/geanysendmail.c:173 msgid "File has to be saved before sending." msgstr "O arquivo precisa ser salvo antes de ser enviado." -#: ../geanysendmail/src/geanysendmail.c:187 +#: ../geanysendmail/src/geanysendmail.c:191 msgid "Mail" msgstr "Correio" -#: ../geanysendmail/src/geanysendmail.c:218 +#: ../geanysendmail/src/geanysendmail.c:222 msgid "Send by mail" msgstr "Enviar por correio" #. add a label and a text entry to the dialog -#: ../geanysendmail/src/geanysendmail.c:308 +#: ../geanysendmail/src/geanysendmail.c:312 msgid "Path and options for the mail client:" msgstr "Caminho e opções para o cliente de e-mail:" -#: ../geanysendmail/src/geanysendmail.c:316 +#: ../geanysendmail/src/geanysendmail.c:320 #, fuzzy msgid "" "Note: \n" @@ -4222,31 +4333,31 @@ "\tsylpheed --attach \"\\%f\" --compose \"\\%r\"\n" "\tmutt -s \"Sending '\\%b'\" -a \"\\%f\" \"\\%r\"" -#: ../geanysendmail/src/geanysendmail.c:326 +#: ../geanysendmail/src/geanysendmail.c:330 #, fuzzy msgid "Show toolbar icon" msgstr "Exibir dicas de ferramentas." -#: ../geanysendmail/src/geanysendmail.c:328 +#: ../geanysendmail/src/geanysendmail.c:332 msgid "Shows a icon in the toolbar to send file more easy." msgstr "" "Exibe um ícone na barra de ferramentas para facilitar envio de arquivo." -#: ../geanysendmail/src/geanysendmail.c:334 +#: ../geanysendmail/src/geanysendmail.c:338 #, fuzzy msgid "Use dialog for entering email address of recipients" msgstr "Usar diálogo para inserir o endereço de e-mail dos destinatários" -#: ../geanysendmail/src/geanysendmail.c:356 +#: ../geanysendmail/src/geanysendmail.c:360 msgid "Send file by mail" msgstr "Enviar arquivo por e-mail" #. Build up menu entry -#: ../geanysendmail/src/geanysendmail.c:379 +#: ../geanysendmail/src/geanysendmail.c:383 msgid "_Mail document" msgstr "Enviar docu_mento" -#: ../geanysendmail/src/geanysendmail.c:382 +#: ../geanysendmail/src/geanysendmail.c:386 msgid "" "Sends the opened file as unzipped attachment by any mailer from your $PATH" msgstr "" @@ -4266,78 +4377,97 @@ msgid "geanyvc: s_spawn_sync error: %s" msgstr "geanyvc: s_spawn_sync error: %s" -#: ../geanyvc/src/geanyvc.c:609 ../geanyvc/src/geanyvc.c:620 +#: ../geanyvc/src/geanyvc.c:561 +#, c-format +msgid "File %s: action %s executed via %s." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:614 ../geanyvc/src/geanyvc.c:625 #, c-format msgid "geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'" msgstr "geanyvc: vcdiff_file_activated: Incapaz de renomear '%s' para '%s'" -#: ../geanyvc/src/geanyvc.c:646 ../geanyvc/src/geanyvc.c:696 +#: ../geanyvc/src/geanyvc.c:651 ../geanyvc/src/geanyvc.c:701 msgid "No changes were made." msgstr "Nenhuma alteração foi feita." -#: ../geanyvc/src/geanyvc.c:723 +#: ../geanyvc/src/geanyvc.c:728 #, fuzzy msgid "No history available" msgstr "Histórico não disponível" -#: ../geanyvc/src/geanyvc.c:916 ../geanyvc/src/geanyvc.c:924 +#: ../geanyvc/src/geanyvc.c:921 ../geanyvc/src/geanyvc.c:929 #, c-format msgid "Do you really want to revert: %s?" msgstr "Você deseja mesmo reverter: %s?" -#: ../geanyvc/src/geanyvc.c:932 +#: ../geanyvc/src/geanyvc.c:937 #, c-format msgid "Do you really want to add: %s?" msgstr "Você deseja mesmo incluir: %s?" -#: ../geanyvc/src/geanyvc.c:939 +#: ../geanyvc/src/geanyvc.c:944 #, c-format msgid "Do you really want to remove: %s?" msgstr "Você deseja mesmo remover: %s?" -#: ../geanyvc/src/geanyvc.c:962 +#: ../geanyvc/src/geanyvc.c:967 msgid "Do you really want to update?" msgstr "Você deseja mesmo atualizar?" -#: ../geanyvc/src/geanyvc.c:1225 +#: ../geanyvc/src/geanyvc.c:1094 +msgid "" +"The resulting differences cannot be displayed because the changes are too " +"big to display here and would slow down the UI significantly.\n" +"\n" +"To view the differences, cancel this dialog and open the differences in " +"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:1243 msgid "Commit Y/N" msgstr "Submeter S/N" -#: ../geanyvc/src/geanyvc.c:1235 +#: ../geanyvc/src/geanyvc.c:1253 msgid "Status" msgstr "Estado" -#: ../geanyvc/src/geanyvc.c:1242 +#: ../geanyvc/src/geanyvc.c:1260 msgid "Path" msgstr "Caminho" -#: ../geanyvc/src/geanyvc.c:1330 +#: ../geanyvc/src/geanyvc.c:1324 +#, c-format +msgid "Line: %d Column: %d" +msgstr "" + +#: ../geanyvc/src/geanyvc.c:1370 msgid "Commit" msgstr "Submeter" -#: ../geanyvc/src/geanyvc.c:1372 +#: ../geanyvc/src/geanyvc.c:1412 msgid "_De-/select all files" msgstr "_De-/selecionar todos os arquivos" -#: ../geanyvc/src/geanyvc.c:1413 +#: ../geanyvc/src/geanyvc.c:1456 msgid "Commit message:" msgstr "Mensagem de submeter:" -#: ../geanyvc/src/geanyvc.c:1426 +#: ../geanyvc/src/geanyvc.c:1475 #, fuzzy msgid "C_ommit" msgstr "Submeter" -#: ../geanyvc/src/geanyvc.c:1500 +#: ../geanyvc/src/geanyvc.c:1556 msgid "Nothing to commit." msgstr "Nada para submeter." -#: ../geanyvc/src/geanyvc.c:1546 +#: ../geanyvc/src/geanyvc.c:1602 #, c-format msgid "Error initializing spell checking: %s" msgstr "Erro ao inicializar verificação ortográfica automática: %s" -#: ../geanyvc/src/geanyvc.c:1558 +#: ../geanyvc/src/geanyvc.c:1614 #, c-format msgid "" "Error while setting up language for spellchecking. Please check " @@ -4346,11 +4476,11 @@ "Erro ao definir linguagem para verificação ortográfica. Por favor, verifique " "a configuração. Mensagem de erro: %s" -#: ../geanyvc/src/geanyvc.c:1834 +#: ../geanyvc/src/geanyvc.c:1890 msgid "Set Changed-flag for document tabs created by the plugin" msgstr "Definir a flag Alterado para abas de documentos criados pelo plugin" -#: ../geanyvc/src/geanyvc.c:1837 +#: ../geanyvc/src/geanyvc.c:1893 msgid "" "If this option is activated, every new by the VC-plugin created document tab " "will be marked as changed. Even this option is useful in some cases, it " @@ -4360,255 +4490,255 @@ "CV será marcada como alterada. Mesmo que essa opção seja útil algumas vezes, " "pode causar diálogos de mensagens \"Você quer salvar\" irritantes." -#: ../geanyvc/src/geanyvc.c:1845 +#: ../geanyvc/src/geanyvc.c:1901 msgid "Confirm adding new files to a VCS" msgstr "Confirmar inclusão de novos arquivos em um SCV" -#: ../geanyvc/src/geanyvc.c:1848 +#: ../geanyvc/src/geanyvc.c:1904 msgid "Shows a confirmation dialog on adding a new (created) file to VCS." msgstr "" "Exibe um diálogo de confirmação ao incluir um novo (criado) arquivo ao SCV." -#: ../geanyvc/src/geanyvc.c:1854 +#: ../geanyvc/src/geanyvc.c:1910 msgid "Maximize commit dialog" msgstr "Maximizar diálogo de submeter" -#: ../geanyvc/src/geanyvc.c:1855 +#: ../geanyvc/src/geanyvc.c:1911 msgid "Show commit dialog maximize." msgstr "Exibe o diálogo de submeter maximizado. " -#: ../geanyvc/src/geanyvc.c:1861 +#: ../geanyvc/src/geanyvc.c:1917 msgid "Use external diff viewer" msgstr "Usar vizualizador de diff externo" -#: ../geanyvc/src/geanyvc.c:1863 +#: ../geanyvc/src/geanyvc.c:1919 msgid "Use external diff viewer for file diff." msgstr "Usar vizualizador externo de diff para diff de arquivos." -#: ../geanyvc/src/geanyvc.c:1869 +#: ../geanyvc/src/geanyvc.c:1925 msgid "Show VC entries at editor menu" msgstr "Exibir entradas VC no menu do editor" -#: ../geanyvc/src/geanyvc.c:1871 +#: ../geanyvc/src/geanyvc.c:1927 msgid "Show entries for VC functions inside editor menu" msgstr "Exibir entradas para funções VC dentro do menu do editor" -#: ../geanyvc/src/geanyvc.c:1876 +#: ../geanyvc/src/geanyvc.c:1932 msgid "Attach menu to menubar" msgstr "" -#: ../geanyvc/src/geanyvc.c:1878 +#: ../geanyvc/src/geanyvc.c:1934 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " "directly inside Geany's menubar.Will take in account after next start of " "GeanyVC" msgstr "" -#: ../geanyvc/src/geanyvc.c:1886 +#: ../geanyvc/src/geanyvc.c:1942 msgid "Enable CVS" msgstr "Habilitar CVS" -#: ../geanyvc/src/geanyvc.c:1891 +#: ../geanyvc/src/geanyvc.c:1947 msgid "Enable GIT" msgstr "Habilitar GIT" -#: ../geanyvc/src/geanyvc.c:1896 +#: ../geanyvc/src/geanyvc.c:1952 msgid "Enable SVN" msgstr "Habilitar SVN" -#: ../geanyvc/src/geanyvc.c:1901 +#: ../geanyvc/src/geanyvc.c:1957 msgid "Enable SVK" msgstr "Habilitar SVK" -#: ../geanyvc/src/geanyvc.c:1906 +#: ../geanyvc/src/geanyvc.c:1962 msgid "Enable Bazaar" msgstr "Habilitar Bazaar" -#: ../geanyvc/src/geanyvc.c:1911 +#: ../geanyvc/src/geanyvc.c:1967 msgid "Enable Mercurial" msgstr "Habilitar Mercurial" -#: ../geanyvc/src/geanyvc.c:1917 +#: ../geanyvc/src/geanyvc.c:1973 msgid "Spellcheck language" msgstr "Linguagem para verificação ortográfica" -#: ../geanyvc/src/geanyvc.c:2008 +#: ../geanyvc/src/geanyvc.c:2064 msgid "_VC file Actions" msgstr "Ações de arquivo _VC" #. Diff of current file #. Diff of the current dir #. Complete diff of base directory -#: ../geanyvc/src/geanyvc.c:2014 ../geanyvc/src/geanyvc.c:2091 -#: ../geanyvc/src/geanyvc.c:2131 +#: ../geanyvc/src/geanyvc.c:2070 ../geanyvc/src/geanyvc.c:2147 +#: ../geanyvc/src/geanyvc.c:2187 msgid "_Diff" msgstr "_Diff" -#: ../geanyvc/src/geanyvc.c:2017 +#: ../geanyvc/src/geanyvc.c:2073 msgid "Make a diff from the current active file" msgstr "Faz um diff do arquivo atualmente ativo" #. Revert current file #. Revert current dir #. Revert everything -#: ../geanyvc/src/geanyvc.c:2022 ../geanyvc/src/geanyvc.c:2100 -#: ../geanyvc/src/geanyvc.c:2139 +#: ../geanyvc/src/geanyvc.c:2078 ../geanyvc/src/geanyvc.c:2156 +#: ../geanyvc/src/geanyvc.c:2195 msgid "_Revert" msgstr "_Reverter" -#: ../geanyvc/src/geanyvc.c:2025 +#: ../geanyvc/src/geanyvc.c:2081 msgid "Restore pristine working copy file (undo local edits)." msgstr "Restaura cópia funcional antiga do arquivo (desfaz edições locais)." #. Blame for current file -#: ../geanyvc/src/geanyvc.c:2034 +#: ../geanyvc/src/geanyvc.c:2090 msgid "_Blame" msgstr "_Culpar" -#: ../geanyvc/src/geanyvc.c:2037 +#: ../geanyvc/src/geanyvc.c:2093 msgid "Shows the changes made at one file per revision and author." msgstr "Exibe as alterações feitas em um arquivo por revisão e autor." #. History/log of current file #. History/log of the current dir #. Complete History/Log of base directory -#: ../geanyvc/src/geanyvc.c:2044 ../geanyvc/src/geanyvc.c:2110 -#: ../geanyvc/src/geanyvc.c:2151 +#: ../geanyvc/src/geanyvc.c:2100 ../geanyvc/src/geanyvc.c:2166 +#: ../geanyvc/src/geanyvc.c:2207 msgid "_History (log)" msgstr "_Histórico (log)" -#: ../geanyvc/src/geanyvc.c:2047 +#: ../geanyvc/src/geanyvc.c:2103 msgid "Shows the log of the current file" msgstr "Exibe o log do arquivo atual" #. base version of the current file -#: ../geanyvc/src/geanyvc.c:2052 +#: ../geanyvc/src/geanyvc.c:2108 msgid "_Original" msgstr "_Original" -#: ../geanyvc/src/geanyvc.c:2055 +#: ../geanyvc/src/geanyvc.c:2111 #, fuzzy msgid "Shows the original of the current file" msgstr "Exibe o original do arquivo atual" #. add current file -#: ../geanyvc/src/geanyvc.c:2063 +#: ../geanyvc/src/geanyvc.c:2119 msgid "_Add to Version Control" msgstr "_Incluir no Controle de Versões" -#: ../geanyvc/src/geanyvc.c:2065 +#: ../geanyvc/src/geanyvc.c:2121 msgid "Add file to repository." msgstr "Inclui arquivo no repositório." #. remove current file -#: ../geanyvc/src/geanyvc.c:2071 +#: ../geanyvc/src/geanyvc.c:2127 msgid "_Remove from Version Control" msgstr "_Remover do Controle de Versões" -#: ../geanyvc/src/geanyvc.c:2073 +#: ../geanyvc/src/geanyvc.c:2129 msgid "Remove file from repository." msgstr "Remove arquivo do repositório." -#: ../geanyvc/src/geanyvc.c:2088 +#: ../geanyvc/src/geanyvc.c:2144 msgid "_Directory" msgstr "_Directório" -#: ../geanyvc/src/geanyvc.c:2094 +#: ../geanyvc/src/geanyvc.c:2150 msgid "Make a diff from the directory of the current active file" msgstr "Cria um diff do diretório do arquivo atualmente ativo" -#: ../geanyvc/src/geanyvc.c:2103 +#: ../geanyvc/src/geanyvc.c:2159 msgid "Restore original files in the current folder (undo local edits)." msgstr "Restaura arquivos originais na pasta atual (desfaz edições locais)." -#: ../geanyvc/src/geanyvc.c:2113 +#: ../geanyvc/src/geanyvc.c:2169 msgid "Shows the log of the current directory" msgstr "Exibe o log do diretório atual" -#: ../geanyvc/src/geanyvc.c:2127 +#: ../geanyvc/src/geanyvc.c:2183 msgid "_Base Directory" msgstr "Diretório _Base" -#: ../geanyvc/src/geanyvc.c:2133 +#: ../geanyvc/src/geanyvc.c:2189 msgid "Make a diff from the top VC directory" msgstr "Cria um diff do diretório topo do CV" -#: ../geanyvc/src/geanyvc.c:2141 +#: ../geanyvc/src/geanyvc.c:2197 msgid "Revert any local edits." msgstr "Reverter quaisquer edições locais." -#: ../geanyvc/src/geanyvc.c:2154 +#: ../geanyvc/src/geanyvc.c:2210 msgid "Shows the log of the top VC directory" msgstr "Exibe o log do diretório topo do CV" -#: ../geanyvc/src/geanyvc.c:2180 +#: ../geanyvc/src/geanyvc.c:2236 msgid "VC _Commit" msgstr "VC _Commit" -#: ../geanyvc/src/geanyvc.c:2215 +#: ../geanyvc/src/geanyvc.c:2271 msgid "Show diff of file" msgstr "Exibir diff de arquivo" -#: ../geanyvc/src/geanyvc.c:2217 +#: ../geanyvc/src/geanyvc.c:2273 msgid "Show diff of directory" msgstr "Exibir diff de diretório" -#: ../geanyvc/src/geanyvc.c:2219 +#: ../geanyvc/src/geanyvc.c:2275 msgid "Show diff of basedir" msgstr "Exibir diff do diretório base" -#: ../geanyvc/src/geanyvc.c:2222 +#: ../geanyvc/src/geanyvc.c:2278 msgid "Commit changes" msgstr "Submeter alterações" -#: ../geanyvc/src/geanyvc.c:2224 +#: ../geanyvc/src/geanyvc.c:2280 msgid "Show status" msgstr "Exibir estado" -#: ../geanyvc/src/geanyvc.c:2226 +#: ../geanyvc/src/geanyvc.c:2282 msgid "Revert single file" msgstr "Reverter arquivo único" -#: ../geanyvc/src/geanyvc.c:2228 +#: ../geanyvc/src/geanyvc.c:2284 msgid "Revert directory" msgstr "Reverter diretório" -#: ../geanyvc/src/geanyvc.c:2230 +#: ../geanyvc/src/geanyvc.c:2286 msgid "Revert base directory" msgstr "Reverter diretório base" -#: ../geanyvc/src/geanyvc.c:2232 +#: ../geanyvc/src/geanyvc.c:2288 msgid "Update file" msgstr "Atualizar arquivo" -#: ../geanyvc/src/geanyvc.c:2260 +#: ../geanyvc/src/geanyvc.c:2316 msgid "_VC" msgstr "C_V" -#: ../geanyvc/src/geanyvc.c:2266 +#: ../geanyvc/src/geanyvc.c:2322 #, fuzzy msgid "_Version Control" msgstr "_Incluir no Controle de Versões" #. Status of basedir -#: ../geanyvc/src/geanyvc.c:2288 +#: ../geanyvc/src/geanyvc.c:2344 msgid "_Status" msgstr "E_stado" -#: ../geanyvc/src/geanyvc.c:2290 +#: ../geanyvc/src/geanyvc.c:2346 msgid "Show status." msgstr "Exibe estado." -#: ../geanyvc/src/geanyvc.c:2297 +#: ../geanyvc/src/geanyvc.c:2353 msgid "Update from remote repository." msgstr "Atualizar do repositório remoto." #. Commit all changes -#: ../geanyvc/src/geanyvc.c:2302 +#: ../geanyvc/src/geanyvc.c:2358 msgid "_Commit" msgstr "_Submeter" -#: ../geanyvc/src/geanyvc.c:2304 +#: ../geanyvc/src/geanyvc.c:2360 msgid "Commit changes." msgstr "Submete alterações." @@ -4758,104 +4888,260 @@ "tab." msgstr "" -#: ../gproject/src/gproject-sidebar.c:81 -#: ../gproject/src/gproject-sidebar.c:792 +#: ../gproject/src/gproject-sidebar.c:90 +#: ../gproject/src/gproject-sidebar.c:838 #, fuzzy msgid "Find File" msgstr "Incluir Arquivo" -#: ../gproject/src/gproject-sidebar.c:108 +#: ../gproject/src/gproject-sidebar.c:117 #, fuzzy msgid "Search inside:" msgstr "Pesquisar símbolos:" -#: ../gproject/src/gproject-sidebar.c:120 +#: ../gproject/src/gproject-sidebar.c:129 msgid "C_ase sensitive" msgstr "" -#: ../gproject/src/gproject-sidebar.c:123 +#: ../gproject/src/gproject-sidebar.c:132 msgid "Search in full path" msgstr "" -#: ../gproject/src/gproject-sidebar.c:702 +#: ../gproject/src/gproject-sidebar.c:745 #, fuzzy msgid "Reload all" msgstr "Expandir tudo" -#: ../gproject/src/gproject-sidebar.c:711 -#: ../treebrowser/src/treebrowser.c:1282 +#: ../gproject/src/gproject-sidebar.c:754 +#: ../treebrowser/src/treebrowser.c:1281 msgid "Expand all" msgstr "Expandir tudo" -#: ../gproject/src/gproject-sidebar.c:717 -#: ../treebrowser/src/treebrowser.c:1286 +#: ../gproject/src/gproject-sidebar.c:761 +#: ../treebrowser/src/treebrowser.c:1285 msgid "Collapse all" msgstr "Colapsar tudo" -#: ../gproject/src/gproject-sidebar.c:726 +#: ../gproject/src/gproject-sidebar.c:771 msgid "Follow active editor" msgstr "" -#: ../gproject/src/gproject-sidebar.c:774 +#: ../gproject/src/gproject-sidebar.c:820 #, fuzzy msgid "Expand All" msgstr "Expandir tudo" -#: ../gproject/src/gproject-sidebar.c:783 -#: ../treebrowser/src/treebrowser.c:1234 +#: ../gproject/src/gproject-sidebar.c:829 #, fuzzy msgid "Find in Files" msgstr "Pesquisa em Projeto" #. POSITION OF VIEW -#: ../markdown/src/conf.c:570 +#: ../markdown/src/conf.c:567 #, fuzzy msgid "Position:" msgstr "Edition" -#: ../markdown/src/conf.c:576 +#: ../markdown/src/conf.c:573 #, fuzzy msgid "Sidebar" msgstr "Ocultar S_idebar" -#: ../markdown/src/conf.c:584 +#: ../markdown/src/conf.c:581 #, fuzzy msgid "Message Window" msgstr "_Ocultar Janela de Mensagens" -#: ../markdown/src/conf.c:598 +#: ../markdown/src/conf.c:595 msgid "Font:" msgstr "" -#: ../markdown/src/conf.c:616 +#: ../markdown/src/conf.c:612 msgid "Code Font:" msgstr "" -#: ../markdown/src/conf.c:634 +#: ../markdown/src/conf.c:629 msgid "BG Color:" msgstr "" -#: ../markdown/src/conf.c:651 +#: ../markdown/src/conf.c:645 msgid "FG Color:" msgstr "" -#: ../markdown/src/conf.c:670 +#: ../markdown/src/conf.c:663 #, fuzzy msgid "Select Template File" msgstr "Seleciona até a linha" -#: ../markdown/src/plugin.c:33 +#: ../markdown/src/plugin.c:35 msgid "Real-time Markdown preview" msgstr "" -#: ../markdown/src/plugin.c:49 +#: ../markdown/src/plugin.c:51 msgid "Markdown Preview" msgstr "" -#: ../markdown/src/plugin.c:160 +#: ../markdown/src/plugin.c:162 msgid "The current document does not have a Markdown filetype." msgstr "" +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:35 +msgid "Pair Tag Highlighter" +msgstr "" + +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:36 +msgid "Finds and highlights matching opening/closing HTML tag" +msgstr "" + +#: ../pohelper/data/menus.ui.h:1 +msgid "_Translation Helper" +msgstr "" + +#: ../pohelper/data/menus.ui.h:2 +msgid "_Previous String" +msgstr "" + +#: ../pohelper/data/menus.ui.h:3 ../pohelper/src/gph-plugin.c:1031 +#, fuzzy +msgid "Go to previous string" +msgstr "Retornar para o diálogo anterior." + +#: ../pohelper/data/menus.ui.h:4 +msgid "_Next String" +msgstr "" + +#: ../pohelper/data/menus.ui.h:5 ../pohelper/src/gph-plugin.c:1034 +#, fuzzy +msgid "Go to next string" +msgstr "Pula para a próxima linha." + +#: ../pohelper/data/menus.ui.h:6 +msgid "Pre_vious Untranslated" +msgstr "" + +#: ../pohelper/data/menus.ui.h:7 ../pohelper/src/gph-plugin.c:1037 +msgid "Go to previous untranslated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:8 +msgid "Next _Untranslated" +msgstr "" + +#: ../pohelper/data/menus.ui.h:9 ../pohelper/src/gph-plugin.c:1040 +msgid "Go to next untranslated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:10 +msgid "Previous Fu_zzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:11 ../pohelper/src/gph-plugin.c:1043 +msgid "Go to previous fuzzily translated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:12 +msgid "Next _Fuzzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:13 ../pohelper/src/gph-plugin.c:1046 +msgid "Go to next fuzzily translated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:14 +msgid "Previous Untranslated or Fuzz_y" +msgstr "" + +#: ../pohelper/data/menus.ui.h:15 ../pohelper/src/gph-plugin.c:1049 +msgid "Go to previous untranslated or fuzzy string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:16 +msgid "Next Untranslated _or Fuzzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:17 ../pohelper/src/gph-plugin.c:1053 +msgid "Go to next untranslated or fuzzy string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:18 ../pohelper/src/gph-plugin.c:1064 +#, fuzzy +msgid "Toggle current translation fuzziness" +msgstr "tipo de documentação" + +#: ../pohelper/data/menus.ui.h:19 +msgid "_Toggle Fuzziness" +msgstr "" + +#: ../pohelper/data/menus.ui.h:20 +msgid "Paste _Message as Translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:21 +msgid "Paste the original untranslated string to the translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:22 ../pohelper/src/gph-plugin.c:1061 +msgid "Reflow the current translation string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:23 +msgid "_Reflow Translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:24 +msgid "" +"Whether to update the translation headers (author, revision date, ...) upon " +"file save" +msgstr "" + +#: ../pohelper/data/menus.ui.h:25 +msgid "Update _Headers Upon Save" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:41 +msgid "Translation Helper" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:42 +msgid "Improves support for GetText translation files." +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1057 +msgid "Paste original untranslated string to translation" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1099 +#, fuzzy, c-format +msgid "Failed to load configuration file: %s" +msgstr "Falha ao carregar configuração: %s" + +#: ../pohelper/src/gph-plugin.c:1124 +#, fuzzy, c-format +msgid "Failed to create configuration directory \"%s\": %s" +msgstr "" +"Falha ao encontrar arquivo de configuração para o tipo de arquivo \"%s\": %s" + +#: ../pohelper/src/gph-plugin.c:1127 +#, fuzzy, c-format +msgid "Failed to save configuration file: %s" +msgstr "Falha ao salvar configuração: %s" + +#: ../pohelper/src/gph-plugin.c:1182 +#, fuzzy, c-format +msgid "" +"Failed to load UI definition, please check your installation. The error was: " +"%s" +msgstr "" +"O plugin %s falhou em carregar apropriadamente.\n" +"Por favor, verifique a sua instalação." + +#: ../pohelper/src/gph-plugin.c:1222 +#, c-format +msgid "" +"Cannot find widget \"%s\" in the UI definition, please check your " +"installation." +msgstr "" + #: ../pretty-printer/src/PluginEntry.c:37 msgid "XML PrettyPrinter" msgstr "" @@ -5217,283 +5503,355 @@ msgstr "" #: ../scope/data/scope.glade.h:64 -msgid "_Evaluate/Modify" +msgid "_Raw" msgstr "" #: ../scope/data/scope.glade.h:65 -msgid "_Watch Expression" +msgid "_Evaluate/Modify" msgstr "" #: ../scope/data/scope.glade.h:66 -#, fuzzy -msgid "_Inspect Variable" -msgstr "/Ambientes" +msgid "_Watch Expression" +msgstr "" #: ../scope/data/scope.glade.h:67 #, fuzzy -msgid "Program Terminal" -msgstr "Executar no terminal" +msgid "_Inspect Variable" +msgstr "/Ambientes" #: ../scope/data/scope.glade.h:68 msgid "Threads" msgstr "" -#: ../scope/data/scope.glade.h:70 +#: ../scope/data/scope.glade.h:69 #, fuzzy msgid "Stack" msgstr "_Empilhar" -#: ../scope/data/scope.glade.h:71 +#: ../scope/data/scope.glade.h:70 msgid "Locals" msgstr "" -#: ../scope/data/scope.glade.h:72 +#: ../scope/data/scope.glade.h:71 #, fuzzy msgid "Watches" msgstr "Pontos de observação" -#: ../scope/data/scope.glade.h:73 +#: ../scope/data/scope.glade.h:72 msgid "Memory" msgstr "" -#: ../scope/data/scope.glade.h:74 -#, fuzzy -msgid "Debug Console" -msgstr "Console:" - -#: ../scope/data/scope.glade.h:75 +#: ../scope/data/scope.glade.h:73 #, fuzzy msgid "Enter gdb command:" msgstr "Inserir comando" -#: ../scope/data/scope.glade.h:76 +#: ../scope/data/scope.glade.h:74 #, fuzzy msgid "Convert _UTF-8 to locale" msgstr "Formatar seleção alinhado à esquerda" -#: ../scope/data/scope.glade.h:77 +#: ../scope/data/scope.glade.h:75 msgid "_Thread" msgstr "" -#: ../scope/data/scope.glade.h:78 +#: ../scope/data/scope.glade.h:76 msgid "_Group" msgstr "" -#: ../scope/data/scope.glade.h:79 +#: ../scope/data/scope.glade.h:77 #, fuzzy msgid "_Frame" msgstr "Info do Quadro" -#: ../scope/data/scope.glade.h:80 +#: ../scope/data/scope.glade.h:78 #, fuzzy msgid "Setup Program" msgstr "nenhum programa" -#: ../scope/data/scope.glade.h:81 +#: ../scope/data/scope.glade.h:79 msgid "_Executable:" msgstr "" -#: ../scope/data/scope.glade.h:82 +#: ../scope/data/scope.glade.h:80 msgid "_Arguments:" msgstr "" -#: ../scope/data/scope.glade.h:83 +#: ../scope/data/scope.glade.h:81 #, fuzzy msgid "En_vironment:" msgstr "Ambiente:" -#: ../scope/data/scope.glade.h:84 +#: ../scope/data/scope.glade.h:82 msgid "_Working dir:" msgstr "" -#: ../scope/data/scope.glade.h:85 +#: ../scope/data/scope.glade.h:83 #, fuzzy msgid "_Load script:" msgstr "Scripts _Lua" -#: ../scope/data/scope.glade.h:86 +#: ../scope/data/scope.glade.h:84 msgid "Auto _run program/exit gdb" msgstr "" -#: ../scope/data/scope.glade.h:87 +#: ../scope/data/scope.glade.h:85 msgid "_Non-stop mode" msgstr "" -#: ../scope/data/scope.glade.h:88 -msgid "_Temporary breakpoint at:" +#: ../scope/data/scope.glade.h:86 +msgid "_Temporary breakpoint on load at:" msgstr "" -#: ../scope/data/scope.glade.h:89 -msgid "_Delete all breakpoints, watches and inspects" +#: ../scope/data/scope.glade.h:87 +msgid "_Delete all breakpoints, watches, inspects and registers" msgstr "" -#: ../scope/data/scope.glade.h:90 ../scope/src/prefs.c:337 +#: ../scope/data/scope.glade.h:88 ../scope/src/scope.c:522 #, fuzzy msgid "Program" msgstr "nenhum programa" -#: ../scope/data/scope.glade.h:91 +#: ../scope/data/scope.glade.h:89 #, fuzzy msgid "Open on" msgstr "Abrir URI" -#: ../scope/data/scope.glade.h:92 +#: ../scope/data/scope.glade.h:90 #, fuzzy msgid "g_db load" msgstr "_Descarregar" -#: ../scope/data/scope.glade.h:93 +#: ../scope/data/scope.glade.h:91 msgid "p_rogram start" msgstr "" -#: ../scope/data/scope.glade.h:94 +#: ../scope/data/scope.glade.h:92 #, fuzzy msgid "Update all _views" msgstr "Atualizar Lista de Tarefas" -#: ../scope/data/scope.glade.h:95 +#: ../scope/data/scope.glade.h:93 msgid "Panel" msgstr "" -#: ../scope/data/scope.glade.h:96 +#: ../scope/data/scope.glade.h:94 msgid "Default 8-bit text mode:" msgstr "" -#: ../scope/data/scope.glade.h:97 +#: ../scope/data/scope.glade.h:95 msgid "_7-bit \\nnn" msgstr "" -#: ../scope/data/scope.glade.h:98 +#: ../scope/data/scope.glade.h:96 msgid "Display" msgstr "" -#: ../scope/data/scope.glade.h:99 +#: ../scope/data/scope.glade.h:97 #, fuzzy msgid "_member" msgstr "Number" -#: ../scope/data/scope.glade.h:100 +#: ../scope/data/scope.glade.h:98 #, fuzzy msgid "and" msgstr "Inclinado" -#: ../scope/data/scope.glade.h:101 +#: ../scope/data/scope.glade.h:99 #, fuzzy msgid "_argument" msgstr "Enviar docu_mento" -#: ../scope/data/scope.glade.h:102 +#: ../scope/data/scope.glade.h:100 #, fuzzy msgid "names" msgstr "Renomear" -#: ../scope/data/scope.glade.h:103 +#: ../scope/data/scope.glade.h:101 msgid "Values" msgstr "" -#: ../scope/data/scope.glade.h:104 +#: ../scope/data/scope.glade.h:102 #, fuzzy msgid "E_xpand on apply" msgstr "Expandir tudo" -#: ../scope/data/scope.glade.h:105 +#: ../scope/data/scope.glade.h:103 msgid "S_how" msgstr "" -#: ../scope/data/scope.glade.h:106 +#: ../scope/data/scope.glade.h:104 msgid "children" msgstr "" -#: ../scope/data/scope.glade.h:107 +#: ../scope/data/scope.glade.h:105 msgid "Inspect" msgstr "" -#: ../scope/data/scope.glade.h:108 +#: ../scope/data/scope.glade.h:106 msgid "Show =li_brary messages" msgstr "" -#: ../scope/data/scope.glade.h:109 +#: ../scope/data/scope.glade.h:107 #, fuzzy msgid "Show _tooltips" msgstr "Exibir dicas de ferramentas." -#: ../scope/data/scope.glade.h:110 +#: ../scope/data/scope.glade.h:108 msgid "Others" msgstr "" -#: ../scope/data/scope.glade.h:111 +#: ../scope/data/scope.glade.h:109 #, fuzzy msgid "Options" msgstr "_Opções" -#: ../scope/data/scope.glade.h:112 +#: ../scope/data/scope.glade.h:110 #, fuzzy msgid "_Import" msgstr "Report" -#: ../scope/data/scope.glade.h:113 +#: ../scope/data/scope.glade.h:111 #, fuzzy msgid "Enter assignment expression:" msgstr "expressão regular inválida: %s" -#: ../scope/data/scope.glade.h:114 +#: ../scope/data/scope.glade.h:112 msgid "Inspect" msgstr "" -#: ../scope/data/scope.glade.h:115 +#: ../scope/data/scope.glade.h:113 #, fuzzy msgid "Object:" msgstr "Info do Objeto" -#: ../scope/data/scope.glade.h:117 +#: ../scope/data/scope.glade.h:115 msgid "-" msgstr "" -#: ../scope/data/scope.glade.h:118 +#: ../scope/data/scope.glade.h:116 #, fuzzy msgid "Frame:" msgstr "Nome:" -#: ../scope/data/scope.glade.h:119 +#: ../scope/data/scope.glade.h:117 msgid "@" msgstr "" -#: ../scope/data/scope.glade.h:120 +#: ../scope/data/scope.glade.h:118 msgid "_Apply on run" msgstr "" -#: ../scope/data/scope.glade.h:121 +#: ../scope/data/scope.glade.h:119 #, fuzzy msgid "Expand" msgstr "Expandir tudo" -#: ../scope/data/scope.glade.h:122 +#: ../scope/data/scope.glade.h:120 #, fuzzy msgid "Start:" msgstr "_Início:" -#: ../scope/data/scope.glade.h:123 +#: ../scope/data/scope.glade.h:121 msgid "Count:" msgstr "" -#: ../scope/data/scope.glade.h:124 +#: ../scope/data/scope.glade.h:122 #, fuzzy msgid "_Expand on apply" msgstr "Expandir tudo" -#: ../scope/src/break.c:947 +#: ../scope/data/scope.glade.h:123 ../scope/src/scope.c:522 +#, fuzzy +msgid "Program Terminal" +msgstr "Executar no terminal" + +#: ../scope/data/scope.glade.h:125 +msgid "Registers" +msgstr "" + +#: ../scope/src/break.c:97 +#, fuzzy +msgid "breakpoint" +msgstr "Pontos de quebra" + +#: ../scope/src/break.c:98 +#, fuzzy +msgid "hardware breakpoint" +msgstr "Editar ponto de quebra" + +#: ../scope/src/break.c:99 +#, fuzzy +msgid "tracepoint" +msgstr "ponto de observação" + +#: ../scope/src/break.c:100 +#, fuzzy +msgid "fast tracepoint" +msgstr "ponto de observação" + +#: ../scope/src/break.c:101 +#, fuzzy +msgid "write watchpoint" +msgstr "Editar ponto de observação" + +#: ../scope/src/break.c:104 +#, fuzzy +msgid "access watchpoint" +msgstr "ponto de observação" + +#: ../scope/src/break.c:106 +#, fuzzy +msgid "read watchpoint" +msgstr "Editar ponto de observação" + +#: ../scope/src/break.c:108 +#, fuzzy +msgid "catchpoint" +msgstr "ponto de observação" + +#: ../scope/src/break.c:135 ../scope/src/break.c:139 +msgid "CLI" +msgstr "" + +#: ../scope/src/break.c:136 +msgid "unsupported MI" +msgstr "" + +#: ../scope/src/break.c:141 +#, fuzzy +msgid "on load" +msgstr "_Descarregar" + +#: ../scope/src/break.c:142 +#, fuzzy +msgid "Run to Cursor" +msgstr "Executar até o local" + +#: ../scope/src/break.c:1013 #, c-format msgid "" "There are two or more breakpoints at %s:%d.\n" +"\n" "Use the breakpoint list to remove the exact one." msgstr "" -#: ../scope/src/break.c:1200 +#: ../scope/src/break.c:1252 +#, c-format +msgid ", %s" +msgstr "" + +#: ../scope/src/break.c:1278 +#, c-format +msgid "func %s" +msgstr "" + +#: ../scope/src/break.c:1309 #, fuzzy msgid "Add Breakpoint" msgstr "Incluir ponto de quebra" -#: ../scope/src/break.c:1215 +#: ../scope/src/break.c:1324 #, fuzzy msgid "Add Watchpoint" msgstr "Incluir ponto de observação" @@ -5507,7 +5865,8 @@ msgid "Enter char # (0..255):" msgstr "" -#: ../scope/src/conterm.c:466 ../scope/src/scope.c:502 +#: ../scope/src/conterm.c:509 ../scope/src/scope.c:550 +#: ../scope/src/scope.c:551 #, fuzzy, c-format msgid "Scope: %s." msgstr "Fechar: %s" @@ -5527,65 +5886,66 @@ msgid "Program terminated." msgstr "terminado" -#: ../scope/src/debug.c:468 +#: ../scope/src/debug.c:469 msgid "No breakpoints. Hanging." msgstr "" -#: ../scope/src/debug.c:596 ../scope/src/thread.c:97 +#: ../scope/src/debug.c:598 ../scope/src/thread.c:92 #, c-format msgid "%s." msgstr "" -#: ../scope/src/inspect.c:77 +#: ../scope/src/inspect.c:66 #, fuzzy msgid "..." msgstr "Mais..." -#: ../scope/src/inspect.c:324 +#: ../scope/src/inspect.c:339 #, fuzzy msgid "invalid data" msgstr "Rótulo inválido" -#: ../scope/src/inspect.c:356 +#: ../scope/src/inspect.c:371 msgid "no children in range" msgstr "" -#: ../scope/src/inspect.c:440 +#: ../scope/src/inspect.c:454 #, fuzzy msgid "out of scope" msgstr "Ponto de observação #%s fora de escopo" -#: ../scope/src/inspect.c:587 +#: ../scope/src/inspect.c:627 msgid "Duplicate inspect variable name." msgstr "" -#: ../scope/src/memory.c:299 +#: ../scope/src/memory.c:292 msgid "Read Memory" msgstr "" -#: ../scope/src/memory.c:408 -msgid "Scope: pointer size > 8, Data disabled." +#: ../scope/src/memory.c:396 +#, c-format +msgid "Scope: pointer size > %d, Data disabled." msgstr "" -#: ../scope/src/menu.c:380 +#: ../scope/src/menu.c:375 msgid "Modify" msgstr "" -#: ../scope/src/menu.c:490 +#: ../scope/src/menu.c:481 msgid "Evaluate/modify" msgstr "" -#: ../scope/src/menu.c:491 +#: ../scope/src/menu.c:482 #, fuzzy msgid "Watch expression" msgstr "expressão regular inválida: %s" -#: ../scope/src/menu.c:492 +#: ../scope/src/menu.c:483 #, fuzzy msgid "Inspect variable" msgstr "Variáveis locais" -#: ../scope/src/parse.c:416 +#: ../scope/src/parse.c:437 msgid "Undefined GDB error." msgstr "" @@ -5599,37 +5959,27 @@ msgid "Select File" msgstr "Selecionar arquivo" -#: ../scope/src/prefs.c:338 -#, fuzzy -msgid "Breaks" -msgstr "Pontos de quebra" - -#: ../scope/src/prefs.c:339 -#, fuzzy -msgid "Console" -msgstr "Console:" - -#: ../scope/src/prefs.c:347 ../scope/src/utils.c:570 +#: ../scope/src/prefs.c:294 ../scope/src/utils.c:438 #, c-format msgid "Scope: %s: %s." msgstr "" -#: ../scope/src/prefs.c:352 +#: ../scope/src/prefs.c:299 #, fuzzy msgid "Scope: created configuration file." msgstr "Forçar recarga dos arquivos de configuração" -#: ../scope/src/program.c:231 +#: ../scope/src/program.c:251 #, c-format msgid "Loaded debug settings for %s." msgstr "" -#: ../scope/src/program.c:239 +#: ../scope/src/program.c:259 #, fuzzy, c-format msgid "Could not load debug settings file %s: %s." msgstr "Falha ao carregar tipo de arquivo \"%s\" do arquivo \"%s\": %s" -#: ../scope/src/program.c:359 +#: ../scope/src/program.c:379 #, fuzzy, c-format msgid "" "%s: %s.\n" @@ -5637,15 +5987,15 @@ "Continue?" msgstr "Contando..." -#: ../scope/src/program.c:394 -msgid "Delete all breakpoints, watches and inspects?" +#: ../scope/src/program.c:415 +msgid "Delete all breakpoints, watches et cetera?" msgstr "" -#: ../scope/src/program.c:501 +#: ../scope/src/program.c:523 msgid "as _Name=value" msgstr "" -#: ../scope/src/program.c:502 +#: ../scope/src/program.c:524 msgid "as _Name = value" msgstr "" @@ -5655,169 +6005,184 @@ msgstr "Depurar" #: ../scope/src/scope.c:35 -msgid "Simple GDB front-end." +msgid "Relatively simple GDB front-end." msgstr "" -#: ../scope/src/scope.c:63 +#: ../scope/src/scope.c:62 #, fuzzy msgid "Setup program" msgstr "nenhum programa" -#: ../scope/src/scope.c:64 +#: ../scope/src/scope.c:63 #, fuzzy msgid "Run/continue" msgstr "Contando..." -#: ../scope/src/scope.c:66 +#: ../scope/src/scope.c:65 #, fuzzy msgid "Run to source" msgstr "Executar até o local" -#: ../scope/src/scope.c:70 +#: ../scope/src/scope.c:69 #, fuzzy msgid "Terminate" msgstr "terminado" -#: ../scope/src/scope.c:71 +#: ../scope/src/scope.c:70 #, fuzzy msgid "Toggle breakpoint" msgstr "ponto de quebra" -#: ../scope/src/scope.c:73 ../scope/src/scope.c:76 +#: ../scope/src/scope.c:72 ../scope/src/scope.c:75 #, fuzzy msgid "GDB command" msgstr "Inserir comando" -#: ../scope/src/scope.c:74 +#: ../scope/src/scope.c:73 #, fuzzy msgid "Show terminal" msgstr "Executar no terminal" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Busy" msgstr "" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Ready" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Hang" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Assem" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 #, fuzzy msgid "Load" msgstr "C_arregar" -#: ../scope/src/scope.c:394 +#: ../scope/src/scope.c:421 msgid "Build action activated. Terminate debugging?" msgstr "" -#: ../scope/src/thread.c:58 +#: ../scope/src/scope.c:524 +#, fuzzy +msgid "Breaks" +msgstr "Pontos de quebra" + +#: ../scope/src/scope.c:526 +#, fuzzy +msgid "Console" +msgstr "Console:" + +#: ../scope/src/scope.c:526 +#, fuzzy +msgid "Debug Console" +msgstr "Console:" + +#: ../scope/src/thread.c:48 #, c-format msgid "Thread group %s started." msgstr "" -#: ../scope/src/thread.c:76 +#: ../scope/src/thread.c:63 msgid "Thread group " msgstr "" -#: ../scope/src/thread.c:88 +#: ../scope/src/thread.c:83 msgid " exited" msgstr "" -#: ../scope/src/thread.c:91 +#: ../scope/src/thread.c:86 #, c-format msgid " with exit code %s" msgstr "" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 #, fuzzy msgid "Send Signal" msgstr "Enviar por correio" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 msgid "Enter signal #:" msgstr "" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Terminate Process" msgstr "" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Enter exit code:" msgstr "" -#: ../scope/src/thread.c:937 +#: ../scope/src/thread.c:891 #, fuzzy msgid "Running" msgstr "executando" -#: ../scope/src/thread.c:938 +#: ../scope/src/thread.c:892 #, fuzzy msgid "Stopped" msgstr "parado" -#: ../scope/src/utils.c:44 -#, c-format -msgid "%s: error %lu." -msgstr "" +#: ../scope/src/utils.c:45 +#, fuzzy, c-format +msgid "%s: %s" +msgstr "%s:%u:%u: %s" -#: ../scope/src/utils.c:358 +#: ../scope/src/utils.c:225 #, c-format msgid "Scope: error reading [%s]." msgstr "" -#: ../scope/src/views.c:505 +#: ../scope/src/views.c:526 msgid "…" msgstr "" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Send" msgstr "" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Busy" msgstr "" -#: ../scope/src/views.c:535 +#: ../scope/src/views.c:558 #, fuzzy msgid "GDB Command" msgstr "Comando 0:" -#: ../spellcheck/src/speller.c:94 +#: ../spellcheck/src/speller.c:180 msgid "Try: " msgstr "Tentar:" -#: ../spellcheck/src/speller.c:173 +#: ../spellcheck/src/speller.c:252 msgid "Checking" msgstr "Verificando" -#: ../spellcheck/src/speller.c:186 +#: ../spellcheck/src/speller.c:265 #, c-format msgid "Checking file \"%s\" (lines %d to %d using %s):" msgstr "Verificando arquivo \"%s\" (linhas %d para %d usando %s):" -#: ../spellcheck/src/speller.c:196 +#: ../spellcheck/src/speller.c:275 #, c-format msgid "Checking file \"%s\" (using %s):" msgstr "Verificando arquivo \"%s\" (usando %s):" -#: ../spellcheck/src/speller.c:223 +#: ../spellcheck/src/speller.c:302 msgid "The checked text is spelled correctly." msgstr "O texto verificado está escrito corretamente." -#: ../spellcheck/src/speller.c:233 +#: ../spellcheck/src/speller.c:312 #, c-format msgid "The Enchant library couldn't be initialized (%s)." msgstr "A biblioteca Enchant não pôde ser inicializada (%s)." -#: ../spellcheck/src/speller.c:234 +#: ../spellcheck/src/speller.c:313 msgid "unknown error (maybe the chosen language is not available)" msgstr "erro desconhecido (talvez a linguagem escolhida não esteja disponível)" @@ -5912,17 +6277,17 @@ msgid "Ignore All" msgstr "Ignorar Tudo" -#: ../spellcheck/src/gui.c:521 +#: ../spellcheck/src/gui.c:526 #, c-format msgid "Default (%s)" msgstr "Padrão (%s)" -#: ../spellcheck/src/gui.c:532 +#: ../spellcheck/src/gui.c:537 #, c-format msgid "Toggle spell check while typing (current language: %s)" msgstr "Alternar verificação ortográfica ao digitar (linguagem atual: %s)" -#: ../spellcheck/src/gui.c:587 +#: ../spellcheck/src/gui.c:592 msgid "Spelling Suggestions" msgstr "Sugestões de Ortografia" @@ -5953,158 +6318,164 @@ #. OK. Something went not as expected. #. * We did have a selection but cannot parse it into rows. #. * Aborting -#: ../tableconvert/src/tableconvert.c:236 +#: ../tableconvert/src/tableconvert.c:237 msgid "Something went wrong on parsing selection. Aborting" msgstr "" -#: ../tableconvert/src/tableconvert.c:268 +#: ../tableconvert/src/tableconvert.c:269 #, fuzzy msgid "Convert selection to table" msgstr "Formatar seleção alinhado à esquerda" #. Build up menu entry -#: ../tableconvert/src/tableconvert.c:281 +#: ../tableconvert/src/tableconvert.c:282 msgid "_Convert to table" msgstr "" -#: ../tableconvert/src/tableconvert.c:284 +#: ../tableconvert/src/tableconvert.c:285 msgid "Converts current marked list to a table." msgstr "" -#: ../treebrowser/src/treebrowser.c:120 +#: ../treebrowser/src/treebrowser.c:124 #, fuzzy msgid "TreeBrowser" msgstr "Navegador em Árvore" -#: ../treebrowser/src/treebrowser.c:121 +#: ../treebrowser/src/treebrowser.c:125 msgid "" "This plugin adds a tree browser to Geany, allowing the user to browse files " "using a tree view of the directory being browsed." msgstr "" -#: ../treebrowser/src/treebrowser.c:430 +#: ../treebrowser/src/treebrowser.c:434 #, fuzzy, c-format msgid "%s: no such directory." msgstr "%s: arquivo ou diretório não existente" -#: ../treebrowser/src/treebrowser.c:526 ../treebrowser/src/treebrowser.c:561 -#: ../treebrowser/src/treebrowser.c:663 +#: ../treebrowser/src/treebrowser.c:537 ../treebrowser/src/treebrowser.c:572 +#: ../treebrowser/src/treebrowser.c:670 #, fuzzy msgid "(Empty)" msgstr "Vazio" -#: ../treebrowser/src/treebrowser.c:966 +#: ../treebrowser/src/treebrowser.c:971 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Não pode executar o comando externo configurado '%s' (%s)." -#: ../treebrowser/src/treebrowser.c:1037 +#: ../treebrowser/src/treebrowser.c:1042 msgid "NewDirectory" msgstr "NovoDiretório" -#: ../treebrowser/src/treebrowser.c:1039 +#: ../treebrowser/src/treebrowser.c:1044 msgid "NewFile" msgstr "NovoArquivo" -#: ../treebrowser/src/treebrowser.c:1044 +#: ../treebrowser/src/treebrowser.c:1049 #, c-format msgid "" "Target file '%s' exists\n" ", do you really want to replace it with empty file?" msgstr "" -#: ../treebrowser/src/treebrowser.c:1089 +#: ../treebrowser/src/treebrowser.c:1095 #, c-format msgid "Do you really want to delete '%s' ?" msgstr "Você quer mesmo excluir %s?" -#: ../treebrowser/src/treebrowser.c:1208 ../treebrowser/src/treebrowser.c:1692 +#: ../treebrowser/src/treebrowser.c:1207 ../treebrowser/src/treebrowser.c:1738 msgid "Go up" msgstr "Ir para cima" -#: ../treebrowser/src/treebrowser.c:1212 ../treebrowser/src/treebrowser.c:1707 +#: ../treebrowser/src/treebrowser.c:1211 ../treebrowser/src/treebrowser.c:1753 msgid "Set path from document" msgstr "Definir caminho para o documento" -#: ../treebrowser/src/treebrowser.c:1216 -msgid "Open externally" +#: ../treebrowser/src/treebrowser.c:1215 +#, fuzzy +msgid "_Open externally" msgstr "Abrir externamente" -#: ../treebrowser/src/treebrowser.c:1221 +#: ../treebrowser/src/treebrowser.c:1220 msgid "Open Terminal" msgstr "Abrir Terminal" -#: ../treebrowser/src/treebrowser.c:1225 +#: ../treebrowser/src/treebrowser.c:1224 msgid "Set as root" msgstr "Definir como raiz" -#: ../treebrowser/src/treebrowser.c:1230 ../treebrowser/src/treebrowser.c:1697 -#: ../treebrowser/src/treebrowser.c:2060 +#: ../treebrowser/src/treebrowser.c:1229 ../treebrowser/src/treebrowser.c:1743 +#: ../treebrowser/src/treebrowser.c:2123 msgid "Refresh" msgstr "Atualizar" -#: ../treebrowser/src/treebrowser.c:1242 +#: ../treebrowser/src/treebrowser.c:1233 +#, fuzzy +msgid "_Find in Files" +msgstr "Pesquisa em Projeto" + +#: ../treebrowser/src/treebrowser.c:1241 msgid "Create new directory" msgstr "Criar novo diretório" -#: ../treebrowser/src/treebrowser.c:1246 +#: ../treebrowser/src/treebrowser.c:1245 msgid "Create new file" msgstr "Criar novo arquivo" -#: ../treebrowser/src/treebrowser.c:1250 +#: ../treebrowser/src/treebrowser.c:1249 msgid "Rename" msgstr "Renomear" -#: ../treebrowser/src/treebrowser.c:1255 +#: ../treebrowser/src/treebrowser.c:1254 msgid "Delete" msgstr "Excluir" -#: ../treebrowser/src/treebrowser.c:1263 +#: ../treebrowser/src/treebrowser.c:1262 #, c-format msgid "Close: %s" msgstr "Fechar: %s" -#: ../treebrowser/src/treebrowser.c:1268 +#: ../treebrowser/src/treebrowser.c:1267 #, fuzzy, c-format msgid "Close Child Documents " msgstr "Fec_har Outros Documentos" -#: ../treebrowser/src/treebrowser.c:1273 +#: ../treebrowser/src/treebrowser.c:1272 #, fuzzy -msgid "Copy full path to clipboard" +msgid "_Copy full path to clipboard" msgstr "Copiar caminho completo" -#: ../treebrowser/src/treebrowser.c:1293 ../treebrowser/src/treebrowser.c:1974 +#: ../treebrowser/src/treebrowser.c:1292 ../treebrowser/src/treebrowser.c:2032 msgid "Show bookmarks" msgstr "Exibir marcadores" -#: ../treebrowser/src/treebrowser.c:1298 ../treebrowser/src/treebrowser.c:1928 +#: ../treebrowser/src/treebrowser.c:1297 ../treebrowser/src/treebrowser.c:1981 msgid "Show hidden files" msgstr "Exibir arquivos ocultos" -#: ../treebrowser/src/treebrowser.c:1303 +#: ../treebrowser/src/treebrowser.c:1302 #, fuzzy msgid "Show toolbars" msgstr "Exibir barras" -#: ../treebrowser/src/treebrowser.c:1574 +#: ../treebrowser/src/treebrowser.c:1621 #, c-format msgid "Target file '%s' exists, do you really want to replace it?" msgstr "" -#: ../treebrowser/src/treebrowser.c:1702 +#: ../treebrowser/src/treebrowser.c:1748 msgid "Home" msgstr "Home" -#: ../treebrowser/src/treebrowser.c:1712 +#: ../treebrowser/src/treebrowser.c:1758 msgid "Track path" msgstr "Rastrear caminho" -#: ../treebrowser/src/treebrowser.c:1717 +#: ../treebrowser/src/treebrowser.c:1763 msgid "Hide bars" msgstr "Ocultar barras" -#: ../treebrowser/src/treebrowser.c:1727 +#: ../treebrowser/src/treebrowser.c:1773 msgid "" "Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' " "reverse try for example this '!;*.c;*.h;*.cpp'" @@ -6112,19 +6483,19 @@ "Filtrar (*.c;*.h;*.cpp), e se você quiser filtrar temporariamente usando o " "'!' inverso, tente por exemplo isso '!;*.c;*.h;*.cpp'" -#: ../treebrowser/src/treebrowser.c:1735 +#: ../treebrowser/src/treebrowser.c:1781 msgid "Addressbar for example '/projects/my-project'" msgstr "Barra de endereços por exemplo '/projetos/meu-projeto'" -#: ../treebrowser/src/treebrowser.c:1760 +#: ../treebrowser/src/treebrowser.c:1806 msgid "Tree Browser" msgstr "Navegador em Árvore" -#: ../treebrowser/src/treebrowser.c:1892 +#: ../treebrowser/src/treebrowser.c:1945 msgid "External open command" msgstr "Comando de abrir externo" -#: ../treebrowser/src/treebrowser.c:1897 +#: ../treebrowser/src/treebrowser.c:1950 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -6139,55 +6510,55 @@ "%d será substituído pelo nome do caminho do arquivo selecionado sem o nome " "do arquivo" -#: ../treebrowser/src/treebrowser.c:1905 +#: ../treebrowser/src/treebrowser.c:1958 msgid "Toolbar" msgstr "" -#: ../treebrowser/src/treebrowser.c:1907 +#: ../treebrowser/src/treebrowser.c:1960 msgid "Hidden" msgstr "" -#: ../treebrowser/src/treebrowser.c:1908 +#: ../treebrowser/src/treebrowser.c:1961 msgid "Top" msgstr "" -#: ../treebrowser/src/treebrowser.c:1909 +#: ../treebrowser/src/treebrowser.c:1962 msgid "Bottom" msgstr "" -#: ../treebrowser/src/treebrowser.c:1914 +#: ../treebrowser/src/treebrowser.c:1967 #, fuzzy msgid "If position is changed, the option require plugin restart." msgstr "Exibir barras no topo (Exige que o plugin seja reiniciado)" -#: ../treebrowser/src/treebrowser.c:1918 +#: ../treebrowser/src/treebrowser.c:1971 #, fuzzy msgid "Show icons" msgstr "Exibir ícones." -#: ../treebrowser/src/treebrowser.c:1920 +#: ../treebrowser/src/treebrowser.c:1973 msgid "None" msgstr "" -#: ../treebrowser/src/treebrowser.c:1921 +#: ../treebrowser/src/treebrowser.c:1974 #, fuzzy msgid "Base" msgstr "_Base:" -#: ../treebrowser/src/treebrowser.c:1922 +#: ../treebrowser/src/treebrowser.c:1975 #, fuzzy msgid "Content-type" msgstr "Conteúdos" -#: ../treebrowser/src/treebrowser.c:1933 +#: ../treebrowser/src/treebrowser.c:1986 msgid "On Windows, this just hide files that are prefixed with '.' (dot)" msgstr "No Windows, isso apenas oculta arquivos prefixados com '.' (ponto)" -#: ../treebrowser/src/treebrowser.c:1935 +#: ../treebrowser/src/treebrowser.c:1988 msgid "Hide object files" msgstr "Ocultar arquivos de objeto" -#: ../treebrowser/src/treebrowser.c:1940 +#: ../treebrowser/src/treebrowser.c:1993 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -6195,50 +6566,59 @@ "Não exibir arquivos de objetos gerados no navegador de arquivos. Isso inclui " "*.o, *.obj. *.so, *.dll, *.a, *.lib" -#: ../treebrowser/src/treebrowser.c:1942 +#: ../treebrowser/src/treebrowser.c:1995 msgid "Reverse filter" msgstr "Reverter filtro" -#: ../treebrowser/src/treebrowser.c:1947 +#: ../treebrowser/src/treebrowser.c:2000 msgid "Follow current document" msgstr "Seguir documento atual" -#: ../treebrowser/src/treebrowser.c:1952 +#: ../treebrowser/src/treebrowser.c:2005 msgid "Single click, open document and focus it" msgstr "Clique simples, abrir documento e focá-lo" -#: ../treebrowser/src/treebrowser.c:1957 +#: ../treebrowser/src/treebrowser.c:2010 msgid "Double click open directory" msgstr "Duplo clique abre diretório" -#: ../treebrowser/src/treebrowser.c:1962 +#: ../treebrowser/src/treebrowser.c:2015 msgid "On delete file, close it if is opened" msgstr "Ao excluir arquivo, fechá-lo se ele estiver aberto" -#: ../treebrowser/src/treebrowser.c:1967 +#: ../treebrowser/src/treebrowser.c:2020 +msgid "Focus editor on file open" +msgstr "" + +#: ../treebrowser/src/treebrowser.c:2025 msgid "Show tree lines" msgstr "Exibir linhas da árvore" -#: ../treebrowser/src/treebrowser.c:2050 +#: ../treebrowser/src/treebrowser.c:2037 +#, fuzzy +msgid "Open new files" +msgstr "Abrir arquivo" + +#: ../treebrowser/src/treebrowser.c:2113 #, fuzzy msgid "Focus File List" msgstr "Focar Lista de Tarefas" -#: ../treebrowser/src/treebrowser.c:2052 +#: ../treebrowser/src/treebrowser.c:2115 msgid "Focus Path Entry" msgstr "" -#: ../treebrowser/src/treebrowser.c:2054 +#: ../treebrowser/src/treebrowser.c:2117 #, fuzzy msgid "Rename Object" msgstr "Renomear" -#: ../treebrowser/src/treebrowser.c:2056 +#: ../treebrowser/src/treebrowser.c:2119 #, fuzzy msgid "Create New File" msgstr "Criar novo arquivo" -#: ../treebrowser/src/treebrowser.c:2058 +#: ../treebrowser/src/treebrowser.c:2121 #, fuzzy msgid "Create New Directory" msgstr "Criar novo diretório" @@ -6309,46 +6689,46 @@ msgid "utility" msgstr "" -#: ../webhelper/src/gwh-settings.c:775 +#: ../webhelper/src/gwh-settings.c:782 #, c-format msgid "%s:" msgstr "" -#: ../webhelper/src/gwh-browser.c:528 +#: ../webhelper/src/gwh-browser.c:534 msgid "_Zoom" msgstr "" -#: ../webhelper/src/gwh-browser.c:550 +#: ../webhelper/src/gwh-browser.c:556 msgid "Full-_content zoom" msgstr "" -#: ../webhelper/src/gwh-browser.c:561 +#: ../webhelper/src/gwh-browser.c:567 #, fuzzy msgid "Flip panes orientation" msgstr "Orientação do Papel:" -#: ../webhelper/src/gwh-browser.c:808 +#: ../webhelper/src/gwh-browser.c:814 msgid "Back" msgstr "" -#: ../webhelper/src/gwh-browser.c:812 +#: ../webhelper/src/gwh-browser.c:818 msgid "Forward" msgstr "" -#: ../webhelper/src/gwh-browser.c:816 +#: ../webhelper/src/gwh-browser.c:822 #, fuzzy msgid "Cancel loading" msgstr "Codificação" -#: ../webhelper/src/gwh-browser.c:820 +#: ../webhelper/src/gwh-browser.c:826 msgid "Reload current page" msgstr "" -#: ../webhelper/src/gwh-browser.c:833 ../webhelper/src/gwh-browser.c:879 +#: ../webhelper/src/gwh-browser.c:839 ../webhelper/src/gwh-browser.c:885 msgid "Web inspector" msgstr "" -#: ../webhelper/src/gwh-browser.c:834 +#: ../webhelper/src/gwh-browser.c:840 msgid "Toggle web inspector" msgstr "" @@ -6559,9 +6939,6 @@ #~ msgid "tty temporary directory not specified!\n" #~ msgstr "diretório temporário tty não especificado!\n" -#~ msgid "tty temporary directory not found!\n" -#~ msgstr "diretório temporário tty não encontrado!\n" - #~ msgid "tty helper program not specified!\n" #~ msgstr "programa auxiliar tty não especificado!\n" @@ -6628,21 +7005,12 @@ #~ msgid "No %s selected" #~ msgstr "Nenhum %s selecionado" -#~ msgid "watchpoint" -#~ msgstr "ponto de observação" - #~ msgid "Delete selected watchpoint?" #~ msgstr "Excluir ponto de observação selecionado?" #~ msgid "Delete selected breakpoint?" #~ msgstr "Excluir ponto de quebra selecionado?" -#~ msgid "Edit watchpoint" -#~ msgstr "Editar ponto de observação" - -#~ msgid "Edit breakpoint" -#~ msgstr "Editar ponto de quebra" - #~ msgid "Enabled" #~ msgstr "Habilitado" @@ -6848,10 +7216,6 @@ #~ msgid "Couldn't create tempfile" #~ msgstr "Criar novo arquivo" -#, fuzzy -#~ msgid "GeanyPG" -#~ msgstr "GeanyGDB" - #~ msgid "Lionel Fuentes" #~ msgstr "Lionel Fuentes" diff -Nru geany-plugins-1.23+dfsg/po/pt.po geany-plugins-1.24+dfsg/po/pt.po --- geany-plugins-1.23+dfsg/po/pt.po 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/po/pt.po 2014-04-12 14:28:39.000000000 +0000 @@ -5,9 +5,9 @@ # André Glória, 2009 - 2011 msgid "" msgstr "" -"Project-Id-Version: Geany-plugins 1.23\n" +"Project-Id-Version: Geany-plugins 1.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-23 14:32+0100\n" +"POT-Creation-Date: 2014-03-30 19:33+0200\n" "PO-Revision-Date: 2011-10-20 21:38+0100\n" "Last-Translator: André Glória \n" "Language-Team: Portuguese\n" @@ -35,12 +35,12 @@ msgid "Contents" msgstr "Conteúdo" -#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:615 +#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:625 msgid "Bookmarks" msgstr "Favoritos" #. complete update -#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2295 +#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2351 msgid "_Update" msgstr "Act_ualizar" @@ -77,15 +77,15 @@ msgid "Context:" msgstr "Contexto:" -#: ../addons/src/ao_xmltagging.c:56 +#: ../addons/src/ao_xmltagging.c:54 msgid "XML tagging" msgstr "Etiquetas XML" -#: ../addons/src/ao_xmltagging.c:67 +#: ../addons/src/ao_xmltagging.c:65 msgid "Tag name to be inserted:" msgstr "Nome da etiqueta a ser inserida:" -#: ../addons/src/ao_xmltagging.c:71 +#: ../addons/src/ao_xmltagging.c:69 #, c-format msgid "" "%s will be replaced with your current selection. Please keep care on your " @@ -158,11 +158,12 @@ msgid "Run XML tagging" msgstr "Auto-Completar etiquetas (tags) XML" -#: ../addons/src/addons.c:417 ../geanylatex/src/geanylatex.c:241 -#: ../geanyprj/src/geanyprj.c:174 ../geanysendmail/src/geanysendmail.c:121 -#: ../geanysendmail/src/geanysendmail.c:287 ../geanyvc/src/geanyvc.c:1798 +#: ../addons/src/addons.c:417 ../autoclose/src/autoclose.c:871 +#: ../geanylatex/src/geanylatex.c:241 ../geanyprj/src/geanyprj.c:174 +#: ../geanysendmail/src/geanysendmail.c:123 +#: ../geanysendmail/src/geanysendmail.c:291 ../geanyvc/src/geanyvc.c:1854 #: ../geniuspaste/src/geniuspaste.c:140 ../spellcheck/src/scplugin.c:146 -#: ../treebrowser/src/treebrowser.c:1880 +#: ../treebrowser/src/treebrowser.c:1933 #: ../updatechecker/src/updatechecker.c:253 msgid "Plugin configuration directory could not be created." msgstr "A directoria de configuração do plugin não pode ser criada." @@ -256,6 +257,15 @@ msgid "Enclose selection automatically (without having to press a keybinding)" msgstr "" +#: ../autoclose/src/autoclose.c:50 +#, fuzzy +msgid "Auto-close" +msgstr "Autos" + +#: ../autoclose/src/autoclose.c:51 +msgid "Auto-close braces and brackets with lot of features" +msgstr "" + #: ../codenav/src/codenavigation.c:52 msgid "Code navigation" msgstr "Navegar pelo Código" @@ -326,8 +336,8 @@ msgid "Various debuggers integration." msgstr "Integração de vários debuggers" -#: ../debugger/src/plugin.c:131 ../debugger/src/keys.c:76 -#: ../scope/data/scope.glade.h:125 ../scope/src/scope.c:225 +#: ../debugger/src/plugin.c:133 ../debugger/src/keys.c:76 +#: ../scope/data/scope.glade.h:124 ../scope/src/scope.c:226 msgid "Debug" msgstr "Depuração (debug)" @@ -462,7 +472,7 @@ msgid "Target" msgstr "Alvo" -#: ../debugger/src/tabs.c:135 ../scope/data/scope.glade.h:69 +#: ../debugger/src/tabs.c:135 ../scope/src/scope.c:524 msgid "Breakpoints" msgstr "Pontos de Paragem" @@ -499,22 +509,22 @@ msgstr "Reiniciar" #: ../debugger/src/keys.c:52 ../debugger/src/btnpanel.c:113 -#: ../scope/src/scope.c:67 +#: ../scope/src/scope.c:66 msgid "Step into" msgstr "Avançar para dentro" #: ../debugger/src/keys.c:53 ../debugger/src/btnpanel.c:110 -#: ../scope/src/scope.c:68 +#: ../scope/src/scope.c:67 msgid "Step over" msgstr "Avançar sobre" #: ../debugger/src/keys.c:54 ../debugger/src/btnpanel.c:122 -#: ../scope/src/scope.c:69 +#: ../scope/src/scope.c:68 msgid "Step out" msgstr "Avançar para fora" #: ../debugger/src/keys.c:55 ../debugger/src/btnpanel.c:125 -#: ../scope/src/scope.c:65 +#: ../scope/src/scope.c:64 msgid "Run to cursor" msgstr "Executar até ao cursor" @@ -523,7 +533,8 @@ msgstr "Adiciona / Retira ponto de paragem" #: ../debugger/src/keys.c:57 -msgid "Jump to the currect instruction" +#, fuzzy +msgid "Jump to the current instruction" msgstr "Saltar para a instrução atual" #: ../debugger/src/watch_model.c:220 @@ -554,6 +565,14 @@ msgid "Save debug session data to a project" msgstr "Guardar dados da sessão de depuração num projecto" +#: ../defineformat/src/defineformat.c:56 +msgid "Define formatter" +msgstr "" + +#: ../defineformat/src/defineformat.c:57 +msgid "Automatically align backslash in multi-line defines" +msgstr "" + #. never search for more than this many chars #: ../devhelp/src/dhp.h:38 msgid "Documentation" @@ -666,7 +685,7 @@ msgstr "Livro" #. i18n: a documentation book -#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1760 +#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1759 msgid "Book" msgstr "Livro" @@ -797,12 +816,12 @@ msgid "A developers' help browser for GNOME" msgstr "" -#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2010 +#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2066 msgid "_File" msgstr "_Ficheiro" -#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1815 -#: ../geanymacro/src/geanymacro.c:2112 +#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1822 +#: ../geanymacro/src/geanymacro.c:2118 #, fuzzy msgid "_Edit" msgstr "Editor" @@ -999,55 +1018,64 @@ msgstr "" "Modo coluna, seleccionar até à linha / chaveta / âncora correspondente." -#: ../geanyextrasel/src/extrasel.c:482 +#: ../geanyextrasel/src/extrasel.c:502 msgid "E_xtra Selection" msgstr "Selecções E_xtra" -#: ../geanyextrasel/src/extrasel.c:489 +#: ../geanyextrasel/src/extrasel.c:509 msgid "_Column Mode" msgstr "Modo de _Coluna" -#: ../geanyextrasel/src/extrasel.c:494 +#: ../geanyextrasel/src/extrasel.c:514 msgid "Column mode" msgstr "Modo de Coluna" -#: ../geanyextrasel/src/extrasel.c:496 +#: ../geanyextrasel/src/extrasel.c:516 msgid "Select to _Line" msgstr "Seleccionar até à _linha" -#: ../geanyextrasel/src/extrasel.c:500 +#: ../geanyextrasel/src/extrasel.c:520 msgid "Select to line" msgstr "Seleccionar até à linha" -#: ../geanyextrasel/src/extrasel.c:502 +#: ../geanyextrasel/src/extrasel.c:522 msgid "Select to Matching _Brace" msgstr "Seleccionar até à Chaveta _Correspondente" -#: ../geanyextrasel/src/extrasel.c:506 +#: ../geanyextrasel/src/extrasel.c:526 msgid "Select to matching brace" msgstr "Seleccionar até à chaveta correspondente" -#: ../geanyextrasel/src/extrasel.c:510 +#: ../geanyextrasel/src/extrasel.c:528 +msgid "_Toggle Stream/Rectangular" +msgstr "" + +#: ../geanyextrasel/src/extrasel.c:532 +#, fuzzy +msgid "Convert selection" +msgstr "Converter o selecionado numa tabela" + +#: ../geanyextrasel/src/extrasel.c:537 msgid "_Set Anchor" msgstr "_Definir âncora" -#: ../geanyextrasel/src/extrasel.c:514 +#: ../geanyextrasel/src/extrasel.c:541 msgid "Set anchor" msgstr "Define âncora" -#: ../geanyextrasel/src/extrasel.c:516 +#: ../geanyextrasel/src/extrasel.c:543 msgid "Select to _Anchor" msgstr "Seleccionar até à â_ncora" -#: ../geanyextrasel/src/extrasel.c:520 +#: ../geanyextrasel/src/extrasel.c:547 msgid "Select to anchor" msgstr "Seleccionar até à âncora" -#: ../geanyextrasel/src/extrasel.c:522 +#: ../geanyextrasel/src/extrasel.c:549 msgid "_Rectangle Select to Anchor" msgstr "_Rectângulo de selecção para ancoragem" -#: ../geanyextrasel/src/extrasel.c:527 +#: ../geanyextrasel/src/extrasel.c:554 msgid "Rectangle select to anchor" msgstr "Rectângulo de selecção para ancoragem" @@ -1465,76 +1493,76 @@ "Tipo de documentação, por omissão, para todas as línguas que não tenham um " "definido" -#: ../geanyinsertnum/src/insertnum.c:37 ../geanyinsertnum/src/insertnum.c:329 -#: ../geanyinsertnum/src/insertnum.c:461 +#: ../geanyinsertnum/src/insertnum.c:44 ../geanyinsertnum/src/insertnum.c:337 +#: ../geanyinsertnum/src/insertnum.c:484 msgid "Insert Numbers" msgstr "Inserir Números" -#: ../geanyinsertnum/src/insertnum.c:37 +#: ../geanyinsertnum/src/insertnum.c:44 msgid "Insert/Fill columns with numbers." msgstr "Inserir/Preencher colunas com números." -#: ../geanyinsertnum/src/insertnum.c:140 +#: ../geanyinsertnum/src/insertnum.c:146 msgid "Counting..." msgstr "A contar..." -#: ../geanyinsertnum/src/insertnum.c:188 +#: ../geanyinsertnum/src/insertnum.c:194 msgid "Preparing..." msgstr "A preparar..." -#: ../geanyinsertnum/src/insertnum.c:194 +#: ../geanyinsertnum/src/insertnum.c:200 msgid "Inserting..." msgstr "A inserir..." -#: ../geanyinsertnum/src/insertnum.c:318 +#: ../geanyinsertnum/src/insertnum.c:333 msgid "For base 11 and above" msgstr "Para base 11 e acima" -#: ../geanyinsertnum/src/insertnum.c:341 +#: ../geanyinsertnum/src/insertnum.c:353 msgid "_Start:" msgstr "_Iniciar:" -#: ../geanyinsertnum/src/insertnum.c:346 +#: ../geanyinsertnum/src/insertnum.c:358 msgid "S_tep:" msgstr "_Passo:" -#: ../geanyinsertnum/src/insertnum.c:352 +#: ../geanyinsertnum/src/insertnum.c:364 msgid "_Base:" msgstr "_Base:" -#: ../geanyinsertnum/src/insertnum.c:363 +#: ../geanyinsertnum/src/insertnum.c:380 msgid "Letters:" msgstr "Letras:" -#: ../geanyinsertnum/src/insertnum.c:366 +#: ../geanyinsertnum/src/insertnum.c:383 msgid "_Upper" msgstr "S_uperior" -#: ../geanyinsertnum/src/insertnum.c:371 +#: ../geanyinsertnum/src/insertnum.c:388 msgid "_Lower" msgstr "Inf_erior" -#: ../geanyinsertnum/src/insertnum.c:376 +#: ../geanyinsertnum/src/insertnum.c:393 msgid "Base _prefix" msgstr "_Prefixo da base" -#: ../geanyinsertnum/src/insertnum.c:378 +#: ../geanyinsertnum/src/insertnum.c:395 msgid "0 for octal, 0x for hex, + for positive decimal" msgstr "0 para octal, 0x para hexadecimal, + para decimal positivo" -#: ../geanyinsertnum/src/insertnum.c:380 +#: ../geanyinsertnum/src/insertnum.c:397 msgid "Padding:" msgstr "Enchimento:" -#: ../geanyinsertnum/src/insertnum.c:382 +#: ../geanyinsertnum/src/insertnum.c:399 msgid "Sp_ace" msgstr "Esp_aço" -#: ../geanyinsertnum/src/insertnum.c:385 +#: ../geanyinsertnum/src/insertnum.c:402 msgid "_Zero" msgstr "_Zero" -#: ../geanyinsertnum/src/insertnum.c:454 +#: ../geanyinsertnum/src/insertnum.c:477 msgid "Insert _Numbers" msgstr "Inserir _Números" @@ -1970,20 +1998,20 @@ msgid "BibTeX reference name:" msgstr "Nome da referência BibTeX:" -#: ../geanylatex/src/geanylatex.c:1680 +#: ../geanylatex/src/geanylatex.c:1679 msgid "Dear Sir or Madame" msgstr "Caro Senhor ou Senhora" -#: ../geanylatex/src/geanylatex.c:1681 +#: ../geanylatex/src/geanylatex.c:1680 msgid "With kind regards" msgstr "Melhores Cumprimentos" -#: ../geanylatex/src/geanylatex.c:1689 +#: ../geanylatex/src/geanylatex.c:1688 msgid "No template assigned. Aborting" msgstr "Nenhum modelo atribuído. A abortar" #. Building the wizard-dialog and showing it -#: ../geanylatex/src/geanylatex.c:1716 +#: ../geanylatex/src/geanylatex.c:1715 msgid "LaTeX-Wizard" msgstr "Assistente-LaTeX" @@ -1991,67 +2019,67 @@ #. * Adds custom templates if there are any. If there are none just #. * adds default one #. TEMPLATE FILE -#: ../geanylatex/src/geanylatex.c:1731 ../markdown/src/conf.c:666 +#: ../geanylatex/src/geanylatex.c:1730 ../markdown/src/conf.c:659 msgid "Template:" msgstr "Modelo:" -#: ../geanylatex/src/geanylatex.c:1735 +#: ../geanylatex/src/geanylatex.c:1734 msgid "Set the template which should be used for creating the new document" msgstr "Definir o modelo que deve ser usado na criação de um novo documento" -#: ../geanylatex/src/geanylatex.c:1744 +#: ../geanylatex/src/geanylatex.c:1743 msgid "Default" msgstr "Por Defeito" #. Documentclass -#: ../geanylatex/src/geanylatex.c:1755 +#: ../geanylatex/src/geanylatex.c:1754 msgid "Documentclass:" msgstr "Tipo de Documento:" -#: ../geanylatex/src/geanylatex.c:1758 +#: ../geanylatex/src/geanylatex.c:1757 msgid "Choose the kind of document you want to write" msgstr "Escolha o tipo de documento que pretende escrever" -#: ../geanylatex/src/geanylatex.c:1762 +#: ../geanylatex/src/geanylatex.c:1761 msgid "Article" msgstr "Artigo" -#: ../geanylatex/src/geanylatex.c:1764 +#: ../geanylatex/src/geanylatex.c:1763 msgid "Report" msgstr "Relatório" -#: ../geanylatex/src/geanylatex.c:1766 +#: ../geanylatex/src/geanylatex.c:1765 msgid "Letter" msgstr "Carta" -#: ../geanylatex/src/geanylatex.c:1768 +#: ../geanylatex/src/geanylatex.c:1767 msgid "Presentation" msgstr "Apresentação" #. Encoding -#: ../geanylatex/src/geanylatex.c:1778 +#: ../geanylatex/src/geanylatex.c:1777 msgid "Encoding:" msgstr "Codificação: " -#: ../geanylatex/src/geanylatex.c:1782 +#: ../geanylatex/src/geanylatex.c:1781 msgid "Set the encoding for your new document" msgstr "Defina a codificação para o novo documento" #. fontsize -#: ../geanylatex/src/geanylatex.c:1798 +#: ../geanylatex/src/geanylatex.c:1797 msgid "Font size" msgstr "Tamanho de Letra" -#: ../geanylatex/src/geanylatex.c:1804 +#: ../geanylatex/src/geanylatex.c:1803 msgid "Set the default font size of your new document" msgstr "Defina o tamanho de letra, por omissão, para o novo documento" #. Author -#: ../geanylatex/src/geanylatex.c:1816 +#: ../geanylatex/src/geanylatex.c:1815 msgid "Author:" msgstr "Autor:" -#: ../geanylatex/src/geanylatex.c:1819 +#: ../geanylatex/src/geanylatex.c:1818 msgid "" "Sets the value of the \\author command. In most cases this should be your " "name" @@ -2060,11 +2088,11 @@ "nome" #. Date -#: ../geanylatex/src/geanylatex.c:1833 +#: ../geanylatex/src/geanylatex.c:1832 msgid "Date:" msgstr "Data:" -#: ../geanylatex/src/geanylatex.c:1836 +#: ../geanylatex/src/geanylatex.c:1835 msgid "" "Sets the value of the \\date command inside header of your new created LaTeX-" "document. Keeping it at \\today is a good decision if you don't need any " @@ -2075,37 +2103,37 @@ "necessite de uma data fixa." #. Title of the new document -#: ../geanylatex/src/geanylatex.c:1848 +#: ../geanylatex/src/geanylatex.c:1847 msgid "Title:" msgstr "Título:" -#: ../geanylatex/src/geanylatex.c:1851 +#: ../geanylatex/src/geanylatex.c:1850 msgid "Sets the title of your new document." msgstr "Defina o título do seu novo documento." #. Papersize -#: ../geanylatex/src/geanylatex.c:1860 +#: ../geanylatex/src/geanylatex.c:1859 msgid "Paper size:" msgstr "Tamanho do Papel:" -#: ../geanylatex/src/geanylatex.c:1863 +#: ../geanylatex/src/geanylatex.c:1862 msgid "Choose the paper format for the newly created document" msgstr "Escolha o formato do papel para o seu novo documento" #. Paper direction -#: ../geanylatex/src/geanylatex.c:1876 +#: ../geanylatex/src/geanylatex.c:1875 msgid "Paper Orientation:" msgstr "Orientação do Papel:" -#: ../geanylatex/src/geanylatex.c:1879 +#: ../geanylatex/src/geanylatex.c:1878 msgid "Choose the paper orientation for the newly created document" msgstr "Escolha orientação do papel para o seu novo documento" -#: ../geanylatex/src/geanylatex.c:1900 +#: ../geanylatex/src/geanylatex.c:1899 msgid "Use KOMA-script classes if possible" msgstr "Usar as classes do script KOMA, se possível " -#: ../geanylatex/src/geanylatex.c:1902 +#: ../geanylatex/src/geanylatex.c:1901 msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" "Keep in mind: To compile your document these classes have to be installed " @@ -2115,11 +2143,11 @@ "Note: Para compilar o documento, estas classes têm de estar previamente " "instaladas." -#: ../geanylatex/src/geanylatex.c:1909 +#: ../geanylatex/src/geanylatex.c:1908 msgid "Use draft mode" msgstr "Usar modo de rascunho" -#: ../geanylatex/src/geanylatex.c:1911 +#: ../geanylatex/src/geanylatex.c:1910 msgid "" "Set the draft flag inside new created documents to get documents with a " "number of debugging helpers" @@ -2127,95 +2155,95 @@ "Activa o modo de rascunho em novos documentos para obter maior verbosidade " "na depuração de erros" -#: ../geanylatex/src/geanylatex.c:1928 +#: ../geanylatex/src/geanylatex.c:1927 msgid "Run LaTeX-Wizard" msgstr "Executa o Assistente de LaTeX" -#: ../geanylatex/src/geanylatex.c:1930 +#: ../geanylatex/src/geanylatex.c:1929 msgid "Insert \\label" msgstr "Inserir \\label" -#: ../geanylatex/src/geanylatex.c:1932 +#: ../geanylatex/src/geanylatex.c:1931 msgid "Insert \\ref" msgstr "Inserir \\ref" -#: ../geanylatex/src/geanylatex.c:1934 +#: ../geanylatex/src/geanylatex.c:1933 msgid "Insert linebreak \\\\ " msgstr "Inserir quebra de linha \\\\" -#: ../geanylatex/src/geanylatex.c:1937 +#: ../geanylatex/src/geanylatex.c:1936 msgid "Insert command" msgstr "Inserir comando" -#: ../geanylatex/src/geanylatex.c:1939 +#: ../geanylatex/src/geanylatex.c:1938 msgid "Turn input replacement on/off" msgstr "Activa/Desactiva a substituição de caracteres, ao serem introduzidos" -#: ../geanylatex/src/geanylatex.c:1943 +#: ../geanylatex/src/geanylatex.c:1942 msgid "Replace special characters" msgstr "Substitui caracteres especiais" -#: ../geanylatex/src/geanylatex.c:1946 +#: ../geanylatex/src/geanylatex.c:1945 msgid "Run insert environment dialog" msgstr "Executa o menu de inserção de ambientes" -#: ../geanylatex/src/geanylatex.c:1948 +#: ../geanylatex/src/geanylatex.c:1947 msgid "Insert \\item" msgstr "Inserir \\item" -#: ../geanylatex/src/geanylatex.c:1950 +#: ../geanylatex/src/geanylatex.c:1949 msgid "Format selection in bold font face" msgstr "Formata a selecção como negrito" -#: ../geanylatex/src/geanylatex.c:1952 +#: ../geanylatex/src/geanylatex.c:1951 msgid "Format selection in italic font face" msgstr "Formata a selecção como itálico" -#: ../geanylatex/src/geanylatex.c:1954 +#: ../geanylatex/src/geanylatex.c:1953 msgid "Format selection in typewriter font face" msgstr "Formata a selecção para tipo de letra romana" -#: ../geanylatex/src/geanylatex.c:1956 +#: ../geanylatex/src/geanylatex.c:1955 msgid "Format selection centered" msgstr "Formata a selecção centrando-a" -#: ../geanylatex/src/geanylatex.c:1958 +#: ../geanylatex/src/geanylatex.c:1957 msgid "Format selection left-aligned" msgstr "Formata a selecção alinhando-a à esquerda" -#: ../geanylatex/src/geanylatex.c:1960 +#: ../geanylatex/src/geanylatex.c:1959 msgid "Format selection right-aligned" msgstr "Formata a selecção alinhando-a à direita" -#: ../geanylatex/src/geanylatex.c:1963 +#: ../geanylatex/src/geanylatex.c:1962 msgid "Insert description list" msgstr "Inserir lista de descrição" -#: ../geanylatex/src/geanylatex.c:1966 +#: ../geanylatex/src/geanylatex.c:1965 msgid "Insert itemize list" msgstr "Inserir lista de itens " -#: ../geanylatex/src/geanylatex.c:1969 +#: ../geanylatex/src/geanylatex.c:1968 msgid "Insert enumerate list" msgstr "Inserir lista de enumeração" -#: ../geanylatex/src/geanylatex.c:1972 +#: ../geanylatex/src/geanylatex.c:1971 msgid "Set selection one level up" msgstr "Definir selecção um nível acima" -#: ../geanylatex/src/geanylatex.c:1975 +#: ../geanylatex/src/geanylatex.c:1974 msgid "Set selection one level down" msgstr "Definir selecção um nível abaixo" -#: ../geanylatex/src/geanylatex.c:1978 +#: ../geanylatex/src/geanylatex.c:1977 msgid "Insert \\usepackage{}" msgstr "Inserir \\usepackage{}" -#: ../geanylatex/src/geanylatex.c:1981 +#: ../geanylatex/src/geanylatex.c:1980 msgid "Insert BibTeX reference dialog" msgstr "Inserir janela de referências BibTeX" -#: ../geanylatex/src/geanylatex.c:1988 +#: ../geanylatex/src/geanylatex.c:1987 msgid "" "GeanyLaTeX is a plugin to improve support for LaTeX in Geany.\n" "\n" @@ -2226,7 +2254,7 @@ "Por favor, reporte todas as falhas ou pedidos de funcionalidades a um dos " "autores." -#: ../geanylatex/src/geanylatex.c:2026 +#: ../geanylatex/src/geanylatex.c:2025 msgid "" "glatex_set_autocompletion_contextsize has been initialized with an invalid " "value. Default value taken. Please check your configuration file" @@ -2235,118 +2263,118 @@ "inválido. A usar o valor padrão. Por favor verifique o seu ficheiro de " "configurações" -#: ../geanylatex/src/geanylatex.c:2048 ../geanylatex/src/geanylatex.c:2055 +#: ../geanylatex/src/geanylatex.c:2047 ../geanylatex/src/geanylatex.c:2054 msgid "page \\pageref{{{reference}}}" msgstr "página \\pageref{{{referência}}}" -#: ../geanylatex/src/geanylatex.c:2052 ../geanylatex/src/geanylatex.c:2059 +#: ../geanylatex/src/geanylatex.c:2051 ../geanylatex/src/geanylatex.c:2058 msgid "\\ref{{{reference}}}, page \\pageref{{{reference}}}" msgstr "\\ref{{{referência}}}, pagina \\pageref{{{referência}}}" #. Build up menu for menubar -#: ../geanylatex/src/geanylatex.c:2107 +#: ../geanylatex/src/geanylatex.c:2106 msgid "_LaTeX" msgstr "_LaTeX" #. Filling up menubar menus #. LaTeX menu -#: ../geanylatex/src/geanylatex.c:2116 ../geanylatex/src/geanylatex.c:2328 +#: ../geanylatex/src/geanylatex.c:2115 ../geanylatex/src/geanylatex.c:2327 msgid "LaTeX-_Wizard" msgstr "Assis_tente-LaTeX" -#: ../geanylatex/src/geanylatex.c:2119 ../geanylatex/src/geanylatex.c:2331 +#: ../geanylatex/src/geanylatex.c:2118 ../geanylatex/src/geanylatex.c:2330 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "Inicia um assistente, para facilmente, criar um novo documento " -#: ../geanylatex/src/geanylatex.c:2124 +#: ../geanylatex/src/geanylatex.c:2123 msgid "I_nsert Special Character" msgstr "I_nserir Carácter Especial" -#: ../geanylatex/src/geanylatex.c:2126 +#: ../geanylatex/src/geanylatex.c:2125 msgid "Helps to use some not very common letters and signs" msgstr "Ajuda a usar algumas letras e sinais pouco usuais " -#: ../geanylatex/src/geanylatex.c:2136 +#: ../geanylatex/src/geanylatex.c:2135 msgid "Insert _Reference" msgstr "Inserir _Referência" -#: ../geanylatex/src/geanylatex.c:2138 +#: ../geanylatex/src/geanylatex.c:2137 msgid "Inserting references to the document" msgstr "Insere referências no documento" -#: ../geanylatex/src/geanylatex.c:2143 +#: ../geanylatex/src/geanylatex.c:2142 msgid "Insert _Label" msgstr "Inserir _Etiqueta" -#: ../geanylatex/src/geanylatex.c:2145 +#: ../geanylatex/src/geanylatex.c:2144 msgid "Helps at inserting labels to a document" msgstr "Ajuda a Inserir etiquetas no documento" -#: ../geanylatex/src/geanylatex.c:2151 +#: ../geanylatex/src/geanylatex.c:2150 msgid "Insert _Environment" msgstr "Inserir _Ambiente" -#: ../geanylatex/src/geanylatex.c:2153 +#: ../geanylatex/src/geanylatex.c:2152 msgid "Helps at inserting an environment a document" msgstr "Ajuda a inserir um ambiente no documento" -#: ../geanylatex/src/geanylatex.c:2159 +#: ../geanylatex/src/geanylatex.c:2158 msgid "Insert P_ackage" msgstr "Inserir P_acote" -#: ../geanylatex/src/geanylatex.c:2161 +#: ../geanylatex/src/geanylatex.c:2160 msgid "A small dialog to insert \\usepackage{} into header of current file" msgstr "" "Um pequeno diálogo para inserir \\usepackage{} no cabeçalho do ficheiro " "activo" -#: ../geanylatex/src/geanylatex.c:2166 ../scope/data/scope.glade.h:58 +#: ../geanylatex/src/geanylatex.c:2165 ../scope/data/scope.glade.h:58 msgid "_Format" msgstr "_Formatar" #. Add font size menu -#: ../geanylatex/src/geanylatex.c:2183 +#: ../geanylatex/src/geanylatex.c:2182 msgid "F_ont size" msgstr "Tamanh_o de letra" -#: ../geanylatex/src/geanylatex.c:2201 +#: ../geanylatex/src/geanylatex.c:2200 msgid "_Special Character Replacement" msgstr "_Substituição de Caracteres Especiais" -#: ../geanylatex/src/geanylatex.c:2209 +#: ../geanylatex/src/geanylatex.c:2208 msgid "Bulk _Replace Special Characters" msgstr "Substituição de Caracteres Especiais em _Massa" -#: ../geanylatex/src/geanylatex.c:2211 +#: ../geanylatex/src/geanylatex.c:2210 msgid "_Replace selected special characters with TeX substitutes" msgstr "Substitui os caracteres especiais seleccionados por _expressões do TeX" -#: ../geanylatex/src/geanylatex.c:2219 +#: ../geanylatex/src/geanylatex.c:2218 msgid "Toggle _Special Character Replacement" msgstr "Activa/Desactiva a _Substituição de Caracteres Especiais" -#: ../geanylatex/src/geanylatex.c:2230 +#: ../geanylatex/src/geanylatex.c:2229 msgid "Insert _Command" msgstr "Inserir _Comando" -#: ../geanylatex/src/geanylatex.c:2232 +#: ../geanylatex/src/geanylatex.c:2231 msgid "Inserting costumized command to document" msgstr "Insere um comando personalizado no documento" -#: ../geanylatex/src/geanylatex.c:2257 +#: ../geanylatex/src/geanylatex.c:2256 #, fuzzy msgid "_BibTeX" msgstr "Entradas _BibTeX" -#: ../geanylatex/src/geanylatex.c:2265 +#: ../geanylatex/src/geanylatex.c:2264 msgid "Insert B_ibTeX reference" msgstr "Inserir referência B_ibTeX" -#: ../geanylatex/src/geanylatex.c:2267 +#: ../geanylatex/src/geanylatex.c:2266 msgid "Helps to insert a reference out of BibTeX files" msgstr "Auxilia a inserção de referências a partir de ficheiros BibTeX" -#: ../geanylatex/src/geanylatex.c:2272 +#: ../geanylatex/src/geanylatex.c:2271 msgid "_BibTeX entries" msgstr "Entradas _BibTeX" @@ -2502,16 +2530,16 @@ msgid "Creating dummy text with Geany" msgstr "Criar texto fictício com o Geany." -#: ../geanylipsum/src/geanylipsum.c:86 +#: ../geanylipsum/src/geanylipsum.c:89 msgid "Lipsum-Generator" msgstr "Gerador de Lipsum" -#: ../geanylipsum/src/geanylipsum.c:87 +#: ../geanylipsum/src/geanylipsum.c:90 msgid "Enter the length of Lipsum text here" msgstr "Introduza a dimensão do texto Lipsum aqui" #. Building menu entry -#: ../geanylipsum/src/geanylipsum.c:163 +#: ../geanylipsum/src/geanylipsum.c:164 msgid "_Lipsum" msgstr "_Lipsum" @@ -2649,19 +2677,19 @@ msgid "Browse..." msgstr "Explorar..." -#: ../geanylua/gsdlg.c:175 +#: ../geanylua/gsdlg.c:176 msgid "Select Color" msgstr "Seleccionar Cor" -#: ../geanylua/gsdlg.c:205 +#: ../geanylua/gsdlg.c:207 msgid "Choose..." msgstr "Escolher..." -#: ../geanylua/gsdlg.c:226 +#: ../geanylua/gsdlg.c:228 msgid "Select Font" msgstr "Seleccionar Tipo de Letra" -#: ../geanylua/gsdlg.c:253 +#: ../geanylua/gsdlg.c:255 msgid "Select..." msgstr "Seleccionar..." @@ -2692,7 +2720,7 @@ "Erro no módulo \"%s\" na função %s():\n" "faltam argumentos para o comando \"%s\".\n" -#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:398 +#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:396 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2732,7 +2760,7 @@ msgid "Save file" msgstr "Guardar ficheiro" -#: ../geanylua/glspi_dlg.c:436 +#: ../geanylua/glspi_dlg.c:438 #, c-format msgid "" "Error in module \"%s\" at function pickfile():\n" @@ -2741,7 +2769,7 @@ "Erro no módulo \"%s\" na função pickfile():\n" "incapaz de filtrar a cadeia de caracteres no argumento #3.\n" -#: ../geanylua/glspi_dlg.c:486 +#: ../geanylua/glspi_dlg.c:489 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2787,7 +2815,7 @@ "O plugin %s não carregou correctamente.\n" "Por favor verifique a sua instalação." -#: ../geanylua/glspi_app.c:19 +#: ../geanylua/glspi_app.c:21 #, c-format msgid "" "%s %s: %s\n" @@ -2796,7 +2824,7 @@ "%s %s: %s\n" "Copyright (c) 2007-2010" -#: ../geanylua/glspi_app.c:149 +#: ../geanylua/glspi_app.c:151 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2805,7 +2833,7 @@ "Erro no módulo \"%s\" na função %s():\n" "widget \"%s\" não encontrado para argumento #1.\n" -#: ../geanylua/glspi_app.c:158 +#: ../geanylua/glspi_app.c:160 #, c-format msgid "" "Error in module \"%s\" at function %s() argument #2:\n" @@ -3185,6 +3213,21 @@ "duplicate line" msgstr "" +#: ../geanymacro/src/geanymacro.c:150 +#, fuzzy +msgid "Search for next \"\"" +msgstr "Procurar por:" + +#: ../geanymacro/src/geanymacro.c:151 +#, fuzzy +msgid "Search for previous \"\"" +msgstr "Procurar por:" + +#: ../geanymacro/src/geanymacro.c:152 +#, fuzzy +msgid "Set start of search to beginning of selection" +msgstr "Seleccionar até à linha" + #: ../geanymacro/src/geanymacro.c:181 #, fuzzy msgid "Macros" @@ -3395,13 +3438,13 @@ #. create buttons #: ../geanymacro/src/geanymacro.c:1393 ../geanymacro/src/geanymacro.c:1536 -#: ../geanymacro/src/geanymacro.c:1819 ../geanymacro/src/geanymacro.c:2116 +#: ../geanymacro/src/geanymacro.c:1826 ../geanymacro/src/geanymacro.c:2122 #, fuzzy msgid "_Ok" msgstr "_Ok" #: ../geanymacro/src/geanymacro.c:1394 ../geanymacro/src/geanymacro.c:1537 -#: ../geanymacro/src/geanymacro.c:1820 +#: ../geanymacro/src/geanymacro.c:1827 #, fuzzy msgid "_Cancel" msgstr "Cancelar" @@ -3422,7 +3465,7 @@ msgid "Search for contents of clipboard" msgstr "Copiar directório absoluto para a área de transferência" -#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:92 +#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:101 msgid "Search for:" msgstr "Procurar por:" @@ -3461,59 +3504,59 @@ msgid "Text:" msgstr "Contexto:" -#: ../geanymacro/src/geanymacro.c:1571 ../geanymacro/src/geanymacro.c:1755 +#: ../geanymacro/src/geanymacro.c:1570 ../geanymacro/src/geanymacro.c:1758 #, c-format msgid "Insert/replace with \"%s\"" msgstr "" #. create dialog box -#: ../geanymacro/src/geanymacro.c:1731 +#: ../geanymacro/src/geanymacro.c:1735 #, fuzzy, c-format msgid "Edit: %s" msgstr "Editar Macros" #. add column -#: ../geanymacro/src/geanymacro.c:1794 +#: ../geanymacro/src/geanymacro.c:1801 msgid "Event" msgstr "" #. add buttons -#: ../geanymacro/src/geanymacro.c:1809 +#: ../geanymacro/src/geanymacro.c:1816 msgid "Move _Up" msgstr "" -#: ../geanymacro/src/geanymacro.c:1811 +#: ../geanymacro/src/geanymacro.c:1818 msgid "Move Do_wn" msgstr "" -#: ../geanymacro/src/geanymacro.c:1813 +#: ../geanymacro/src/geanymacro.c:1820 msgid "New _Above" msgstr "" -#: ../geanymacro/src/geanymacro.c:1814 +#: ../geanymacro/src/geanymacro.c:1821 msgid "New _Below" msgstr "" -#: ../geanymacro/src/geanymacro.c:1817 ../geanymacro/src/geanymacro.c:2114 +#: ../geanymacro/src/geanymacro.c:1824 ../geanymacro/src/geanymacro.c:2120 #, fuzzy msgid "_Delete" msgstr "Apagar" #. create dialog box -#: ../geanymacro/src/geanymacro.c:2059 +#: ../geanymacro/src/geanymacro.c:2065 msgid "Edit Macros" msgstr "Editar Macros" -#: ../geanymacro/src/geanymacro.c:2089 +#: ../geanymacro/src/geanymacro.c:2095 msgid "Macro Name" msgstr "Nome da Macro" -#: ../geanymacro/src/geanymacro.c:2095 +#: ../geanymacro/src/geanymacro.c:2101 msgid "Key Trigger" msgstr "Combinação de teclas" #. add buttons -#: ../geanymacro/src/geanymacro.c:2110 +#: ../geanymacro/src/geanymacro.c:2116 #, fuzzy msgid "_Re-Record" msgstr "Regravar" @@ -3533,6 +3576,33 @@ msgid "_Edit Macros" msgstr "_Editar Macros" +#. *< \brief It's the information message about geany mini script +#: ../geanyminiscript/src/gms_gui.c:129 +msgid "" +"GMS : Geany Mini-Script filter Plugin\n" +"This plugin is a tool to apply a script filter on:\n" +" o the text selection,\n" +" o the current document,\n" +" o all documents of the current session.\n" +"\n" +"The filter type can be:\n" +" o Unix shell script,\n" +" o perl script,\n" +" o python script,\n" +" o sed commands,\n" +" o awk script.\n" +"\n" +"AUTHOR\n" +" Written by Pascal BURLOT (December,2008)\n" +"\n" +"LICENSE:\n" +"This program is free software; you can redistribute\n" +"it and/or modify it under the terms of the GNU \n" +"General Public License as published by the Free\n" +"Software Foundation; either version 2 of the License,\n" +"or (at your option) any later version." +msgstr "" + #: ../geanyminiscript/src/gms_gui.c:253 msgid "Load Mini-Script File" msgstr "" @@ -3541,115 +3611,114 @@ msgid "Save Mini-Script File" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:418 +#: ../geanyminiscript/src/gms_gui.c:419 msgid "Mini-Script Filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:446 +#: ../geanyminiscript/src/gms_gui.c:445 msgid "Clear the mini-script window" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:451 +#: ../geanyminiscript/src/gms_gui.c:450 msgid "Load a mini-script into this window" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:456 +#: ../geanyminiscript/src/gms_gui.c:455 msgid "Save the mini-script into a file" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:461 +#: ../geanyminiscript/src/gms_gui.c:460 #, fuzzy msgid "Display a information about the mini-script plugin" msgstr "Apresentar informação adicional sobre o item seleccionado." -#: ../geanyminiscript/src/gms_gui.c:469 +#: ../geanyminiscript/src/gms_gui.c:468 msgid "select the mini-script type" msgstr "" #. Hbox : Radio bouttons for choosing the input: #. * selection/current document/all documents of the current session -#: ../geanyminiscript/src/gms_gui.c:500 +#: ../geanyminiscript/src/gms_gui.c:499 msgid "filter input" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:502 +#: ../geanyminiscript/src/gms_gui.c:501 msgid "select the input of mini-script filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:508 +#: ../geanyminiscript/src/gms_gui.c:507 #, fuzzy msgid "selection" msgstr "Seleccionar Tipo de Letra" -#: ../geanyminiscript/src/gms_gui.c:509 +#: ../geanyminiscript/src/gms_gui.c:508 #, fuzzy msgid "document" msgstr "E_mail o documento" -#: ../geanyminiscript/src/gms_gui.c:510 +#: ../geanyminiscript/src/gms_gui.c:509 msgid "session" msgstr "" #. Hbox : Radio bouttons for choosing the output: #. * current document/ or new document -#: ../geanyminiscript/src/gms_gui.c:519 +#: ../geanyminiscript/src/gms_gui.c:518 msgid "filter output" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:521 +#: ../geanyminiscript/src/gms_gui.c:520 msgid "select the output of mini-script filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:527 +#: ../geanyminiscript/src/gms_gui.c:526 msgid "Current Doc." msgstr "" -#: ../geanyminiscript/src/gms_gui.c:528 +#: ../geanyminiscript/src/gms_gui.c:527 #, fuzzy msgid "New Doc." msgstr "Novo Projecto" -#: ../geanyminiscript/src/gms_gui.c:749 +#: ../geanyminiscript/src/gms_gui.c:748 #, fuzzy msgid "script configuration" msgstr "Incapaz de ler configuração: %s" -#. All plugins must set name, description, version and author. #: ../geanyminiscript/src/gms.c:58 #, fuzzy msgid "Mini Script" msgstr "Script Lua" -#: ../geanyminiscript/src/gms.c:58 +#: ../geanyminiscript/src/gms.c:59 msgid "" "A tool to apply a script filter on a text selection or current document(s)" msgstr "" -#: ../geanyminiscript/src/gms.c:59 +#: ../geanyminiscript/src/gms.c:60 msgid "Pascal BURLOT, a Geany user" msgstr "" #. Add an item to the Tools menu -#: ../geanyminiscript/src/gms.c:278 +#: ../geanyminiscript/src/gms.c:249 msgid "_Mini-Script" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:58 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:61 msgid "Numbered Bookmarks for Geany" msgstr "Favoritos Numerados para o Geany" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:923 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:927 #, c-format msgid "Unable to apply all markers to '%s' as all being used." msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:925 -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:969 -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1392 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:929 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:973 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1396 msgid "_Okay" msgstr "_Ok" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:967 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:971 #, c-format msgid "" "'%s' has been edited since it was last saved by geany. Marker positions may " @@ -3660,54 +3729,54 @@ "posição podem estar incorretos e não serão carregados.\n" "Clique Ignorar para os carregar na mesma." -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:970 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:974 msgid "_Ignore" msgstr "_Ignorar" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1215 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1219 msgid "remember fold state" msgstr "lembrar o estado da agregação" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1221 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1225 msgid "Center view when goto bookmark" msgstr "Centrar vista ao ir para um favorito" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1228 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1232 #, fuzzy msgid "Move to start of line" msgstr "Converter o selecionado numa tabela" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1229 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1233 msgid "Move to remembered position in line" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1230 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1234 msgid "Move to position in current line" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1231 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1235 #, fuzzy msgid "Move to End of line" msgstr "Converter o selecionado numa tabela" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1237 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1241 msgid "Save file settings with program settings" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1238 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1242 msgid "Save file settings to filename with suffix" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1243 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1247 msgid "remember normal Bookmarks" msgstr "" #. create dialog box -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1263 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1267 msgid "Numbered Bookmarks help" msgstr "Ajuda dos Favoritos Numerados" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1270 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1274 msgid "" "This Plugin implements Numbered Bookmarks in Geany, as well as remembering " "the state of folds, and positions of standard non-numbered bookmarks when a " @@ -3723,7 +3792,7 @@ "previously set bookmark, press Ctrl+a number from 0 to 9." msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1391 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1395 msgid "Unable to apply markers as all being used." msgstr "" @@ -3804,36 +3873,36 @@ msgstr "Selecionar assinante" #. shouldn't get here -#: ../geanypg/src/pinentry.c:107 +#: ../geanypg/src/pinentry.c:111 msgid "Could not use pinentry." msgstr "Incapaz de usar o comando pinentry." -#: ../geanypg/src/pinentry.c:119 +#: ../geanypg/src/pinentry.c:123 msgid "Unexpected output from pinentry." msgstr "O comando pinentry retornou um resultado inesperado." #. read the rest of the first line after OK -#: ../geanypg/src/pinentry.c:127 +#: ../geanypg/src/pinentry.c:131 msgid "Passphrase entry" msgstr "Introduzir Frase-Senha" -#: ../geanypg/src/pinentry.c:131 +#: ../geanypg/src/pinentry.c:135 msgid "Passphrase" msgstr "Frase-Senha" -#: ../geanypg/src/pinentry.c:136 +#: ../geanypg/src/pinentry.c:140 msgid "Enter passphrase for" msgstr "Introduzir Frase-Senha para" -#: ../geanypg/src/pinentry.c:167 +#: ../geanypg/src/pinentry.c:171 msgid "pinentry gave error" msgstr "o comando pinentry deu erro" -#: ../geanypg/src/pinentry.c:170 +#: ../geanypg/src/pinentry.c:174 msgid "Unexpected error from pinentry." msgstr "O comando pinentry deu um erro inesperado." -#: ../geanypg/src/pinentry.c:195 +#: ../geanypg/src/pinentry.c:199 msgid "" "Error, Passphrase input without using gpg-agent is not supported on Windows " "yet." @@ -3845,8 +3914,8 @@ msgid "a key with fingerprint" msgstr "uma chave com fingerprint" -#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:522 -#: ../spellcheck/src/gui.c:533 +#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:527 +#: ../spellcheck/src/gui.c:538 msgid "unknown" msgstr "desconhecido" @@ -4013,7 +4082,7 @@ msgstr "Abrir ficheiro de assinatura" #: ../geanyprj/src/geanyprj.c:38 ../geanyprj/src/sidebar.c:456 -#: ../gproject/src/gproject-sidebar.c:822 +#: ../gproject/src/gproject-sidebar.c:870 msgid "Project" msgstr "Projecto" @@ -4043,7 +4112,7 @@ msgid "C_reate" msgstr "C_riar" -#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:116 +#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:114 msgid "Name:" msgstr "Nome:" @@ -4121,7 +4190,7 @@ msgid "Remove File" msgstr "Remover Ficheiro" -#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:803 +#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:849 msgid "H_ide Sidebar" msgstr "Esconder Barra _Lateral" @@ -4130,6 +4199,50 @@ msgid "Project \"%s\" opened." msgstr "Projecto \"%s\" aberto." +#: ../geanypy/src/geanypy-plugin.c:34 +#, fuzzy +msgid "GeanyPy" +msgstr "GeanyVC" + +#: ../geanypy/src/geanypy-plugin.c:35 +msgid "Python plugins support" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:77 +#, fuzzy, c-format +msgid "Unable to pre-load Python library: %s." +msgstr "Incapaz de criar o directório de configuração em '%s'" + +#: ../geanypy/src/geanypy-plugin.c:157 +msgid "Failed to import manager module" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:166 +msgid "Failed to retrieve PluginManager from manager module" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:182 +#, fuzzy +msgid "System plugin directory not found." +msgstr "directório temporário do tty não encontrado!\n" + +#: ../geanypy/src/geanypy-plugin.c:211 +msgid "Unable to instantiate new PluginManager" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:227 +msgid "Unable to get show_all() method on plugin manager" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:255 +#, fuzzy, c-format +msgid "Unable to create Python plugins directory: %s: %s" +msgstr "Incapaz de criar o directório de configuração em '%s'" + +#: ../geanypy/src/geanypy-plugin.c:266 +msgid "Python Plugin Manager" +msgstr "" + #: ../geanysendmail/src/geanysendmail.c:43 msgid "GeanySendMail" msgstr "GeanyEnviaEmail" @@ -4150,13 +4263,13 @@ msgid "Enter the recipient's e-mail address:" msgstr "Introduza o endereço de email de destino:" -#: ../geanysendmail/src/geanysendmail.c:136 +#: ../geanysendmail/src/geanysendmail.c:138 msgid "Filename placeholder not found. The executed command might have failed." msgstr "" "O espaço reservado para o nome do ficheiro não encontrado. O comando " "executado pode ter falhado." -#: ../geanysendmail/src/geanysendmail.c:142 +#: ../geanysendmail/src/geanysendmail.c:144 msgid "" "Recipient address placeholder not found. The executed command might have " "failed." @@ -4164,34 +4277,34 @@ "O espaço reservado para o endereço de email de destino não encontrado. O " "comando executado pode ter falhado." -#: ../geanysendmail/src/geanysendmail.c:157 +#: ../geanysendmail/src/geanysendmail.c:159 msgid "Could not execute mailer. Please check your configuration." msgstr "" "Incapaz de executar a aplicação de Email. Por favor, verifique a " "configuração." -#: ../geanysendmail/src/geanysendmail.c:166 +#: ../geanysendmail/src/geanysendmail.c:168 msgid "Please define a mail client first." msgstr "Defina uma aplicação de Email primeiro, se faz favor." -#: ../geanysendmail/src/geanysendmail.c:171 +#: ../geanysendmail/src/geanysendmail.c:173 msgid "File has to be saved before sending." msgstr "O ficheiro tem de ser guardado antes de ser enviado." -#: ../geanysendmail/src/geanysendmail.c:187 +#: ../geanysendmail/src/geanysendmail.c:191 msgid "Mail" msgstr "Mail" -#: ../geanysendmail/src/geanysendmail.c:218 +#: ../geanysendmail/src/geanysendmail.c:222 msgid "Send by mail" msgstr "Enviar por email" #. add a label and a text entry to the dialog -#: ../geanysendmail/src/geanysendmail.c:308 +#: ../geanysendmail/src/geanysendmail.c:312 msgid "Path and options for the mail client:" msgstr "Directório e opções para a aplicação de email:" -#: ../geanysendmail/src/geanysendmail.c:316 +#: ../geanysendmail/src/geanysendmail.c:320 #, fuzzy msgid "" "Note: \n" @@ -4210,29 +4323,29 @@ "\tsylpheed --attach \"\\%f\" --compose \"\\%r\"\n" "\tmutt -s \"Sending '\\%b'\" -a \"\\%f\" \"\\%r\"" -#: ../geanysendmail/src/geanysendmail.c:326 +#: ../geanysendmail/src/geanysendmail.c:330 msgid "Show toolbar icon" msgstr "Mostrar ícone da barra de ferramentas" -#: ../geanysendmail/src/geanysendmail.c:328 +#: ../geanysendmail/src/geanysendmail.c:332 msgid "Shows a icon in the toolbar to send file more easy." msgstr "" "Mostra um ícone na barra de ferramentas para facilitar o envio de ficheiros." -#: ../geanysendmail/src/geanysendmail.c:334 +#: ../geanysendmail/src/geanysendmail.c:338 msgid "Use dialog for entering email address of recipients" msgstr "Usar a janela para introduzir os endereços de email de destino" -#: ../geanysendmail/src/geanysendmail.c:356 +#: ../geanysendmail/src/geanysendmail.c:360 msgid "Send file by mail" msgstr "Enviar ficheiro por email" #. Build up menu entry -#: ../geanysendmail/src/geanysendmail.c:379 +#: ../geanysendmail/src/geanysendmail.c:383 msgid "_Mail document" msgstr "E_mail o documento" -#: ../geanysendmail/src/geanysendmail.c:382 +#: ../geanysendmail/src/geanysendmail.c:386 msgid "" "Sends the opened file as unzipped attachment by any mailer from your $PATH" msgstr "" @@ -4252,76 +4365,95 @@ msgid "geanyvc: s_spawn_sync error: %s" msgstr "geanyvc: erro s_spawn_sync: %s" -#: ../geanyvc/src/geanyvc.c:609 ../geanyvc/src/geanyvc.c:620 +#: ../geanyvc/src/geanyvc.c:561 +#, c-format +msgid "File %s: action %s executed via %s." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:614 ../geanyvc/src/geanyvc.c:625 #, c-format msgid "geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'" msgstr "geanyvc: vcdiff_file_activated: Incapaz de renomear '%s' to '%s'" -#: ../geanyvc/src/geanyvc.c:646 ../geanyvc/src/geanyvc.c:696 +#: ../geanyvc/src/geanyvc.c:651 ../geanyvc/src/geanyvc.c:701 msgid "No changes were made." msgstr "Não foram efectuadas quaisquer alterações." -#: ../geanyvc/src/geanyvc.c:723 +#: ../geanyvc/src/geanyvc.c:728 msgid "No history available" msgstr "Nenhum histórico disponível" -#: ../geanyvc/src/geanyvc.c:916 ../geanyvc/src/geanyvc.c:924 +#: ../geanyvc/src/geanyvc.c:921 ../geanyvc/src/geanyvc.c:929 #, c-format msgid "Do you really want to revert: %s?" msgstr "Tem a certeza de que pretende reverter: %s?" -#: ../geanyvc/src/geanyvc.c:932 +#: ../geanyvc/src/geanyvc.c:937 #, c-format msgid "Do you really want to add: %s?" msgstr "Tem a certeza de que pretende adicionar: %s?" -#: ../geanyvc/src/geanyvc.c:939 +#: ../geanyvc/src/geanyvc.c:944 #, c-format msgid "Do you really want to remove: %s?" msgstr "Tem a certeza de que pretende remover: %s?" -#: ../geanyvc/src/geanyvc.c:962 +#: ../geanyvc/src/geanyvc.c:967 msgid "Do you really want to update?" msgstr "Tem a certeza de que pretende actualizar?" -#: ../geanyvc/src/geanyvc.c:1225 +#: ../geanyvc/src/geanyvc.c:1094 +msgid "" +"The resulting differences cannot be displayed because the changes are too " +"big to display here and would slow down the UI significantly.\n" +"\n" +"To view the differences, cancel this dialog and open the differences in " +"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:1243 msgid "Commit Y/N" msgstr "Submeter Y/N" -#: ../geanyvc/src/geanyvc.c:1235 +#: ../geanyvc/src/geanyvc.c:1253 msgid "Status" msgstr "Estado" -#: ../geanyvc/src/geanyvc.c:1242 +#: ../geanyvc/src/geanyvc.c:1260 msgid "Path" msgstr "Directório" -#: ../geanyvc/src/geanyvc.c:1330 +#: ../geanyvc/src/geanyvc.c:1324 +#, c-format +msgid "Line: %d Column: %d" +msgstr "" + +#: ../geanyvc/src/geanyvc.c:1370 msgid "Commit" msgstr "Submeter" -#: ../geanyvc/src/geanyvc.c:1372 +#: ../geanyvc/src/geanyvc.c:1412 msgid "_De-/select all files" msgstr "_Des-/seleccionar todos os ficheiros" -#: ../geanyvc/src/geanyvc.c:1413 +#: ../geanyvc/src/geanyvc.c:1456 msgid "Commit message:" msgstr "Mensagem de submissão:" -#: ../geanyvc/src/geanyvc.c:1426 +#: ../geanyvc/src/geanyvc.c:1475 msgid "C_ommit" msgstr "_Submeter" -#: ../geanyvc/src/geanyvc.c:1500 +#: ../geanyvc/src/geanyvc.c:1556 msgid "Nothing to commit." msgstr "Nada para submeter." -#: ../geanyvc/src/geanyvc.c:1546 +#: ../geanyvc/src/geanyvc.c:1602 #, c-format msgid "Error initializing spell checking: %s" msgstr "Falha ao inicializar a correcção ortográfica: %s" -#: ../geanyvc/src/geanyvc.c:1558 +#: ../geanyvc/src/geanyvc.c:1614 #, c-format msgid "" "Error while setting up language for spellchecking. Please check " @@ -4330,13 +4462,13 @@ "Falha ao definir a linguagem para a correcção ortográfica. Por favor " "verifique a configuração. A mensagem de erro obtida foi: %s" -#: ../geanyvc/src/geanyvc.c:1834 +#: ../geanyvc/src/geanyvc.c:1890 msgid "Set Changed-flag for document tabs created by the plugin" msgstr "" "Habilitar a indicação de Modificado nas abas dos documentos criados pelo " "plugin" -#: ../geanyvc/src/geanyvc.c:1837 +#: ../geanyvc/src/geanyvc.c:1893 msgid "" "If this option is activated, every new by the VC-plugin created document tab " "will be marked as changed. Even this option is useful in some cases, it " @@ -4347,260 +4479,260 @@ "alguns casos pode gerar um elevado número de, irritantes, janelas \"Tem a " "certeza de que quer guardar\" " -#: ../geanyvc/src/geanyvc.c:1845 +#: ../geanyvc/src/geanyvc.c:1901 msgid "Confirm adding new files to a VCS" msgstr "Confirmar o adicionar de novos ficheiros a um SCV" -#: ../geanyvc/src/geanyvc.c:1848 +#: ../geanyvc/src/geanyvc.c:1904 msgid "Shows a confirmation dialog on adding a new (created) file to VCS." msgstr "" "Mostra uma janela de confirmação sempre que adicionar um novo (criado) " "ficheiro ao SCV." -#: ../geanyvc/src/geanyvc.c:1854 +#: ../geanyvc/src/geanyvc.c:1910 msgid "Maximize commit dialog" msgstr "Maximizar janela de submissão" -#: ../geanyvc/src/geanyvc.c:1855 +#: ../geanyvc/src/geanyvc.c:1911 msgid "Show commit dialog maximize." msgstr "Mostra a janela de submissão maximizada." -#: ../geanyvc/src/geanyvc.c:1861 +#: ../geanyvc/src/geanyvc.c:1917 msgid "Use external diff viewer" msgstr "Usar aplicação de diferenças externa" -#: ../geanyvc/src/geanyvc.c:1863 +#: ../geanyvc/src/geanyvc.c:1919 msgid "Use external diff viewer for file diff." msgstr "" "Usar uma aplicação de diferenças externa para a função de diferenças (diff)." -#: ../geanyvc/src/geanyvc.c:1869 +#: ../geanyvc/src/geanyvc.c:1925 msgid "Show VC entries at editor menu" msgstr "Mostrar elementos do VC no menu do editor" -#: ../geanyvc/src/geanyvc.c:1871 +#: ../geanyvc/src/geanyvc.c:1927 msgid "Show entries for VC functions inside editor menu" msgstr "Mostra elementos das funções do VC dentro do menu do editor" -#: ../geanyvc/src/geanyvc.c:1876 +#: ../geanyvc/src/geanyvc.c:1932 msgid "Attach menu to menubar" msgstr "" -#: ../geanyvc/src/geanyvc.c:1878 +#: ../geanyvc/src/geanyvc.c:1934 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " "directly inside Geany's menubar.Will take in account after next start of " "GeanyVC" msgstr "" -#: ../geanyvc/src/geanyvc.c:1886 +#: ../geanyvc/src/geanyvc.c:1942 msgid "Enable CVS" msgstr "Habilitar CVS" -#: ../geanyvc/src/geanyvc.c:1891 +#: ../geanyvc/src/geanyvc.c:1947 msgid "Enable GIT" msgstr "Habilitar GIT" -#: ../geanyvc/src/geanyvc.c:1896 +#: ../geanyvc/src/geanyvc.c:1952 msgid "Enable SVN" msgstr "Habilitar SVN" -#: ../geanyvc/src/geanyvc.c:1901 +#: ../geanyvc/src/geanyvc.c:1957 msgid "Enable SVK" msgstr "Habilitar SVK" -#: ../geanyvc/src/geanyvc.c:1906 +#: ../geanyvc/src/geanyvc.c:1962 msgid "Enable Bazaar" msgstr "Habilitar Bazaar" -#: ../geanyvc/src/geanyvc.c:1911 +#: ../geanyvc/src/geanyvc.c:1967 msgid "Enable Mercurial" msgstr "Habilitar Mercurial" -#: ../geanyvc/src/geanyvc.c:1917 +#: ../geanyvc/src/geanyvc.c:1973 msgid "Spellcheck language" msgstr "Língua para correcção ortográfica" -#: ../geanyvc/src/geanyvc.c:2008 +#: ../geanyvc/src/geanyvc.c:2064 msgid "_VC file Actions" msgstr "_VC Acções sobre ficheiros" #. Diff of current file #. Diff of the current dir #. Complete diff of base directory -#: ../geanyvc/src/geanyvc.c:2014 ../geanyvc/src/geanyvc.c:2091 -#: ../geanyvc/src/geanyvc.c:2131 +#: ../geanyvc/src/geanyvc.c:2070 ../geanyvc/src/geanyvc.c:2147 +#: ../geanyvc/src/geanyvc.c:2187 msgid "_Diff" msgstr "_Diferenças" -#: ../geanyvc/src/geanyvc.c:2017 +#: ../geanyvc/src/geanyvc.c:2073 msgid "Make a diff from the current active file" msgstr "Inicia uma comparação de diferenças no ficheiro activo" #. Revert current file #. Revert current dir #. Revert everything -#: ../geanyvc/src/geanyvc.c:2022 ../geanyvc/src/geanyvc.c:2100 -#: ../geanyvc/src/geanyvc.c:2139 +#: ../geanyvc/src/geanyvc.c:2078 ../geanyvc/src/geanyvc.c:2156 +#: ../geanyvc/src/geanyvc.c:2195 msgid "_Revert" msgstr "_Reverter" -#: ../geanyvc/src/geanyvc.c:2025 +#: ../geanyvc/src/geanyvc.c:2081 msgid "Restore pristine working copy file (undo local edits)." msgstr "" "Restaurar a antiga cópia funcional do ficheiro (descarta alterações locais)." #. Blame for current file -#: ../geanyvc/src/geanyvc.c:2034 +#: ../geanyvc/src/geanyvc.c:2090 msgid "_Blame" msgstr "_Culpar" -#: ../geanyvc/src/geanyvc.c:2037 +#: ../geanyvc/src/geanyvc.c:2093 msgid "Shows the changes made at one file per revision and author." msgstr "Mostra as alterações realizadas a um ficheiro por revisão e autor." #. History/log of current file #. History/log of the current dir #. Complete History/Log of base directory -#: ../geanyvc/src/geanyvc.c:2044 ../geanyvc/src/geanyvc.c:2110 -#: ../geanyvc/src/geanyvc.c:2151 +#: ../geanyvc/src/geanyvc.c:2100 ../geanyvc/src/geanyvc.c:2166 +#: ../geanyvc/src/geanyvc.c:2207 msgid "_History (log)" msgstr "_Histórico (log)" -#: ../geanyvc/src/geanyvc.c:2047 +#: ../geanyvc/src/geanyvc.c:2103 msgid "Shows the log of the current file" msgstr "Mostra o histórico do ficheiro activo" #. base version of the current file -#: ../geanyvc/src/geanyvc.c:2052 +#: ../geanyvc/src/geanyvc.c:2108 msgid "_Original" msgstr "_Original" -#: ../geanyvc/src/geanyvc.c:2055 +#: ../geanyvc/src/geanyvc.c:2111 msgid "Shows the original of the current file" msgstr "Mostra o original do ficheiro ativo" #. add current file -#: ../geanyvc/src/geanyvc.c:2063 +#: ../geanyvc/src/geanyvc.c:2119 msgid "_Add to Version Control" msgstr "_Adicionar ao Controlo de Versões" -#: ../geanyvc/src/geanyvc.c:2065 +#: ../geanyvc/src/geanyvc.c:2121 msgid "Add file to repository." msgstr "Adiciona o ficheiro ao repositório." #. remove current file -#: ../geanyvc/src/geanyvc.c:2071 +#: ../geanyvc/src/geanyvc.c:2127 msgid "_Remove from Version Control" msgstr "_Remover do Controlo de Versões" -#: ../geanyvc/src/geanyvc.c:2073 +#: ../geanyvc/src/geanyvc.c:2129 msgid "Remove file from repository." msgstr "Remove o ficheiro do repositório." -#: ../geanyvc/src/geanyvc.c:2088 +#: ../geanyvc/src/geanyvc.c:2144 msgid "_Directory" msgstr "_Directório" -#: ../geanyvc/src/geanyvc.c:2094 +#: ../geanyvc/src/geanyvc.c:2150 msgid "Make a diff from the directory of the current active file" msgstr "Inicia uma comparação de diferenças no directório do ficheiro activo" -#: ../geanyvc/src/geanyvc.c:2103 +#: ../geanyvc/src/geanyvc.c:2159 msgid "Restore original files in the current folder (undo local edits)." msgstr "" "Restaura os ficheiros originais no directório actual (descarta alterações " "locais)." -#: ../geanyvc/src/geanyvc.c:2113 +#: ../geanyvc/src/geanyvc.c:2169 msgid "Shows the log of the current directory" msgstr "Mostra o histórico (log) do directório actual" -#: ../geanyvc/src/geanyvc.c:2127 +#: ../geanyvc/src/geanyvc.c:2183 msgid "_Base Directory" msgstr "Directório _Base" -#: ../geanyvc/src/geanyvc.c:2133 +#: ../geanyvc/src/geanyvc.c:2189 msgid "Make a diff from the top VC directory" msgstr "" "Inicia uma comparação de diferenças a partir do primeiro directório do VC" -#: ../geanyvc/src/geanyvc.c:2141 +#: ../geanyvc/src/geanyvc.c:2197 msgid "Revert any local edits." msgstr "Restaura quaisquer alterações locais." -#: ../geanyvc/src/geanyvc.c:2154 +#: ../geanyvc/src/geanyvc.c:2210 msgid "Shows the log of the top VC directory" msgstr "Mostra o histórico (log) do primeiro directório do VC" -#: ../geanyvc/src/geanyvc.c:2180 +#: ../geanyvc/src/geanyvc.c:2236 msgid "VC _Commit" msgstr "VC _Submeter" -#: ../geanyvc/src/geanyvc.c:2215 +#: ../geanyvc/src/geanyvc.c:2271 msgid "Show diff of file" msgstr "Mostrar diferenças do ficheiro" -#: ../geanyvc/src/geanyvc.c:2217 +#: ../geanyvc/src/geanyvc.c:2273 msgid "Show diff of directory" msgstr "Mostrar diferenças do directório" -#: ../geanyvc/src/geanyvc.c:2219 +#: ../geanyvc/src/geanyvc.c:2275 msgid "Show diff of basedir" msgstr "Mostrar diferenças do directório base" -#: ../geanyvc/src/geanyvc.c:2222 +#: ../geanyvc/src/geanyvc.c:2278 msgid "Commit changes" msgstr "Submeter alterações" -#: ../geanyvc/src/geanyvc.c:2224 +#: ../geanyvc/src/geanyvc.c:2280 msgid "Show status" msgstr "Mostrar estado" -#: ../geanyvc/src/geanyvc.c:2226 +#: ../geanyvc/src/geanyvc.c:2282 msgid "Revert single file" msgstr "Restaurar ficheiro único" -#: ../geanyvc/src/geanyvc.c:2228 +#: ../geanyvc/src/geanyvc.c:2284 msgid "Revert directory" msgstr "Restaurar directório" -#: ../geanyvc/src/geanyvc.c:2230 +#: ../geanyvc/src/geanyvc.c:2286 msgid "Revert base directory" msgstr "Restaurar directório base" -#: ../geanyvc/src/geanyvc.c:2232 +#: ../geanyvc/src/geanyvc.c:2288 msgid "Update file" msgstr "Actualizar ficheiro" -#: ../geanyvc/src/geanyvc.c:2260 +#: ../geanyvc/src/geanyvc.c:2316 msgid "_VC" msgstr "_VC" -#: ../geanyvc/src/geanyvc.c:2266 +#: ../geanyvc/src/geanyvc.c:2322 #, fuzzy msgid "_Version Control" msgstr "_Adicionar ao Controlo de Versões" #. Status of basedir -#: ../geanyvc/src/geanyvc.c:2288 +#: ../geanyvc/src/geanyvc.c:2344 msgid "_Status" msgstr "E_stado" -#: ../geanyvc/src/geanyvc.c:2290 +#: ../geanyvc/src/geanyvc.c:2346 msgid "Show status." msgstr "Mostra o estado." -#: ../geanyvc/src/geanyvc.c:2297 +#: ../geanyvc/src/geanyvc.c:2353 msgid "Update from remote repository." msgstr "Actualizar a partir de repositório remoto." #. Commit all changes -#: ../geanyvc/src/geanyvc.c:2302 +#: ../geanyvc/src/geanyvc.c:2358 msgid "_Commit" msgstr "_Submeter" -#: ../geanyvc/src/geanyvc.c:2304 +#: ../geanyvc/src/geanyvc.c:2360 msgid "Commit changes." msgstr "Submeter alterações." @@ -4756,99 +4888,256 @@ "Nota: defina padrões para ficheiros pertencentes ao projeto através do menu " "Projeto." -#: ../gproject/src/gproject-sidebar.c:81 -#: ../gproject/src/gproject-sidebar.c:792 +#: ../gproject/src/gproject-sidebar.c:90 +#: ../gproject/src/gproject-sidebar.c:838 msgid "Find File" msgstr "Procurar Ficheiro" -#: ../gproject/src/gproject-sidebar.c:108 +#: ../gproject/src/gproject-sidebar.c:117 msgid "Search inside:" msgstr "Procurar dentro:" -#: ../gproject/src/gproject-sidebar.c:120 +#: ../gproject/src/gproject-sidebar.c:129 msgid "C_ase sensitive" msgstr "Distinguir m_aiúsculas/minúsculas" -#: ../gproject/src/gproject-sidebar.c:123 +#: ../gproject/src/gproject-sidebar.c:132 msgid "Search in full path" msgstr "Procurar em directório absoluto" -#: ../gproject/src/gproject-sidebar.c:702 +#: ../gproject/src/gproject-sidebar.c:745 msgid "Reload all" msgstr "Reler todos" -#: ../gproject/src/gproject-sidebar.c:711 -#: ../treebrowser/src/treebrowser.c:1282 +#: ../gproject/src/gproject-sidebar.c:754 +#: ../treebrowser/src/treebrowser.c:1281 msgid "Expand all" msgstr "Expandir Tudo" -#: ../gproject/src/gproject-sidebar.c:717 -#: ../treebrowser/src/treebrowser.c:1286 +#: ../gproject/src/gproject-sidebar.c:761 +#: ../treebrowser/src/treebrowser.c:1285 msgid "Collapse all" msgstr "Compactar Tudo" -#: ../gproject/src/gproject-sidebar.c:726 +#: ../gproject/src/gproject-sidebar.c:771 msgid "Follow active editor" msgstr "Seguir o editor ativo" -#: ../gproject/src/gproject-sidebar.c:774 +#: ../gproject/src/gproject-sidebar.c:820 msgid "Expand All" msgstr "Expandir Tudo" -#: ../gproject/src/gproject-sidebar.c:783 -#: ../treebrowser/src/treebrowser.c:1234 +#: ../gproject/src/gproject-sidebar.c:829 msgid "Find in Files" msgstr "Procurar em Ficheiros" #. POSITION OF VIEW -#: ../markdown/src/conf.c:570 +#: ../markdown/src/conf.c:567 #, fuzzy msgid "Position:" msgstr "Condição" -#: ../markdown/src/conf.c:576 +#: ../markdown/src/conf.c:573 #, fuzzy msgid "Sidebar" msgstr "barra lateral" -#: ../markdown/src/conf.c:584 +#: ../markdown/src/conf.c:581 #, fuzzy msgid "Message Window" msgstr "_Ocultar Janela de Mensagens" -#: ../markdown/src/conf.c:598 +#: ../markdown/src/conf.c:595 msgid "Font:" msgstr "" -#: ../markdown/src/conf.c:616 +#: ../markdown/src/conf.c:612 msgid "Code Font:" msgstr "" -#: ../markdown/src/conf.c:634 +#: ../markdown/src/conf.c:629 msgid "BG Color:" msgstr "" -#: ../markdown/src/conf.c:651 +#: ../markdown/src/conf.c:645 msgid "FG Color:" msgstr "" -#: ../markdown/src/conf.c:670 +#: ../markdown/src/conf.c:663 #, fuzzy msgid "Select Template File" msgstr "Seleccionar até à linha" -#: ../markdown/src/plugin.c:33 +#: ../markdown/src/plugin.c:35 msgid "Real-time Markdown preview" msgstr "" -#: ../markdown/src/plugin.c:49 +#: ../markdown/src/plugin.c:51 msgid "Markdown Preview" msgstr "" -#: ../markdown/src/plugin.c:160 +#: ../markdown/src/plugin.c:162 msgid "The current document does not have a Markdown filetype." msgstr "" +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:35 +msgid "Pair Tag Highlighter" +msgstr "" + +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:36 +msgid "Finds and highlights matching opening/closing HTML tag" +msgstr "" + +#: ../pohelper/data/menus.ui.h:1 +msgid "_Translation Helper" +msgstr "" + +#: ../pohelper/data/menus.ui.h:2 +msgid "_Previous String" +msgstr "" + +#: ../pohelper/data/menus.ui.h:3 ../pohelper/src/gph-plugin.c:1031 +#, fuzzy +msgid "Go to previous string" +msgstr "Retorna à janela anterior." + +#: ../pohelper/data/menus.ui.h:4 +msgid "_Next String" +msgstr "" + +#: ../pohelper/data/menus.ui.h:5 ../pohelper/src/gph-plugin.c:1034 +#, fuzzy +msgid "Go to next string" +msgstr "Avançar até à próxima linha." + +#: ../pohelper/data/menus.ui.h:6 +msgid "Pre_vious Untranslated" +msgstr "" + +#: ../pohelper/data/menus.ui.h:7 ../pohelper/src/gph-plugin.c:1037 +msgid "Go to previous untranslated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:8 +msgid "Next _Untranslated" +msgstr "" + +#: ../pohelper/data/menus.ui.h:9 ../pohelper/src/gph-plugin.c:1040 +msgid "Go to next untranslated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:10 +msgid "Previous Fu_zzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:11 ../pohelper/src/gph-plugin.c:1043 +msgid "Go to previous fuzzily translated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:12 +msgid "Next _Fuzzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:13 ../pohelper/src/gph-plugin.c:1046 +msgid "Go to next fuzzily translated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:14 +msgid "Previous Untranslated or Fuzz_y" +msgstr "" + +#: ../pohelper/data/menus.ui.h:15 ../pohelper/src/gph-plugin.c:1049 +msgid "Go to previous untranslated or fuzzy string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:16 +msgid "Next Untranslated _or Fuzzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:17 ../pohelper/src/gph-plugin.c:1053 +msgid "Go to next untranslated or fuzzy string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:18 ../pohelper/src/gph-plugin.c:1064 +#, fuzzy +msgid "Toggle current translation fuzziness" +msgstr "Comutar a aba de documentação" + +#: ../pohelper/data/menus.ui.h:19 +msgid "_Toggle Fuzziness" +msgstr "" + +#: ../pohelper/data/menus.ui.h:20 +msgid "Paste _Message as Translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:21 +msgid "Paste the original untranslated string to the translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:22 ../pohelper/src/gph-plugin.c:1061 +msgid "Reflow the current translation string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:23 +msgid "_Reflow Translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:24 +msgid "" +"Whether to update the translation headers (author, revision date, ...) upon " +"file save" +msgstr "" + +#: ../pohelper/data/menus.ui.h:25 +msgid "Update _Headers Upon Save" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:41 +msgid "Translation Helper" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:42 +msgid "Improves support for GetText translation files." +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1057 +msgid "Paste original untranslated string to translation" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1099 +#, fuzzy, c-format +msgid "Failed to load configuration file: %s" +msgstr "Incapaz de ler configuração: %s" + +#: ../pohelper/src/gph-plugin.c:1124 +#, fuzzy, c-format +msgid "Failed to create configuration directory \"%s\": %s" +msgstr "" +"Falha ao encontrar o ficheiro de configuração para o tipo de ficheiro \"%s" +"\": %s" + +#: ../pohelper/src/gph-plugin.c:1127 +#, fuzzy, c-format +msgid "Failed to save configuration file: %s" +msgstr "Incapaz de guardar configuração: %s" + +#: ../pohelper/src/gph-plugin.c:1182 +#, fuzzy, c-format +msgid "" +"Failed to load UI definition, please check your installation. The error was: " +"%s" +msgstr "" +"O plugin %s não carregou correctamente.\n" +"Por favor verifique a sua instalação." + +#: ../pohelper/src/gph-plugin.c:1222 +#, c-format +msgid "" +"Cannot find widget \"%s\" in the UI definition, please check your " +"installation." +msgstr "" + #: ../pretty-printer/src/PluginEntry.c:37 msgid "XML PrettyPrinter" msgstr "ImpressãoBonita XML" @@ -5212,286 +5501,358 @@ msgstr "" #: ../scope/data/scope.glade.h:64 -msgid "_Evaluate/Modify" +msgid "_Raw" msgstr "" #: ../scope/data/scope.glade.h:65 -msgid "_Watch Expression" +msgid "_Evaluate/Modify" msgstr "" #: ../scope/data/scope.glade.h:66 -#, fuzzy -msgid "_Inspect Variable" -msgstr "Variáveis de Ambiente" +msgid "_Watch Expression" +msgstr "" #: ../scope/data/scope.glade.h:67 #, fuzzy -msgid "Program Terminal" -msgstr "Consola de Depuração (debug)" +msgid "_Inspect Variable" +msgstr "Variáveis de Ambiente" #: ../scope/data/scope.glade.h:68 msgid "Threads" msgstr "" -#: ../scope/data/scope.glade.h:70 +#: ../scope/data/scope.glade.h:69 #, fuzzy msgid "Stack" msgstr "Analisar a Pilha" -#: ../scope/data/scope.glade.h:71 +#: ../scope/data/scope.glade.h:70 msgid "Locals" msgstr "" -#: ../scope/data/scope.glade.h:72 +#: ../scope/data/scope.glade.h:71 #, fuzzy msgid "Watches" msgstr "Observação" -#: ../scope/data/scope.glade.h:73 +#: ../scope/data/scope.glade.h:72 msgid "Memory" msgstr "" -#: ../scope/data/scope.glade.h:74 -#, fuzzy -msgid "Debug Console" -msgstr "Consola:" - -#: ../scope/data/scope.glade.h:75 +#: ../scope/data/scope.glade.h:73 #, fuzzy msgid "Enter gdb command:" msgstr "Inserir comando" -#: ../scope/data/scope.glade.h:76 +#: ../scope/data/scope.glade.h:74 #, fuzzy msgid "Convert _UTF-8 to locale" msgstr "_Converter numa tabela" -#: ../scope/data/scope.glade.h:77 +#: ../scope/data/scope.glade.h:75 msgid "_Thread" msgstr "" -#: ../scope/data/scope.glade.h:78 +#: ../scope/data/scope.glade.h:76 msgid "_Group" msgstr "" -#: ../scope/data/scope.glade.h:79 +#: ../scope/data/scope.glade.h:77 #, fuzzy msgid "_Frame" msgstr "Informação da Moldura" -#: ../scope/data/scope.glade.h:80 +#: ../scope/data/scope.glade.h:78 #, fuzzy msgid "Setup Program" msgstr "nenhum executável" -#: ../scope/data/scope.glade.h:81 +#: ../scope/data/scope.glade.h:79 msgid "_Executable:" msgstr "" -#: ../scope/data/scope.glade.h:82 +#: ../scope/data/scope.glade.h:80 #, fuzzy msgid "_Arguments:" msgstr "Alinhamento" -#: ../scope/data/scope.glade.h:83 +#: ../scope/data/scope.glade.h:81 #, fuzzy msgid "En_vironment:" msgstr "Ambiente:" -#: ../scope/data/scope.glade.h:84 +#: ../scope/data/scope.glade.h:82 msgid "_Working dir:" msgstr "" -#: ../scope/data/scope.glade.h:85 +#: ../scope/data/scope.glade.h:83 #, fuzzy msgid "_Load script:" msgstr "Scripts _Lua " -#: ../scope/data/scope.glade.h:86 +#: ../scope/data/scope.glade.h:84 msgid "Auto _run program/exit gdb" msgstr "" -#: ../scope/data/scope.glade.h:87 +#: ../scope/data/scope.glade.h:85 msgid "_Non-stop mode" msgstr "" -#: ../scope/data/scope.glade.h:88 -msgid "_Temporary breakpoint at:" +#: ../scope/data/scope.glade.h:86 +msgid "_Temporary breakpoint on load at:" msgstr "" -#: ../scope/data/scope.glade.h:89 -msgid "_Delete all breakpoints, watches and inspects" +#: ../scope/data/scope.glade.h:87 +msgid "_Delete all breakpoints, watches, inspects and registers" msgstr "" -#: ../scope/data/scope.glade.h:90 ../scope/src/prefs.c:337 +#: ../scope/data/scope.glade.h:88 ../scope/src/scope.c:522 #, fuzzy msgid "Program" msgstr "nenhum executável" -#: ../scope/data/scope.glade.h:91 +#: ../scope/data/scope.glade.h:89 #, fuzzy msgid "Open on" msgstr "Abrir URI" -#: ../scope/data/scope.glade.h:92 +#: ../scope/data/scope.glade.h:90 #, fuzzy msgid "g_db load" msgstr "_Descartar" -#: ../scope/data/scope.glade.h:93 +#: ../scope/data/scope.glade.h:91 msgid "p_rogram start" msgstr "" -#: ../scope/data/scope.glade.h:94 +#: ../scope/data/scope.glade.h:92 #, fuzzy msgid "Update all _views" msgstr "Actualizar Lista de Tarefas" -#: ../scope/data/scope.glade.h:95 +#: ../scope/data/scope.glade.h:93 msgid "Panel" msgstr "" -#: ../scope/data/scope.glade.h:96 +#: ../scope/data/scope.glade.h:94 msgid "Default 8-bit text mode:" msgstr "" -#: ../scope/data/scope.glade.h:97 +#: ../scope/data/scope.glade.h:95 msgid "_7-bit \\nnn" msgstr "" -#: ../scope/data/scope.glade.h:98 +#: ../scope/data/scope.glade.h:96 #, fuzzy msgid "Display" msgstr "barra lateral" -#: ../scope/data/scope.glade.h:99 +#: ../scope/data/scope.glade.h:97 #, fuzzy msgid "_member" msgstr "Número" -#: ../scope/data/scope.glade.h:100 +#: ../scope/data/scope.glade.h:98 #, fuzzy msgid "and" msgstr "má" -#: ../scope/data/scope.glade.h:101 +#: ../scope/data/scope.glade.h:99 #, fuzzy msgid "_argument" msgstr "E_mail o documento" -#: ../scope/data/scope.glade.h:102 +#: ../scope/data/scope.glade.h:100 #, fuzzy msgid "names" msgstr "Renomear" -#: ../scope/data/scope.glade.h:103 +#: ../scope/data/scope.glade.h:101 msgid "Values" msgstr "" -#: ../scope/data/scope.glade.h:104 +#: ../scope/data/scope.glade.h:102 #, fuzzy msgid "E_xpand on apply" msgstr "Expandir Tudo" -#: ../scope/data/scope.glade.h:105 +#: ../scope/data/scope.glade.h:103 msgid "S_how" msgstr "" -#: ../scope/data/scope.glade.h:106 +#: ../scope/data/scope.glade.h:104 msgid "children" msgstr "" -#: ../scope/data/scope.glade.h:107 +#: ../scope/data/scope.glade.h:105 msgid "Inspect" msgstr "" -#: ../scope/data/scope.glade.h:108 +#: ../scope/data/scope.glade.h:106 msgid "Show =li_brary messages" msgstr "" -#: ../scope/data/scope.glade.h:109 +#: ../scope/data/scope.glade.h:107 #, fuzzy msgid "Show _tooltips" msgstr "Mostrar dicas." -#: ../scope/data/scope.glade.h:110 +#: ../scope/data/scope.glade.h:108 msgid "Others" msgstr "" -#: ../scope/data/scope.glade.h:111 +#: ../scope/data/scope.glade.h:109 #, fuzzy msgid "Options" msgstr "_Opções" -#: ../scope/data/scope.glade.h:112 +#: ../scope/data/scope.glade.h:110 #, fuzzy msgid "_Import" msgstr "Relatório" -#: ../scope/data/scope.glade.h:113 +#: ../scope/data/scope.glade.h:111 #, fuzzy msgid "Enter assignment expression:" msgstr "Falha ao avaliar expressão" -#: ../scope/data/scope.glade.h:114 +#: ../scope/data/scope.glade.h:112 #, fuzzy msgid "Inspect" msgstr "Inspector Web" -#: ../scope/data/scope.glade.h:115 +#: ../scope/data/scope.glade.h:113 #, fuzzy msgid "Object:" msgstr "Informação do Objecto" -#: ../scope/data/scope.glade.h:117 +#: ../scope/data/scope.glade.h:115 msgid "-" msgstr "" -#: ../scope/data/scope.glade.h:118 +#: ../scope/data/scope.glade.h:116 #, fuzzy msgid "Frame:" msgstr "Nome:" -#: ../scope/data/scope.glade.h:119 +#: ../scope/data/scope.glade.h:117 msgid "@" msgstr "" -#: ../scope/data/scope.glade.h:120 +#: ../scope/data/scope.glade.h:118 msgid "_Apply on run" msgstr "" -#: ../scope/data/scope.glade.h:121 +#: ../scope/data/scope.glade.h:119 #, fuzzy msgid "Expand" msgstr "Expandir Tudo" -#: ../scope/data/scope.glade.h:122 +#: ../scope/data/scope.glade.h:120 #, fuzzy msgid "Start:" msgstr "_Iniciar:" -#: ../scope/data/scope.glade.h:123 +#: ../scope/data/scope.glade.h:121 msgid "Count:" msgstr "" -#: ../scope/data/scope.glade.h:124 +#: ../scope/data/scope.glade.h:122 #, fuzzy msgid "_Expand on apply" msgstr "Expandir Tudo" -#: ../scope/src/break.c:947 +#: ../scope/data/scope.glade.h:123 ../scope/src/scope.c:522 +#, fuzzy +msgid "Program Terminal" +msgstr "Consola de Depuração (debug)" + +#: ../scope/data/scope.glade.h:125 +msgid "Registers" +msgstr "" + +#: ../scope/src/break.c:97 +#, fuzzy +msgid "breakpoint" +msgstr "Pontos de Paragem" + +#: ../scope/src/break.c:98 +#, fuzzy +msgid "hardware breakpoint" +msgstr "Editar ponto de paragem" + +#: ../scope/src/break.c:99 +#, fuzzy +msgid "tracepoint" +msgstr "ponto de observação" + +#: ../scope/src/break.c:100 +#, fuzzy +msgid "fast tracepoint" +msgstr "ponto de observação" + +#: ../scope/src/break.c:101 +#, fuzzy +msgid "write watchpoint" +msgstr "Editar ponto de observação" + +#: ../scope/src/break.c:104 +#, fuzzy +msgid "access watchpoint" +msgstr "ponto de observação" + +#: ../scope/src/break.c:106 +#, fuzzy +msgid "read watchpoint" +msgstr "Editar ponto de observação" + +#: ../scope/src/break.c:108 +#, fuzzy +msgid "catchpoint" +msgstr "ponto de observação" + +#: ../scope/src/break.c:135 ../scope/src/break.c:139 +msgid "CLI" +msgstr "" + +#: ../scope/src/break.c:136 +msgid "unsupported MI" +msgstr "" + +#: ../scope/src/break.c:141 +#, fuzzy +msgid "on load" +msgstr "_Descartar" + +#: ../scope/src/break.c:142 +#, fuzzy +msgid "Run to Cursor" +msgstr "Executar até ao cursor" + +#: ../scope/src/break.c:1013 #, c-format msgid "" "There are two or more breakpoints at %s:%d.\n" +"\n" "Use the breakpoint list to remove the exact one." msgstr "" -#: ../scope/src/break.c:1200 +#: ../scope/src/break.c:1252 +#, c-format +msgid ", %s" +msgstr "" + +#: ../scope/src/break.c:1278 +#, c-format +msgid "func %s" +msgstr "" + +#: ../scope/src/break.c:1309 #, fuzzy msgid "Add Breakpoint" msgstr "Adicionar ponto de paragem" -#: ../scope/src/break.c:1215 +#: ../scope/src/break.c:1324 #, fuzzy msgid "Add Watchpoint" msgstr "Adicionar ponto de observação" @@ -5505,7 +5866,8 @@ msgid "Enter char # (0..255):" msgstr "" -#: ../scope/src/conterm.c:466 ../scope/src/scope.c:502 +#: ../scope/src/conterm.c:509 ../scope/src/scope.c:550 +#: ../scope/src/scope.c:551 #, fuzzy, c-format msgid "Scope: %s." msgstr "Fechar: %s" @@ -5525,65 +5887,66 @@ msgid "Program terminated." msgstr "terminado" -#: ../scope/src/debug.c:468 +#: ../scope/src/debug.c:469 msgid "No breakpoints. Hanging." msgstr "" -#: ../scope/src/debug.c:596 ../scope/src/thread.c:97 +#: ../scope/src/debug.c:598 ../scope/src/thread.c:92 #, fuzzy, c-format msgid "%s." msgstr "%s:" -#: ../scope/src/inspect.c:77 +#: ../scope/src/inspect.c:66 #, fuzzy msgid "..." msgstr "Mais..." -#: ../scope/src/inspect.c:324 +#: ../scope/src/inspect.c:339 #, fuzzy msgid "invalid data" msgstr "etiqueta inválida" -#: ../scope/src/inspect.c:356 +#: ../scope/src/inspect.c:371 msgid "no children in range" msgstr "" -#: ../scope/src/inspect.c:440 +#: ../scope/src/inspect.c:454 #, fuzzy msgid "out of scope" msgstr "Ponto de observação #%s fora de alcance" -#: ../scope/src/inspect.c:587 +#: ../scope/src/inspect.c:627 msgid "Duplicate inspect variable name." msgstr "" -#: ../scope/src/memory.c:299 +#: ../scope/src/memory.c:292 msgid "Read Memory" msgstr "" -#: ../scope/src/memory.c:408 -msgid "Scope: pointer size > 8, Data disabled." +#: ../scope/src/memory.c:396 +#, c-format +msgid "Scope: pointer size > %d, Data disabled." msgstr "" -#: ../scope/src/menu.c:380 +#: ../scope/src/menu.c:375 msgid "Modify" msgstr "" -#: ../scope/src/menu.c:490 +#: ../scope/src/menu.c:481 msgid "Evaluate/modify" msgstr "" -#: ../scope/src/menu.c:491 +#: ../scope/src/menu.c:482 #, fuzzy msgid "Watch expression" msgstr "Falha ao avaliar expressão" -#: ../scope/src/menu.c:492 +#: ../scope/src/menu.c:483 #, fuzzy msgid "Inspect variable" msgstr "Eliminar variável?" -#: ../scope/src/parse.c:416 +#: ../scope/src/parse.c:437 msgid "Undefined GDB error." msgstr "" @@ -5597,37 +5960,27 @@ msgid "Select File" msgstr "Seleccionar Ficheiro" -#: ../scope/src/prefs.c:338 -#, fuzzy -msgid "Breaks" -msgstr "Pontos de Paragem" - -#: ../scope/src/prefs.c:339 -#, fuzzy -msgid "Console" -msgstr "Consola:" - -#: ../scope/src/prefs.c:347 ../scope/src/utils.c:570 +#: ../scope/src/prefs.c:294 ../scope/src/utils.c:438 #, c-format msgid "Scope: %s: %s." msgstr "" -#: ../scope/src/prefs.c:352 +#: ../scope/src/prefs.c:299 #, fuzzy msgid "Scope: created configuration file." msgstr "Forçar o reler dos ficheiros de configuração" -#: ../scope/src/program.c:231 +#: ../scope/src/program.c:251 #, c-format msgid "Loaded debug settings for %s." msgstr "" -#: ../scope/src/program.c:239 +#: ../scope/src/program.c:259 #, fuzzy, c-format msgid "Could not load debug settings file %s: %s." msgstr "Falha ao carregar o ficheiro \"%s\": %s" -#: ../scope/src/program.c:359 +#: ../scope/src/program.c:379 #, fuzzy, c-format msgid "" "%s: %s.\n" @@ -5635,15 +5988,15 @@ "Continue?" msgstr "Continuar" -#: ../scope/src/program.c:394 -msgid "Delete all breakpoints, watches and inspects?" +#: ../scope/src/program.c:415 +msgid "Delete all breakpoints, watches et cetera?" msgstr "" -#: ../scope/src/program.c:501 +#: ../scope/src/program.c:523 msgid "as _Name=value" msgstr "" -#: ../scope/src/program.c:502 +#: ../scope/src/program.c:524 msgid "as _Name = value" msgstr "" @@ -5653,169 +6006,184 @@ msgstr "Depurador" #: ../scope/src/scope.c:35 -msgid "Simple GDB front-end." +msgid "Relatively simple GDB front-end." msgstr "" -#: ../scope/src/scope.c:63 +#: ../scope/src/scope.c:62 #, fuzzy msgid "Setup program" msgstr "nenhum executável" -#: ../scope/src/scope.c:64 +#: ../scope/src/scope.c:63 #, fuzzy msgid "Run/continue" msgstr "Executar / Continuar" -#: ../scope/src/scope.c:66 +#: ../scope/src/scope.c:65 #, fuzzy msgid "Run to source" msgstr "Executar até ao cursor" -#: ../scope/src/scope.c:70 +#: ../scope/src/scope.c:69 #, fuzzy msgid "Terminate" msgstr "terminado" -#: ../scope/src/scope.c:71 +#: ../scope/src/scope.c:70 #, fuzzy msgid "Toggle breakpoint" msgstr "ponto de paragem" -#: ../scope/src/scope.c:73 ../scope/src/scope.c:76 +#: ../scope/src/scope.c:72 ../scope/src/scope.c:75 #, fuzzy msgid "GDB command" msgstr "Inserir comando" -#: ../scope/src/scope.c:74 +#: ../scope/src/scope.c:73 #, fuzzy msgid "Show terminal" msgstr "Executar no terminal" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Busy" msgstr "" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Ready" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Hang" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Assem" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 #, fuzzy msgid "Load" msgstr "_Carregar" -#: ../scope/src/scope.c:394 +#: ../scope/src/scope.c:421 msgid "Build action activated. Terminate debugging?" msgstr "" -#: ../scope/src/thread.c:58 +#: ../scope/src/scope.c:524 +#, fuzzy +msgid "Breaks" +msgstr "Pontos de Paragem" + +#: ../scope/src/scope.c:526 +#, fuzzy +msgid "Console" +msgstr "Consola:" + +#: ../scope/src/scope.c:526 +#, fuzzy +msgid "Debug Console" +msgstr "Consola:" + +#: ../scope/src/thread.c:48 #, c-format msgid "Thread group %s started." msgstr "" -#: ../scope/src/thread.c:76 +#: ../scope/src/thread.c:63 msgid "Thread group " msgstr "" -#: ../scope/src/thread.c:88 +#: ../scope/src/thread.c:83 msgid " exited" msgstr "" -#: ../scope/src/thread.c:91 +#: ../scope/src/thread.c:86 #, c-format msgid " with exit code %s" msgstr "" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 #, fuzzy msgid "Send Signal" msgstr "Enviar por email" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 msgid "Enter signal #:" msgstr "" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Terminate Process" msgstr "" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Enter exit code:" msgstr "" -#: ../scope/src/thread.c:937 +#: ../scope/src/thread.c:891 #, fuzzy msgid "Running" msgstr "a executar" -#: ../scope/src/thread.c:938 +#: ../scope/src/thread.c:892 #, fuzzy msgid "Stopped" msgstr "parado" -#: ../scope/src/utils.c:44 -#, c-format -msgid "%s: error %lu." -msgstr "" +#: ../scope/src/utils.c:45 +#, fuzzy, c-format +msgid "%s: %s" +msgstr "%s:%u:%u: %s" -#: ../scope/src/utils.c:358 +#: ../scope/src/utils.c:225 #, c-format msgid "Scope: error reading [%s]." msgstr "" -#: ../scope/src/views.c:505 +#: ../scope/src/views.c:526 msgid "…" msgstr "" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Send" msgstr "" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Busy" msgstr "" -#: ../scope/src/views.c:535 +#: ../scope/src/views.c:558 #, fuzzy msgid "GDB Command" msgstr "Comando 0:" -#: ../spellcheck/src/speller.c:94 +#: ../spellcheck/src/speller.c:180 msgid "Try: " msgstr "Tentar:" -#: ../spellcheck/src/speller.c:173 +#: ../spellcheck/src/speller.c:252 msgid "Checking" msgstr "A verificar" -#: ../spellcheck/src/speller.c:186 +#: ../spellcheck/src/speller.c:265 #, c-format msgid "Checking file \"%s\" (lines %d to %d using %s):" msgstr "A verificar ficheiro \"%s\" (linhas %d até %d usando %s):" -#: ../spellcheck/src/speller.c:196 +#: ../spellcheck/src/speller.c:275 #, c-format msgid "Checking file \"%s\" (using %s):" msgstr "A verificar \"%s\" (usando %s):" -#: ../spellcheck/src/speller.c:223 +#: ../spellcheck/src/speller.c:302 msgid "The checked text is spelled correctly." msgstr "O texto verificado não contém erros ortográficos." -#: ../spellcheck/src/speller.c:233 +#: ../spellcheck/src/speller.c:312 #, c-format msgid "The Enchant library couldn't be initialized (%s)." msgstr "A biblioteca Enchant não pode ser inicializada (%s)." -#: ../spellcheck/src/speller.c:234 +#: ../spellcheck/src/speller.c:313 msgid "unknown error (maybe the chosen language is not available)" msgstr "" "erro desconhecido (talvez a língua que escolheu não se encontre disponível)" @@ -5912,18 +6280,18 @@ msgid "Ignore All" msgstr "Ignorar Tudo" -#: ../spellcheck/src/gui.c:521 +#: ../spellcheck/src/gui.c:526 #, c-format msgid "Default (%s)" msgstr "Por Defeito (%s)" -#: ../spellcheck/src/gui.c:532 +#: ../spellcheck/src/gui.c:537 #, c-format msgid "Toggle spell check while typing (current language: %s)" msgstr "" "Activa\\Desactiva a correcção ortográfica enquanto tecla (língua actual: %s)" -#: ../spellcheck/src/gui.c:587 +#: ../spellcheck/src/gui.c:592 msgid "Spelling Suggestions" msgstr "Sugestões de Ortografia" @@ -5954,28 +6322,28 @@ #. OK. Something went not as expected. #. * We did have a selection but cannot parse it into rows. #. * Aborting -#: ../tableconvert/src/tableconvert.c:236 +#: ../tableconvert/src/tableconvert.c:237 msgid "Something went wrong on parsing selection. Aborting" msgstr "Algo correu mal ao analisar o selecinado. Terminando" -#: ../tableconvert/src/tableconvert.c:268 +#: ../tableconvert/src/tableconvert.c:269 msgid "Convert selection to table" msgstr "Converter o selecionado numa tabela" #. Build up menu entry -#: ../tableconvert/src/tableconvert.c:281 +#: ../tableconvert/src/tableconvert.c:282 msgid "_Convert to table" msgstr "_Converter numa tabela" -#: ../tableconvert/src/tableconvert.c:284 +#: ../tableconvert/src/tableconvert.c:285 msgid "Converts current marked list to a table." msgstr "Converte a lista atualmente selecionada, numa tabela." -#: ../treebrowser/src/treebrowser.c:120 +#: ../treebrowser/src/treebrowser.c:124 msgid "TreeBrowser" msgstr "Navegador em Árvore" -#: ../treebrowser/src/treebrowser.c:121 +#: ../treebrowser/src/treebrowser.c:125 msgid "" "This plugin adds a tree browser to Geany, allowing the user to browse files " "using a tree view of the directory being browsed." @@ -5983,30 +6351,30 @@ "Este plugin adiciona um navegador em árvore ao Geany, permitindo a navegação " "em ficheiros, no directório actual, usando uma vista em árvore." -#: ../treebrowser/src/treebrowser.c:430 +#: ../treebrowser/src/treebrowser.c:434 #, c-format msgid "%s: no such directory." msgstr "%s: directório inexistente." -#: ../treebrowser/src/treebrowser.c:526 ../treebrowser/src/treebrowser.c:561 -#: ../treebrowser/src/treebrowser.c:663 +#: ../treebrowser/src/treebrowser.c:537 ../treebrowser/src/treebrowser.c:572 +#: ../treebrowser/src/treebrowser.c:670 msgid "(Empty)" msgstr "(Vazio)" -#: ../treebrowser/src/treebrowser.c:966 +#: ../treebrowser/src/treebrowser.c:971 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Incapaz de executar o comando externo '%s' (%s). " -#: ../treebrowser/src/treebrowser.c:1037 +#: ../treebrowser/src/treebrowser.c:1042 msgid "NewDirectory" msgstr "Novo Directório" -#: ../treebrowser/src/treebrowser.c:1039 +#: ../treebrowser/src/treebrowser.c:1044 msgid "NewFile" msgstr "Novo Ficheiro" -#: ../treebrowser/src/treebrowser.c:1044 +#: ../treebrowser/src/treebrowser.c:1049 #, c-format msgid "" "Target file '%s' exists\n" @@ -6015,96 +6383,103 @@ "Ficheiro alvo '%s' existe\n" ", tem a certeza que o quer substituir por um ficheiro vazio?" -#: ../treebrowser/src/treebrowser.c:1089 +#: ../treebrowser/src/treebrowser.c:1095 #, c-format msgid "Do you really want to delete '%s' ?" msgstr "Tem a certeza que pretende apagar '%s'?" -#: ../treebrowser/src/treebrowser.c:1208 ../treebrowser/src/treebrowser.c:1692 +#: ../treebrowser/src/treebrowser.c:1207 ../treebrowser/src/treebrowser.c:1738 msgid "Go up" msgstr "Ir para cima" -#: ../treebrowser/src/treebrowser.c:1212 ../treebrowser/src/treebrowser.c:1707 +#: ../treebrowser/src/treebrowser.c:1211 ../treebrowser/src/treebrowser.c:1753 msgid "Set path from document" msgstr "Mudar para o directório do documento" -#: ../treebrowser/src/treebrowser.c:1216 -msgid "Open externally" +#: ../treebrowser/src/treebrowser.c:1215 +#, fuzzy +msgid "_Open externally" msgstr "Abrir externamente" -#: ../treebrowser/src/treebrowser.c:1221 +#: ../treebrowser/src/treebrowser.c:1220 msgid "Open Terminal" msgstr "Abrir Terminal" -#: ../treebrowser/src/treebrowser.c:1225 +#: ../treebrowser/src/treebrowser.c:1224 msgid "Set as root" msgstr "Definir como base" -#: ../treebrowser/src/treebrowser.c:1230 ../treebrowser/src/treebrowser.c:1697 -#: ../treebrowser/src/treebrowser.c:2060 +#: ../treebrowser/src/treebrowser.c:1229 ../treebrowser/src/treebrowser.c:1743 +#: ../treebrowser/src/treebrowser.c:2123 msgid "Refresh" msgstr "Actualizar" -#: ../treebrowser/src/treebrowser.c:1242 +#: ../treebrowser/src/treebrowser.c:1233 +#, fuzzy +msgid "_Find in Files" +msgstr "Procurar em Ficheiros" + +#: ../treebrowser/src/treebrowser.c:1241 msgid "Create new directory" msgstr "Criar um novo directório" -#: ../treebrowser/src/treebrowser.c:1246 +#: ../treebrowser/src/treebrowser.c:1245 msgid "Create new file" msgstr "Criar um novo ficheiro" -#: ../treebrowser/src/treebrowser.c:1250 +#: ../treebrowser/src/treebrowser.c:1249 msgid "Rename" msgstr "Renomear" -#: ../treebrowser/src/treebrowser.c:1255 +#: ../treebrowser/src/treebrowser.c:1254 msgid "Delete" msgstr "Apagar" -#: ../treebrowser/src/treebrowser.c:1263 +#: ../treebrowser/src/treebrowser.c:1262 #, c-format msgid "Close: %s" msgstr "Fechar: %s" -#: ../treebrowser/src/treebrowser.c:1268 +#: ../treebrowser/src/treebrowser.c:1267 #, c-format msgid "Close Child Documents " msgstr "Fechar os Documentos Filhos" -#: ../treebrowser/src/treebrowser.c:1273 -msgid "Copy full path to clipboard" +#: ../treebrowser/src/treebrowser.c:1272 +#, fuzzy +msgid "_Copy full path to clipboard" msgstr "Copiar directório absoluto para a área de transferência" -#: ../treebrowser/src/treebrowser.c:1293 ../treebrowser/src/treebrowser.c:1974 +#: ../treebrowser/src/treebrowser.c:1292 ../treebrowser/src/treebrowser.c:2032 msgid "Show bookmarks" msgstr "Mostar favoritos" -#: ../treebrowser/src/treebrowser.c:1298 ../treebrowser/src/treebrowser.c:1928 +#: ../treebrowser/src/treebrowser.c:1297 ../treebrowser/src/treebrowser.c:1981 msgid "Show hidden files" msgstr "Mostrar ficheiros ocultos" -#: ../treebrowser/src/treebrowser.c:1303 +#: ../treebrowser/src/treebrowser.c:1302 msgid "Show toolbars" msgstr "Mostrar barras de ferramentas" -#: ../treebrowser/src/treebrowser.c:1574 +#: ../treebrowser/src/treebrowser.c:1621 #, c-format msgid "Target file '%s' exists, do you really want to replace it?" msgstr "Ficheiro alvo '%s' existe, tem a certeza que o quer substituir?" -#: ../treebrowser/src/treebrowser.c:1702 +#: ../treebrowser/src/treebrowser.c:1748 msgid "Home" msgstr "Pasta Pessoal" -#: ../treebrowser/src/treebrowser.c:1712 +#: ../treebrowser/src/treebrowser.c:1758 msgid "Track path" msgstr "Acompanhar directório do ficheiro" -#: ../treebrowser/src/treebrowser.c:1717 +#: ../treebrowser/src/treebrowser.c:1763 msgid "Hide bars" msgstr "Ocultar barras" -#: ../treebrowser/src/treebrowser.c:1727 +#: ../treebrowser/src/treebrowser.c:1773 msgid "" "Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' " "reverse try for example this '!;*.c;*.h;*.cpp'" @@ -6112,19 +6487,19 @@ "Filtrar (*.c;*.h;*.cpp), e se pretender uma filtragem temporária use '!'. " "Tente por exemplo isto '!;*.c;*.h;*.cpp'" -#: ../treebrowser/src/treebrowser.c:1735 +#: ../treebrowser/src/treebrowser.c:1781 msgid "Addressbar for example '/projects/my-project'" msgstr "Barra de Endereço por exemplo '/projectos/meu-projecto'" -#: ../treebrowser/src/treebrowser.c:1760 +#: ../treebrowser/src/treebrowser.c:1806 msgid "Tree Browser" msgstr "Navegador de Ficheiros" -#: ../treebrowser/src/treebrowser.c:1892 +#: ../treebrowser/src/treebrowser.c:1945 msgid "External open command" msgstr "Comando Externo para a função Abrir" -#: ../treebrowser/src/treebrowser.c:1897 +#: ../treebrowser/src/treebrowser.c:1950 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -6140,51 +6515,51 @@ "%d será substituído pelo directório absoluto do ficheiro seleccionado, sem o " "nome deste" -#: ../treebrowser/src/treebrowser.c:1905 +#: ../treebrowser/src/treebrowser.c:1958 msgid "Toolbar" msgstr "Barra de ferramentas" -#: ../treebrowser/src/treebrowser.c:1907 +#: ../treebrowser/src/treebrowser.c:1960 msgid "Hidden" msgstr "Ocultar" -#: ../treebrowser/src/treebrowser.c:1908 +#: ../treebrowser/src/treebrowser.c:1961 msgid "Top" msgstr "Topo" -#: ../treebrowser/src/treebrowser.c:1909 +#: ../treebrowser/src/treebrowser.c:1962 msgid "Bottom" msgstr "Fundo" -#: ../treebrowser/src/treebrowser.c:1914 +#: ../treebrowser/src/treebrowser.c:1967 msgid "If position is changed, the option require plugin restart." msgstr "Se a posição mudar, esta opção requer reinicialização do plugin." -#: ../treebrowser/src/treebrowser.c:1918 +#: ../treebrowser/src/treebrowser.c:1971 msgid "Show icons" msgstr "Mostrar ícones" -#: ../treebrowser/src/treebrowser.c:1920 +#: ../treebrowser/src/treebrowser.c:1973 msgid "None" msgstr "Nenhum" -#: ../treebrowser/src/treebrowser.c:1921 +#: ../treebrowser/src/treebrowser.c:1974 msgid "Base" msgstr "Base" -#: ../treebrowser/src/treebrowser.c:1922 +#: ../treebrowser/src/treebrowser.c:1975 msgid "Content-type" msgstr "Content-type" -#: ../treebrowser/src/treebrowser.c:1933 +#: ../treebrowser/src/treebrowser.c:1986 msgid "On Windows, this just hide files that are prefixed with '.' (dot)" msgstr "Em Windows, isto apenas oculta ficheiros precedidos de '.' (um ponto)" -#: ../treebrowser/src/treebrowser.c:1935 +#: ../treebrowser/src/treebrowser.c:1988 msgid "Hide object files" msgstr "Ocultar ficheiros objecto" -#: ../treebrowser/src/treebrowser.c:1940 +#: ../treebrowser/src/treebrowser.c:1993 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -6192,48 +6567,57 @@ "Oculta, no navegador de ficheiros, ficheiros objecto gerados, inclui os " "ficheiros *.o, *.obj, *.so, *.dll, *.a, *.lib" -#: ../treebrowser/src/treebrowser.c:1942 +#: ../treebrowser/src/treebrowser.c:1995 msgid "Reverse filter" msgstr "Reverte o filtro" -#: ../treebrowser/src/treebrowser.c:1947 +#: ../treebrowser/src/treebrowser.c:2000 msgid "Follow current document" msgstr "Seguir o documento activo" -#: ../treebrowser/src/treebrowser.c:1952 +#: ../treebrowser/src/treebrowser.c:2005 msgid "Single click, open document and focus it" msgstr "Um clique, abre documento e foca-o" -#: ../treebrowser/src/treebrowser.c:1957 +#: ../treebrowser/src/treebrowser.c:2010 msgid "Double click open directory" msgstr "Clique duplo abre directório" -#: ../treebrowser/src/treebrowser.c:1962 +#: ../treebrowser/src/treebrowser.c:2015 msgid "On delete file, close it if is opened" msgstr "Ao apagar, fechá-lo caso esteja aberto" -#: ../treebrowser/src/treebrowser.c:1967 +#: ../treebrowser/src/treebrowser.c:2020 +msgid "Focus editor on file open" +msgstr "" + +#: ../treebrowser/src/treebrowser.c:2025 msgid "Show tree lines" msgstr "Mostrar as linhas da árvore" -#: ../treebrowser/src/treebrowser.c:2050 +#: ../treebrowser/src/treebrowser.c:2037 +#, fuzzy +msgid "Open new files" +msgstr "Abrir Ficheiro" + +#: ../treebrowser/src/treebrowser.c:2113 msgid "Focus File List" msgstr "Focar a Lista de Ficheiros" -#: ../treebrowser/src/treebrowser.c:2052 +#: ../treebrowser/src/treebrowser.c:2115 msgid "Focus Path Entry" msgstr "Focar a entrada de directório" -#: ../treebrowser/src/treebrowser.c:2054 +#: ../treebrowser/src/treebrowser.c:2117 msgid "Rename Object" msgstr "Renomear Objecto" -#: ../treebrowser/src/treebrowser.c:2056 +#: ../treebrowser/src/treebrowser.c:2119 #, fuzzy msgid "Create New File" msgstr "Criar um novo ficheiro" -#: ../treebrowser/src/treebrowser.c:2058 +#: ../treebrowser/src/treebrowser.c:2121 #, fuzzy msgid "Create New Directory" msgstr "Criar um novo directório" @@ -6303,44 +6687,44 @@ msgid "utility" msgstr "utilidade" -#: ../webhelper/src/gwh-settings.c:775 +#: ../webhelper/src/gwh-settings.c:782 #, c-format msgid "%s:" msgstr "%s:" -#: ../webhelper/src/gwh-browser.c:528 +#: ../webhelper/src/gwh-browser.c:534 msgid "_Zoom" msgstr "_Zoom" -#: ../webhelper/src/gwh-browser.c:550 +#: ../webhelper/src/gwh-browser.c:556 msgid "Full-_content zoom" msgstr "Ampliar o texto (vista total)" -#: ../webhelper/src/gwh-browser.c:561 +#: ../webhelper/src/gwh-browser.c:567 msgid "Flip panes orientation" msgstr "Virar a orientação dos painéis " -#: ../webhelper/src/gwh-browser.c:808 +#: ../webhelper/src/gwh-browser.c:814 msgid "Back" msgstr "Para trás" -#: ../webhelper/src/gwh-browser.c:812 +#: ../webhelper/src/gwh-browser.c:818 msgid "Forward" msgstr "Para a frente" -#: ../webhelper/src/gwh-browser.c:816 +#: ../webhelper/src/gwh-browser.c:822 msgid "Cancel loading" msgstr "Cancelar carregamento" -#: ../webhelper/src/gwh-browser.c:820 +#: ../webhelper/src/gwh-browser.c:826 msgid "Reload current page" msgstr "Reler página actual" -#: ../webhelper/src/gwh-browser.c:833 ../webhelper/src/gwh-browser.c:879 +#: ../webhelper/src/gwh-browser.c:839 ../webhelper/src/gwh-browser.c:885 msgid "Web inspector" msgstr "Inspector Web" -#: ../webhelper/src/gwh-browser.c:834 +#: ../webhelper/src/gwh-browser.c:840 msgid "Toggle web inspector" msgstr "Comuta o inspector Web" @@ -6556,9 +6940,6 @@ #~ msgid "tty temporary directory not specified!\n" #~ msgstr "directório temporário do tty não especificado!\n" -#~ msgid "tty temporary directory not found!\n" -#~ msgstr "directório temporário do tty não encontrado!\n" - #~ msgid "tty helper program not specified!\n" #~ msgstr "assistente do tty não especificado!\n" @@ -6625,21 +7006,12 @@ #~ msgid "No %s selected" #~ msgstr "Nenhum %s seleccionado" -#~ msgid "watchpoint" -#~ msgstr "ponto de observação" - #~ msgid "Delete selected watchpoint?" #~ msgstr "Eliminar o ponto de observação seleccionado?" #~ msgid "Delete selected breakpoint?" #~ msgstr "Eliminar o ponto de paragem seleccionado?" -#~ msgid "Edit watchpoint" -#~ msgstr "Editar ponto de observação" - -#~ msgid "Edit breakpoint" -#~ msgstr "Editar ponto de paragem" - #~ msgid "Enabled" #~ msgstr "Activado" diff -Nru geany-plugins-1.23+dfsg/po/ru.po geany-plugins-1.24+dfsg/po/ru.po --- geany-plugins-1.23+dfsg/po/ru.po 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/po/ru.po 2014-04-12 14:28:39.000000000 +0000 @@ -3,14 +3,15 @@ # This file is distributed under the same license as the geany-plugins package. # Andrew Janke , 2009 # John Wehin , 2009 +# Pavel Roschin , 2014 # msgid "" msgstr "" -"Project-Id-Version: Geany-plugins 1.23\n" +"Project-Id-Version: Geany-plugins 1.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-23 14:32+0100\n" -"PO-Revision-Date: 2012-02-18 02:49+0300\n" -"Last-Translator: Alexander Petukhov \n" +"POT-Creation-Date: 2014-04-09 03:19+0000\n" +"PO-Revision-Date: 2014-04-10 20:29+0400\n" +"Last-Translator: Pavel Roschin \n" "Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" @@ -36,12 +37,12 @@ msgid "Contents" msgstr "Содержание" -#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:615 +#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:625 msgid "Bookmarks" msgstr "Закладки" #. complete update -#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2295 +#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2351 msgid "_Update" msgstr "_Обновить" @@ -75,19 +76,18 @@ msgstr "Задачи" #: ../addons/src/ao_tasks.c:542 -#, fuzzy msgid "Context:" -msgstr "Консоль:" +msgstr "Контекст:" -#: ../addons/src/ao_xmltagging.c:56 +#: ../addons/src/ao_xmltagging.c:54 msgid "XML tagging" msgstr "Вставка XML тегов" -#: ../addons/src/ao_xmltagging.c:67 +#: ../addons/src/ao_xmltagging.c:65 msgid "Tag name to be inserted:" msgstr "Имя тега для вставки:" -#: ../addons/src/ao_xmltagging.c:71 +#: ../addons/src/ao_xmltagging.c:69 #, c-format msgid "" "%s will be replaced with your current selection. Please keep care on your " @@ -106,20 +106,20 @@ #: ../addons/src/ao_wrapwords.c:249 msgid "Enclose Characters" -msgstr "" +msgstr "Завершение символов" #: ../addons/src/ao_wrapwords.c:260 #, c-format msgid "Enclose combo %d" -msgstr "" +msgstr "Пара символов %d" #: ../addons/src/ao_wrapwords.c:276 msgid "Opening Character" -msgstr "" +msgstr "Открывающий символ" #: ../addons/src/ao_wrapwords.c:283 msgid "Closing Character" -msgstr "" +msgstr "Закрывающий символ" #: ../addons/src/ao_doclist.c:207 msgid "Close Ot_her Documents" @@ -157,11 +157,12 @@ msgid "Run XML tagging" msgstr "Вставить XML теги по границам выделенного текста" -#: ../addons/src/addons.c:417 ../geanylatex/src/geanylatex.c:241 -#: ../geanyprj/src/geanyprj.c:174 ../geanysendmail/src/geanysendmail.c:121 -#: ../geanysendmail/src/geanysendmail.c:287 ../geanyvc/src/geanyvc.c:1798 +#: ../addons/src/addons.c:417 ../autoclose/src/autoclose.c:871 +#: ../geanylatex/src/geanylatex.c:241 ../geanyprj/src/geanyprj.c:174 +#: ../geanysendmail/src/geanysendmail.c:123 +#: ../geanysendmail/src/geanysendmail.c:291 ../geanyvc/src/geanyvc.c:1854 #: ../geniuspaste/src/geniuspaste.c:140 ../spellcheck/src/scplugin.c:146 -#: ../treebrowser/src/treebrowser.c:1880 +#: ../treebrowser/src/treebrowser.c:1935 #: ../updatechecker/src/updatechecker.c:253 msgid "Plugin configuration directory could not be created." msgstr "Каталог настроек плагина не может быть создан." @@ -196,7 +197,6 @@ "Сортировать документы в порядке расположения вкладок (обратный порядок)" #: ../addons/src/addons.c:488 -#, fuzzy msgid "Show an 'Open URI' item in the editor menu" msgstr "Добавить команды 'Открыть URI', 'Копировать URI' в меню редактора" @@ -246,11 +246,19 @@ #: ../addons/src/addons.c:560 msgid "Enclose selection on configurable keybindings" -msgstr "" +msgstr "Окружать выделение по горячей клавише" #: ../addons/src/addons.c:572 msgid "Enclose selection automatically (without having to press a keybinding)" -msgstr "" +msgstr "Окружать выделение автоматически (без горячих клавиш)" + +#: ../autoclose/src/autoclose.c:50 +msgid "Auto-close" +msgstr "Автозавершение" + +#: ../autoclose/src/autoclose.c:51 +msgid "Auto-close braces and brackets with lot of features" +msgstr "Многофункциональное автозавершение скобок и кавычек" #: ../codenav/src/codenavigation.c:52 msgid "Code navigation" @@ -300,18 +308,16 @@ msgstr "Расширения файлов реализации" #: ../commander/src/commander-plugin.c:39 -#, fuzzy msgid "Commander" -msgstr "Команда 0:" +msgstr "Командир" #: ../commander/src/commander-plugin.c:40 msgid "Provides a command panel for quick access to actions, files and more" -msgstr "" +msgstr "Командная панель быстрого доступа к действиям, файлам и другое" #: ../commander/src/commander-plugin.c:686 -#, fuzzy msgid "Show Command Panel" -msgstr "Команда 0:" +msgstr "Показать командную панель" #: ../debugger/src/plugin.c:56 msgid "Debugger" @@ -321,8 +327,8 @@ msgid "Various debuggers integration." msgstr "Поддержка отладчиков." -#: ../debugger/src/plugin.c:131 ../debugger/src/keys.c:76 -#: ../scope/data/scope.glade.h:125 ../scope/src/scope.c:225 +#: ../debugger/src/plugin.c:133 ../debugger/src/keys.c:76 +#: ../scope/data/scope.glade.h:124 ../scope/src/scope.c:226 msgid "Debug" msgstr "Отладка" @@ -390,18 +396,17 @@ msgstr "Программа получила сигнал:" #: ../debugger/src/dbm_gdb.c:563 -#, fuzzy, c-format +#, c-format msgid "Program exited with code \"%i\"" -msgstr "Программа завершилась с кодом %d [%s].\n" +msgstr "Программа завершилась с кодом \"%i\"" #: ../debugger/src/dbm_gdb.c:735 msgid "Failed to spawn gdb process" msgstr "Ошибка запуска GDB" #: ../debugger/src/dbm_gdb.c:782 -#, fuzzy msgid "~\"Loading target file.\\n\"" -msgstr "Выберите файл" +msgstr "~\"Загрузка файла.\\n\"" #: ../debugger/src/dbm_gdb.c:782 msgid "Error loading file" @@ -431,11 +436,11 @@ #: ../debugger/src/stree.c:140 msgid "Active frame" -msgstr "" +msgstr "Активный фрейм" #: ../debugger/src/stree.c:140 msgid "Click an arrow to switch to a frame" -msgstr "" +msgstr "Щёлкните по стрелке, чтобы переключить фрейм" #: ../debugger/src/stree.c:363 ../geanylatex/src/bibtexlabels.c:46 msgid "Address" @@ -457,7 +462,7 @@ msgid "Target" msgstr "Цель" -#: ../debugger/src/tabs.c:135 ../scope/data/scope.glade.h:69 +#: ../debugger/src/tabs.c:135 ../scope/src/scope.c:524 msgid "Breakpoints" msgstr "Точки останова" @@ -494,22 +499,22 @@ msgstr "Перезапустить" #: ../debugger/src/keys.c:52 ../debugger/src/btnpanel.c:113 -#: ../scope/src/scope.c:67 +#: ../scope/src/scope.c:66 msgid "Step into" msgstr "Шаг в" #: ../debugger/src/keys.c:53 ../debugger/src/btnpanel.c:110 -#: ../scope/src/scope.c:68 +#: ../scope/src/scope.c:67 msgid "Step over" msgstr "Шаг через" #: ../debugger/src/keys.c:54 ../debugger/src/btnpanel.c:122 -#: ../scope/src/scope.c:69 +#: ../scope/src/scope.c:68 msgid "Step out" msgstr "Шаг из" #: ../debugger/src/keys.c:55 ../debugger/src/btnpanel.c:125 -#: ../scope/src/scope.c:65 +#: ../scope/src/scope.c:64 msgid "Run to cursor" msgstr "Выполнить до позиции курсора" @@ -518,7 +523,7 @@ msgstr "Добавить / Удалить точку останова" #: ../debugger/src/keys.c:57 -msgid "Jump to the currect instruction" +msgid "Jump to the current instruction" msgstr "Перейти к текущей инструкции" #: ../debugger/src/watch_model.c:220 @@ -549,6 +554,14 @@ msgid "Save debug session data to a project" msgstr "Сохранять данные отладки в проект" +#: ../defineformat/src/defineformat.c:56 +msgid "Define formatter" +msgstr "Форматирование макросов" + +#: ../defineformat/src/defineformat.c:57 +msgid "Automatically align backslash in multi-line defines" +msgstr "Автоматически выравнивает обратный слеш в макросах" + #. never search for more than this many chars #: ../devhelp/src/dhp.h:38 msgid "Documentation" @@ -653,295 +666,282 @@ #. i18n: Please don't translate "Devhelp". #: ../devhelp/devhelp/dh-assistant.c:74 msgid "Devhelp — Assistant" -msgstr "" +msgstr "Devhelp — помощник" #: ../devhelp/devhelp/dh-assistant-view.c:336 msgid "Book:" -msgstr "" +msgstr "Книга:" #. i18n: a documentation book #: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1760 msgid "Book" -msgstr "" +msgstr "Книга" #. i18n: a "page" in a documentation book #: ../devhelp/devhelp/dh-link.c:258 msgid "Page" -msgstr "" +msgstr "Страница" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc #: ../devhelp/devhelp/dh-link.c:262 msgid "Keyword" -msgstr "" +msgstr "Ключевое слово" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. #: ../devhelp/devhelp/dh-link.c:272 msgid "Struct" -msgstr "" +msgstr "Структура" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. #: ../devhelp/devhelp/dh-link.c:277 -#, fuzzy msgid "Macro" -msgstr "Макросы" +msgstr "Макрос" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. #: ../devhelp/devhelp/dh-link.c:282 msgid "Enum" -msgstr "" +msgstr "Перечисление" #: ../devhelp/devhelp/dh-parser.c:91 ../devhelp/devhelp/dh-parser.c:185 #: ../devhelp/devhelp/dh-parser.c:249 ../devhelp/devhelp/dh-parser.c:259 #, c-format msgid "Expected '%s', got '%s' at line %d, column %d" -msgstr "" +msgstr "Ожидается: '%s', присутствует '%s' в строке %d, позиция %d" #: ../devhelp/devhelp/dh-parser.c:108 #, c-format msgid "Invalid namespace '%s' at line %d, column %d" -msgstr "" +msgstr "Некорректное адресное пространство '%s' в строке %d, позиция %d" #: ../devhelp/devhelp/dh-parser.c:136 #, c-format msgid "" "\"title\", \"name\" and \"link\" elements are required at line %d, column %d" msgstr "" +"элементы \"title\", \"name\" и \"link\" нужны в строке %d, позиция %d" #: ../devhelp/devhelp/dh-parser.c:204 #, c-format msgid "" "\"name\" and \"link\" elements are required inside on line %d, column " "%d" -msgstr "" +msgstr "элементы \"name\" и \"link\" нужны внутри в строке %d, позиция %d" #: ../devhelp/devhelp/dh-parser.c:284 #, c-format msgid "" "\"name\" and \"link\" elements are required inside '%s' on line %d, column %d" msgstr "" +"элементы \"name\" и \"link\" нужны внутри '%s' в строке %d, позиция %d" #: ../devhelp/devhelp/dh-parser.c:297 #, c-format msgid "\"type\" element is required inside on line %d, column %d" -msgstr "" +msgstr "элемент \"type\" нужен внутри в строке %d, позиция %d" #: ../devhelp/devhelp/dh-parser.c:500 #, c-format msgid "Cannot uncompress book '%s': %s" -msgstr "" +msgstr "Невозможно распаковать книгу '%s': %s" #: ../devhelp/devhelp/dh-search.c:498 msgid "All books" -msgstr "" +msgstr "Все книги" #: ../devhelp/devhelp/dh-search.c:620 -#, fuzzy msgid "Search in:" -msgstr "Искать внутри:" +msgstr "Искать в:" #: ../devhelp/devhelp/dh-window.c:98 msgid "50%" -msgstr "" +msgstr "50%" #: ../devhelp/devhelp/dh-window.c:99 msgid "75%" -msgstr "" +msgstr "75%" #: ../devhelp/devhelp/dh-window.c:100 msgid "100%" -msgstr "" +msgstr "100%" #: ../devhelp/devhelp/dh-window.c:101 msgid "125%" -msgstr "" +msgstr "125%" #: ../devhelp/devhelp/dh-window.c:102 msgid "150%" -msgstr "" +msgstr "150%" #: ../devhelp/devhelp/dh-window.c:103 msgid "175%" -msgstr "" +msgstr "175%" #: ../devhelp/devhelp/dh-window.c:104 msgid "200%" -msgstr "" +msgstr "200%" #: ../devhelp/devhelp/dh-window.c:105 msgid "300%" -msgstr "" +msgstr "300%" #: ../devhelp/devhelp/dh-window.c:106 msgid "400%" -msgstr "" +msgstr "400%" #: ../devhelp/devhelp/dh-window.c:722 msgid "translator_credits" -msgstr "" +msgstr "translator_credits" #: ../devhelp/devhelp/dh-window.c:729 msgid "A developers' help browser for GNOME" -msgstr "" +msgstr "Просмотр документации для разработчиков" -#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2010 +#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2066 msgid "_File" msgstr "_Файл" -#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1815 -#: ../geanymacro/src/geanymacro.c:2112 +#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1822 +#: ../geanymacro/src/geanymacro.c:2118 msgid "_Edit" -msgstr "" +msgstr "_Правка" #: ../devhelp/devhelp/dh-window.c:761 msgid "_View" -msgstr "" +msgstr "_Вид" #: ../devhelp/devhelp/dh-window.c:762 msgid "_Go" -msgstr "" +msgstr "_Перейти" #: ../devhelp/devhelp/dh-window.c:763 msgid "_Help" -msgstr "" +msgstr "_Справка" #. File menu #: ../devhelp/devhelp/dh-window.c:766 -#, fuzzy msgid "_New Window" -msgstr "Окна" +msgstr "Новое окно" #: ../devhelp/devhelp/dh-window.c:768 msgid "New _Tab" -msgstr "" +msgstr "Новая вкладка" #: ../devhelp/devhelp/dh-window.c:770 msgid "_Print…" -msgstr "" +msgstr "Печать…" #: ../devhelp/devhelp/dh-window.c:782 ../devhelp/devhelp/eggfindbar.c:342 -#, fuzzy msgid "Find Next" -msgstr "Найти файл" +msgstr "Найти следующее" #: ../devhelp/devhelp/dh-window.c:784 ../devhelp/devhelp/eggfindbar.c:329 -#, fuzzy msgid "Find Previous" -msgstr "Найти файл проекта" +msgstr "Найти предыдущее" #: ../devhelp/devhelp/dh-window.c:791 -#, fuzzy msgid "Go to the previous page" -msgstr "Вернуться к предыдущему диалогу" +msgstr "Перейти к предыдущей странице" #: ../devhelp/devhelp/dh-window.c:794 -#, fuzzy msgid "Go to the next page" -msgstr "Перейти на одну страницу вперёд" +msgstr "Перейти к следующей странице" #: ../devhelp/devhelp/dh-window.c:797 -#, fuzzy msgid "_Contents Tab" -msgstr "Содержание" +msgstr "Вкладка содержания" #: ../devhelp/devhelp/dh-window.c:800 -#, fuzzy msgid "_Search Tab" -msgstr "Поиск" +msgstr "Вкладка поиска" #. View menu #: ../devhelp/devhelp/dh-window.c:804 msgid "_Larger Text" -msgstr "" +msgstr "Увеличить текст" #: ../devhelp/devhelp/dh-window.c:805 msgid "Increase the text size" -msgstr "" +msgstr "Увеличить размер текста" #: ../devhelp/devhelp/dh-window.c:807 msgid "S_maller Text" -msgstr "" +msgstr "Уменьшить текст" #: ../devhelp/devhelp/dh-window.c:808 msgid "Decrease the text size" -msgstr "" +msgstr "Уменьшить размер текста" #: ../devhelp/devhelp/dh-window.c:810 msgid "_Normal Size" -msgstr "" +msgstr "Нормальный размер" #: ../devhelp/devhelp/dh-window.c:811 msgid "Use the normal text size" -msgstr "" +msgstr "Использовать нормальный размер текста" #: ../devhelp/devhelp/dh-window.c:820 msgid "Leave fullscreen mode" -msgstr "" +msgstr "Покинуть полноэкранный режим" #: ../devhelp/devhelp/dh-window.c:827 msgid "Display in full screen" -msgstr "" +msgstr "На полный экран" #. Translators: This refers to text size #: ../devhelp/devhelp/dh-window.c:947 -#, fuzzy msgid "Larger" -msgstr "Цель" +msgstr "Увеличить" #. Translators: This refers to text size #: ../devhelp/devhelp/dh-window.c:950 msgid "Smaller" -msgstr "" +msgstr "Уменьшить" #. i18n: please don't translate #. * "Devhelp", it's a name, not a #. * generic word. #: ../devhelp/devhelp/dh-window.c:1095 -#, fuzzy msgid "About Devhelp" -msgstr "Devhelp" +msgstr "О Devhelp" #: ../devhelp/devhelp/dh-window.c:1100 -#, fuzzy msgid "Preferences…" -msgstr "Настройки" +msgstr "Настройки…" #: ../devhelp/devhelp/dh-window.c:1330 msgid "Error opening the requested link." -msgstr "" +msgstr "Ошибка при открытии указанной ссылки." #: ../devhelp/devhelp/dh-window.c:1649 ../devhelp/devhelp/dh-window.c:1891 -#, fuzzy msgid "Empty Page" -msgstr "Пустые элементы" +msgstr "Пустая страница" #: ../devhelp/devhelp/eggfindbar.c:320 msgid "Find:" -msgstr "" +msgstr "Найти:" #: ../devhelp/devhelp/eggfindbar.c:333 ../devhelp/devhelp/eggfindbar.c:336 msgid "Find previous occurrence of the search string" -msgstr "" +msgstr "Найти предыдущее вхождение строки" #: ../devhelp/devhelp/eggfindbar.c:346 ../devhelp/devhelp/eggfindbar.c:349 msgid "Find next occurrence of the search string" -msgstr "" +msgstr "Найти следующее вхождение строки" #: ../devhelp/devhelp/eggfindbar.c:358 -#, fuzzy msgid "C_ase Sensitive" msgstr "С учётом регистра" #: ../devhelp/devhelp/eggfindbar.c:362 ../devhelp/devhelp/eggfindbar.c:365 -#, fuzzy msgid "Toggle case sensitive search" -msgstr "Переключиться на вкладку поиска в боковой панели" +msgstr "Переключить поиск с учётом регистра" #. All plugins must set name, description, version and author. #: ../geanydoc/src/geanydoc.c:50 ../geanydoc/src/geanydoc.c:347 @@ -988,55 +988,63 @@ msgid "Column mode, select to line / brace / anchor." msgstr "Режим выделения по столбцам, выделение до строки / скобки / анкера." -#: ../geanyextrasel/src/extrasel.c:482 +#: ../geanyextrasel/src/extrasel.c:502 msgid "E_xtra Selection" -msgstr "Расширенное выделение" +msgstr "_Расширенное выделение" -#: ../geanyextrasel/src/extrasel.c:489 +#: ../geanyextrasel/src/extrasel.c:509 msgid "_Column Mode" -msgstr "Режим выделения по столбцам" +msgstr "Режим выделения по _столбцам" -#: ../geanyextrasel/src/extrasel.c:494 +#: ../geanyextrasel/src/extrasel.c:514 msgid "Column mode" msgstr "Режим выделения по столбцам" -#: ../geanyextrasel/src/extrasel.c:496 +#: ../geanyextrasel/src/extrasel.c:516 msgid "Select to _Line" msgstr "Выделить до строки" -#: ../geanyextrasel/src/extrasel.c:500 +#: ../geanyextrasel/src/extrasel.c:520 msgid "Select to line" msgstr "Выделить до строки" -#: ../geanyextrasel/src/extrasel.c:502 +#: ../geanyextrasel/src/extrasel.c:522 msgid "Select to Matching _Brace" msgstr "Выделить до парной скобки" -#: ../geanyextrasel/src/extrasel.c:506 +#: ../geanyextrasel/src/extrasel.c:526 msgid "Select to matching brace" msgstr "Выделить до парной скобки" -#: ../geanyextrasel/src/extrasel.c:510 +#: ../geanyextrasel/src/extrasel.c:528 +msgid "_Toggle Stream/Rectangular" +msgstr "Переключить _обычное/прямоугольное" + +#: ../geanyextrasel/src/extrasel.c:532 +msgid "Convert selection" +msgstr "Конвертировать выделение" + +#: ../geanyextrasel/src/extrasel.c:537 msgid "_Set Anchor" -msgstr "Установить анкер" +msgstr "_Установить анкер" -#: ../geanyextrasel/src/extrasel.c:514 +#: ../geanyextrasel/src/extrasel.c:541 msgid "Set anchor" msgstr "Установить анкер" -#: ../geanyextrasel/src/extrasel.c:516 +#: ../geanyextrasel/src/extrasel.c:543 msgid "Select to _Anchor" -msgstr "Выделить до анкера" +msgstr "_Выделить до анкера" -#: ../geanyextrasel/src/extrasel.c:520 +#: ../geanyextrasel/src/extrasel.c:547 msgid "Select to anchor" msgstr "Выделить до анкера" -#: ../geanyextrasel/src/extrasel.c:522 +#: ../geanyextrasel/src/extrasel.c:549 msgid "_Rectangle Select to Anchor" -msgstr "Прямоугольное выделение до анкера" +msgstr "_Прямоугольное выделение до анкера" -#: ../geanyextrasel/src/extrasel.c:527 +#: ../geanyextrasel/src/extrasel.c:554 msgid "Rectangle select to anchor" msgstr "Прямоугольное выделение до анкера" @@ -1443,78 +1451,78 @@ msgid "Default documentation type for languages that does not have one set" msgstr "Тип конфигурации по умолчанию для языков для которых тип не задан" -#: ../geanyinsertnum/src/insertnum.c:37 ../geanyinsertnum/src/insertnum.c:329 -#: ../geanyinsertnum/src/insertnum.c:461 +#: ../geanyinsertnum/src/insertnum.c:44 ../geanyinsertnum/src/insertnum.c:337 +#: ../geanyinsertnum/src/insertnum.c:484 msgid "Insert Numbers" msgstr "Вставка чисел" -#: ../geanyinsertnum/src/insertnum.c:37 +#: ../geanyinsertnum/src/insertnum.c:44 msgid "Insert/Fill columns with numbers." msgstr "Заполняет выделенные столбцы числами" -#: ../geanyinsertnum/src/insertnum.c:140 +#: ../geanyinsertnum/src/insertnum.c:146 msgid "Counting..." msgstr "Подчёт..." -#: ../geanyinsertnum/src/insertnum.c:188 +#: ../geanyinsertnum/src/insertnum.c:194 msgid "Preparing..." msgstr "Подготовка..." -#: ../geanyinsertnum/src/insertnum.c:194 +#: ../geanyinsertnum/src/insertnum.c:200 msgid "Inserting..." msgstr "Вставка..." -#: ../geanyinsertnum/src/insertnum.c:318 +#: ../geanyinsertnum/src/insertnum.c:333 msgid "For base 11 and above" msgstr "Для основания 11 и выше" -#: ../geanyinsertnum/src/insertnum.c:341 +#: ../geanyinsertnum/src/insertnum.c:353 msgid "_Start:" msgstr "Старт:" -#: ../geanyinsertnum/src/insertnum.c:346 +#: ../geanyinsertnum/src/insertnum.c:358 msgid "S_tep:" msgstr "Шаг:" -#: ../geanyinsertnum/src/insertnum.c:352 +#: ../geanyinsertnum/src/insertnum.c:364 msgid "_Base:" msgstr "Основание:" -#: ../geanyinsertnum/src/insertnum.c:363 +#: ../geanyinsertnum/src/insertnum.c:380 msgid "Letters:" msgstr "Регистр букв:" -#: ../geanyinsertnum/src/insertnum.c:366 +#: ../geanyinsertnum/src/insertnum.c:383 msgid "_Upper" msgstr "Верхний" -#: ../geanyinsertnum/src/insertnum.c:371 +#: ../geanyinsertnum/src/insertnum.c:388 msgid "_Lower" msgstr "Нижний" -#: ../geanyinsertnum/src/insertnum.c:376 +#: ../geanyinsertnum/src/insertnum.c:393 msgid "Base _prefix" msgstr "Префикс" -#: ../geanyinsertnum/src/insertnum.c:378 +#: ../geanyinsertnum/src/insertnum.c:395 msgid "0 for octal, 0x for hex, + for positive decimal" msgstr "" "0 для восьмеричных, 0x для шестнадцатеричных, + для положительных десятичных " "чисел" -#: ../geanyinsertnum/src/insertnum.c:380 +#: ../geanyinsertnum/src/insertnum.c:397 msgid "Padding:" msgstr "Отступ:" -#: ../geanyinsertnum/src/insertnum.c:382 +#: ../geanyinsertnum/src/insertnum.c:399 msgid "Sp_ace" msgstr "Пробел" -#: ../geanyinsertnum/src/insertnum.c:385 +#: ../geanyinsertnum/src/insertnum.c:402 msgid "_Zero" msgstr "Ничего" -#: ../geanyinsertnum/src/insertnum.c:454 +#: ../geanyinsertnum/src/insertnum.c:477 msgid "Insert _Numbers" msgstr "Вставить числа" @@ -1524,29 +1532,27 @@ #: ../geanylatex/src/latexenvironments.c:26 msgid "Formating" -msgstr "" +msgstr "Форматирование" #: ../geanylatex/src/latexenvironments.c:27 -#, fuzzy msgid "Document Structure" -msgstr "Интерактивная документация" +msgstr "Структура документа" #: ../geanylatex/src/latexenvironments.c:28 msgid "Lists" -msgstr "" +msgstr "Списки" #: ../geanylatex/src/latexenvironments.c:29 msgid "Math" -msgstr "" +msgstr "Математика" #: ../geanylatex/src/latexenvironments.c:194 msgid "Insert Environment" -msgstr "" +msgstr "Вставить окружение" #: ../geanylatex/src/latexenvironments.c:208 -#, fuzzy msgid "Environment:" -msgstr "_Окружение" +msgstr "Окружение:" #: ../geanylatex/src/latexutils.c:87 #, c-format @@ -1554,500 +1560,494 @@ "Could not determine where to insert package: %s\n" "Please try insert package manually" msgstr "" +"Не удалось определить, куда вставить пакет: %s\n" +"Попробуйте вставить пакет вручную" #: ../geanylatex/src/latexutils.c:89 #, c-format msgid "Could not determine where to insert package: %s" -msgstr "" +msgstr "Не удалось определить, куда вставить пакет: %s" #: ../geanylatex/src/bibtexlabels.c:27 msgid "Article (@Article)" -msgstr "" +msgstr "Статья (@Article)" #: ../geanylatex/src/bibtexlabels.c:28 msgid "Book (@Book)" -msgstr "" +msgstr "Книга (@Book)" #: ../geanylatex/src/bibtexlabels.c:29 msgid "Booklet (@Booklet)" -msgstr "" +msgstr "Буклет (@Booklet)" #: ../geanylatex/src/bibtexlabels.c:30 msgid "Conference (@Conference)" -msgstr "" +msgstr "Конференция (@Conference)" #: ../geanylatex/src/bibtexlabels.c:31 msgid "Inbook (@Inbook)" -msgstr "" +msgstr "В книге (@Inbook)" #: ../geanylatex/src/bibtexlabels.c:32 msgid "Incollection (@Incollection)" -msgstr "" +msgstr "В сборнике (@Incollection)" #: ../geanylatex/src/bibtexlabels.c:33 msgid "Inproceedings (@Inproceedings)" -msgstr "" +msgstr "В документе конференции (@Inproceedings)" #: ../geanylatex/src/bibtexlabels.c:34 msgid "Manual (@Manual)" -msgstr "" +msgstr "Руководство (@Manual)" #: ../geanylatex/src/bibtexlabels.c:35 msgid "Mastersthesis (@Mastersthesis)" -msgstr "" +msgstr "Диссертация магистра (@Mastersthesis)" #: ../geanylatex/src/bibtexlabels.c:36 msgid "Misc (@Misc)" -msgstr "" +msgstr "Другое (@Misc)" #: ../geanylatex/src/bibtexlabels.c:37 msgid "PhdThesis (@PhdThesis)" -msgstr "" +msgstr "Диссертация кандидата (@PhdThesis)" #: ../geanylatex/src/bibtexlabels.c:38 msgid "Proceedings (@Proceedings)" -msgstr "" +msgstr "Документ конференции (@Proceedings)" #: ../geanylatex/src/bibtexlabels.c:39 msgid "Techreport (@Techreport)" -msgstr "" +msgstr "Технический отчёт (@Techreport)" #: ../geanylatex/src/bibtexlabels.c:40 msgid "Unpublished (@Unpublished)" -msgstr "" +msgstr "Неизданное (@Unpublished)" #: ../geanylatex/src/bibtexlabels.c:47 msgid "Annote" -msgstr "" +msgstr "Аннотация" #: ../geanylatex/src/bibtexlabels.c:48 msgid "Author" -msgstr "" +msgstr "Автор" #: ../geanylatex/src/bibtexlabels.c:49 msgid "Booktitle" -msgstr "" +msgstr "Название книги" #: ../geanylatex/src/bibtexlabels.c:50 msgid "Chapter" -msgstr "" +msgstr "Глава" #: ../geanylatex/src/bibtexlabels.c:51 msgid "Crossref" -msgstr "" +msgstr "Ссылка" #: ../geanylatex/src/bibtexlabels.c:52 msgid "Edition" -msgstr "" +msgstr "Издание" #: ../geanylatex/src/bibtexlabels.c:53 msgid "Editor" -msgstr "" +msgstr "Редактор" #: ../geanylatex/src/bibtexlabels.c:54 msgid "E-print" -msgstr "" +msgstr "Электронная версия" #: ../geanylatex/src/bibtexlabels.c:55 msgid "HowPublished" -msgstr "" +msgstr "Способ публикации" #: ../geanylatex/src/bibtexlabels.c:56 msgid "Institution" -msgstr "" +msgstr "Институт" #: ../geanylatex/src/bibtexlabels.c:57 msgid "Journal" -msgstr "" +msgstr "Журнал" #: ../geanylatex/src/bibtexlabels.c:58 msgid "Key" -msgstr "" +msgstr "Ключ" #: ../geanylatex/src/bibtexlabels.c:59 msgid "Month" -msgstr "" +msgstr "Месяц" #: ../geanylatex/src/bibtexlabels.c:60 msgid "Note" -msgstr "" +msgstr "Заметка" #: ../geanylatex/src/bibtexlabels.c:61 msgid "Number" -msgstr "" +msgstr "Номер" #: ../geanylatex/src/bibtexlabels.c:62 msgid "Organization" -msgstr "" +msgstr "Организация" #: ../geanylatex/src/bibtexlabels.c:63 msgid "Pages" -msgstr "" +msgstr "Страницы" #: ../geanylatex/src/bibtexlabels.c:64 msgid "Publisher" -msgstr "" +msgstr "Издатель" #: ../geanylatex/src/bibtexlabels.c:65 msgid "School" -msgstr "" +msgstr "Институт (место защиты)" #: ../geanylatex/src/bibtexlabels.c:66 msgid "Series" -msgstr "" +msgstr "Серия" #: ../geanylatex/src/bibtexlabels.c:67 msgid "Title" -msgstr "" +msgstr "Название" #: ../geanylatex/src/bibtexlabels.c:69 msgid "URL" -msgstr "" +msgstr "Электронный адрес" #: ../geanylatex/src/bibtexlabels.c:70 msgid "Volume" -msgstr "" +msgstr "Том" #: ../geanylatex/src/bibtexlabels.c:71 -#, fuzzy msgid "Year" -msgstr "О_чистить" +msgstr "Год" #: ../geanylatex/src/bibtexlabels.c:103 msgid "Address of publisher" -msgstr "" +msgstr "Адрес издательства" #: ../geanylatex/src/bibtexlabels.c:104 msgid "Annotation for annotated bibliography styles" -msgstr "" +msgstr "Аннотация для стилей с аннотацией" #: ../geanylatex/src/bibtexlabels.c:105 msgid "Name(s) of the author(s), separated by 'and' if more than one" -msgstr "" +msgstr "Имена авторов, разделенные 'and' (если больше одного)" #: ../geanylatex/src/bibtexlabels.c:106 msgid "Title of the book, if only part of it is being cited" -msgstr "" +msgstr "Название книги, если цитируется только её часть" #: ../geanylatex/src/bibtexlabels.c:107 msgid "Chapter number" -msgstr "" +msgstr "Номер главы" #: ../geanylatex/src/bibtexlabels.c:108 msgid "Citation key of the cross-referenced entry" -msgstr "" +msgstr "Ключ цитируемой записи" #: ../geanylatex/src/bibtexlabels.c:109 msgid "Edition of the book (such as \"first\" or \"second\")" -msgstr "" +msgstr "Издание книги (например, \"первое\" или \"второе\")" #: ../geanylatex/src/bibtexlabels.c:110 msgid "Name(s) of the editor(s), separated by 'and' if more than one" -msgstr "" +msgstr "Имена редакторов, разделенные 'and' (если больше одного)" #: ../geanylatex/src/bibtexlabels.c:111 msgid "Specification of electronic publication" -msgstr "" +msgstr "Спецификация электронного издания" #: ../geanylatex/src/bibtexlabels.c:112 msgid "Publishing method if the method is nonstandard" -msgstr "" +msgstr "Способ публикации, если нестандартный" #: ../geanylatex/src/bibtexlabels.c:113 msgid "Institution that was involved in the publishing" -msgstr "" +msgstr "Институт, вовлечённый в публикацию, необязательно издатель" #: ../geanylatex/src/bibtexlabels.c:114 msgid "Journal or magazine in which the work was published" -msgstr "" +msgstr "Название журнала, содержащего статью" #: ../geanylatex/src/bibtexlabels.c:115 msgid "" "Hidden field used for specifying or overriding the alphabetical order of " "entries" msgstr "" +"Скрытое ключевое поле, задающее порядок сортировки" #: ../geanylatex/src/bibtexlabels.c:116 msgid "Month of publication or creation if unpublished" -msgstr "" +msgstr "Месяц публикации (если не опубликовано - создания)" #: ../geanylatex/src/bibtexlabels.c:117 msgid "Miscellaneous extra information" -msgstr "" +msgstr "Любая дополнительная информация" #: ../geanylatex/src/bibtexlabels.c:118 msgid "Number of journal, magazine, or tech-report" -msgstr "" +msgstr "Номер журнала или отчёта" #: ../geanylatex/src/bibtexlabels.c:119 msgid "Sponsor of the conference" -msgstr "" +msgstr "Спонсор конференции" #: ../geanylatex/src/bibtexlabels.c:120 msgid "Page numbers separated by commas or double-hyphens" -msgstr "" +msgstr "Номера страниц, разделённые запятыми или двойными дефисами" #: ../geanylatex/src/bibtexlabels.c:121 msgid "Name of publisher" -msgstr "" +msgstr "Наименование издательства" #: ../geanylatex/src/bibtexlabels.c:122 msgid "School where thesis was written" -msgstr "" +msgstr "Институт, в котором защищалась диссертация" #: ../geanylatex/src/bibtexlabels.c:123 msgid "Series of books in which the book was published" -msgstr "" +msgstr "Серия, в которой вышла книга" #: ../geanylatex/src/bibtexlabels.c:124 msgid "Title of the work" -msgstr "" +msgstr "Название работы" #: ../geanylatex/src/bibtexlabels.c:125 msgid "Type of technical report" -msgstr "" +msgstr "Тип отчёта" #: ../geanylatex/src/bibtexlabels.c:126 msgid "Internet address" -msgstr "" +msgstr "Электронный www-адрес в сети" #: ../geanylatex/src/bibtexlabels.c:127 msgid "Number of the volume" -msgstr "" +msgstr "Номер тома" #: ../geanylatex/src/bibtexlabels.c:128 msgid "Year of publication or creation if unpublished" -msgstr "" +msgstr "Год публикации (если не опубликовано - создания)" #: ../geanylatex/src/geanylatex.c:41 msgid "GeanyLaTeX" -msgstr "" +msgstr "GeanyLaTeX" #: ../geanylatex/src/geanylatex.c:42 msgid "Plugin to provide better LaTeX support" -msgstr "" +msgstr "Улучшенная поддержка LaTeX" #: ../geanylatex/src/geanylatex.c:116 msgid "Runs LaTeX wizard" -msgstr "" +msgstr "Запустить мастер LaTeX" #: ../geanylatex/src/geanylatex.c:117 msgid "Marks selected text as italic" -msgstr "" +msgstr "Пометить выделенный текст курсивом" #: ../geanylatex/src/geanylatex.c:118 msgid "Marks selected text as bold" -msgstr "" +msgstr "Пометить выделенный текст полужирным" #: ../geanylatex/src/geanylatex.c:119 msgid "Underlines selected text" -msgstr "" +msgstr "Пометить выделенный текст подчёркиванием" #: ../geanylatex/src/geanylatex.c:120 ../geanylatex/src/formatpatterns.c:45 msgid "Centered" -msgstr "" +msgstr "Выравнивание по центру" #: ../geanylatex/src/geanylatex.c:121 ../geanylatex/src/formatpatterns.c:46 msgid "Left side oriented" -msgstr "" +msgstr "Выравнивание по левому краю" #: ../geanylatex/src/geanylatex.c:122 ../geanylatex/src/formatpatterns.c:47 msgid "Right side oriented" -msgstr "" +msgstr "Выравнивание по правому краю" #: ../geanylatex/src/geanylatex.c:298 msgid "Use KOMA script by default" -msgstr "" +msgstr "Использовать KOMA script по умолчанию" #: ../geanylatex/src/geanylatex.c:300 msgid "Show extra plugin toolbar" -msgstr "" +msgstr "Показать дополнительную панель инструментов" #: ../geanylatex/src/geanylatex.c:302 msgid "Capitalize sentence on typing" -msgstr "" +msgstr "Начинать предложение с заглавной буквы по время набора" #: ../geanylatex/src/geanylatex.c:304 msgid "Add a wizard icon to Geany's main toolbar" -msgstr "" +msgstr "Добавить иконку мастера на главную панель Geany" #: ../geanylatex/src/geanylatex.c:306 msgid "Lower selection when formating smallcaps (\\textsc{})" -msgstr "" +msgstr "Выделение в нижний регистр для капители (\\textsc{})" #: ../geanylatex/src/geanylatex.c:310 msgid "Don't care about this inside plugin" -msgstr "" +msgstr "Не изменять" #: ../geanylatex/src/geanylatex.c:312 msgid "Always perform autocompletion on LaTeX" -msgstr "" +msgstr "Всегда выполнять автодополнение в LaTeX" #: ../geanylatex/src/geanylatex.c:325 msgid "Modus of autocompletion" -msgstr "" +msgstr "Способ автодополнения" #: ../geanylatex/src/geanylatex.c:809 msgid "Insert Label" -msgstr "" +msgstr "Вставить метку" #: ../geanylatex/src/geanylatex.c:811 msgid "Label name:" -msgstr "" +msgstr "Название метки:" #: ../geanylatex/src/geanylatex.c:833 msgid "Insert Command" -msgstr "" +msgstr "Вставить команду" #: ../geanylatex/src/geanylatex.c:835 -#, fuzzy msgid "Command name:" -msgstr "Команда 0:" +msgstr "Название команды:" #: ../geanylatex/src/geanylatex.c:878 -#, fuzzy msgid "Insert Reference" -msgstr "Настройки" +msgstr "Вставить ссылку" #: ../geanylatex/src/geanylatex.c:891 -#, fuzzy msgid "Reference name:" -msgstr "Настройки" +msgstr "Имя ссылки:" #: ../geanylatex/src/geanylatex.c:916 -#, fuzzy msgid "_Standard Reference" -msgstr "Настройки" +msgstr "_Обычная ссылка" #: ../geanylatex/src/geanylatex.c:921 -#, fuzzy msgid "_Page Reference" -msgstr "Настройки" +msgstr "Ссылка на _страницу" #: ../geanylatex/src/geanylatex.c:926 -#, fuzzy msgid "_Add both" -msgstr "Добавить точку останова" +msgstr "_И то и другое" #: ../geanylatex/src/geanylatex.c:1123 msgid "More" -msgstr "" +msgstr "Дополнительно" #: ../geanylatex/src/geanylatex.c:1179 msgid "Add additional package" -msgstr "" +msgstr "Добавить пакет" #: ../geanylatex/src/geanylatex.c:1192 msgid "Package name:" -msgstr "" +msgstr "Имя пакета:" #: ../geanylatex/src/geanylatex.c:1195 msgid "Package options:" -msgstr "" +msgstr "Параметры пакета:" #: ../geanylatex/src/geanylatex.c:1243 -#, fuzzy msgid "Insert BibTeX Reference" -msgstr "Настройки" +msgstr "Вставить ссылку BibTeX" #: ../geanylatex/src/geanylatex.c:1256 -#, fuzzy msgid "BibTeX reference name:" -msgstr "Настройки" +msgstr "Имя ссылки BibTeX" #: ../geanylatex/src/geanylatex.c:1680 msgid "Dear Sir or Madame" -msgstr "" +msgstr "Уважаемый(ая)" #: ../geanylatex/src/geanylatex.c:1681 msgid "With kind regards" -msgstr "" +msgstr "С наилучшими пожеланиями" #: ../geanylatex/src/geanylatex.c:1689 msgid "No template assigned. Aborting" -msgstr "" +msgstr "Не задан шаблон. Операция прервана" #. Building the wizard-dialog and showing it #: ../geanylatex/src/geanylatex.c:1716 msgid "LaTeX-Wizard" -msgstr "" +msgstr "Мастер LaTeX" #. Templates #. * Adds custom templates if there are any. If there are none just #. * adds default one #. TEMPLATE FILE -#: ../geanylatex/src/geanylatex.c:1731 ../markdown/src/conf.c:666 +#: ../geanylatex/src/geanylatex.c:1731 ../markdown/src/conf.c:659 msgid "Template:" -msgstr "" +msgstr "Шаблон:" #: ../geanylatex/src/geanylatex.c:1735 msgid "Set the template which should be used for creating the new document" -msgstr "" +msgstr "Установить шаблон, который будет использоваться для создания нового документа" #: ../geanylatex/src/geanylatex.c:1744 msgid "Default" -msgstr "" +msgstr "По умолчанию" #. Documentclass #: ../geanylatex/src/geanylatex.c:1755 msgid "Documentclass:" -msgstr "" +msgstr "Класс документа:" #: ../geanylatex/src/geanylatex.c:1758 msgid "Choose the kind of document you want to write" -msgstr "" +msgstr "Выберите тип документа, который хотите создать" #: ../geanylatex/src/geanylatex.c:1762 msgid "Article" -msgstr "" +msgstr "Статья" #: ../geanylatex/src/geanylatex.c:1764 msgid "Report" -msgstr "" +msgstr "Отчёт" #: ../geanylatex/src/geanylatex.c:1766 msgid "Letter" -msgstr "" +msgstr "Письмо" #: ../geanylatex/src/geanylatex.c:1768 -#, fuzzy msgid "Presentation" -msgstr "запущено" +msgstr "Презентация" #. Encoding #: ../geanylatex/src/geanylatex.c:1778 msgid "Encoding:" -msgstr "" +msgstr "Кодировка:" #: ../geanylatex/src/geanylatex.c:1782 msgid "Set the encoding for your new document" -msgstr "" +msgstr "Установить кодировку для нового документа" #. fontsize #: ../geanylatex/src/geanylatex.c:1798 -#, fuzzy msgid "Font size" -msgstr "_Продолжить" +msgstr "Размер шрифта" #: ../geanylatex/src/geanylatex.c:1804 msgid "Set the default font size of your new document" -msgstr "" +msgstr "Установить размер шрифта по умолчанию для нового документа" #. Author #: ../geanylatex/src/geanylatex.c:1816 msgid "Author:" -msgstr "" +msgstr "Автор:" #: ../geanylatex/src/geanylatex.c:1819 msgid "" "Sets the value of the \\author command. In most cases this should be your " "name" msgstr "" +"Устанавливает значение для команды \\author. В большинстве случаев здесь " +"должно быть ваше имя" #. Date #: ../geanylatex/src/geanylatex.c:1833 msgid "Date:" -msgstr "" +msgstr "Дата:" #: ../geanylatex/src/geanylatex.c:1836 msgid "" @@ -2055,38 +2055,39 @@ "document. Keeping it at \\today is a good decision if you don't need any " "fixed date." msgstr "" +"Устанавливает значение для команды \\date внутри заголовка нового LaTeX-" +"документа. Оставьте \\today, если вам не нужна конкретная дата." #. Title of the new document #: ../geanylatex/src/geanylatex.c:1848 msgid "Title:" -msgstr "" +msgstr "Название документа:" #: ../geanylatex/src/geanylatex.c:1851 msgid "Sets the title of your new document." -msgstr "" +msgstr "Задаёт название для нового документа." #. Papersize #: ../geanylatex/src/geanylatex.c:1860 msgid "Paper size:" -msgstr "" +msgstr "Размер страницы:" #: ../geanylatex/src/geanylatex.c:1863 msgid "Choose the paper format for the newly created document" -msgstr "" +msgstr "Выберите размер страницы для нового документа" #. Paper direction #: ../geanylatex/src/geanylatex.c:1876 -#, fuzzy msgid "Paper Orientation:" -msgstr "запущено" +msgstr "Ориентация страницы" #: ../geanylatex/src/geanylatex.c:1879 msgid "Choose the paper orientation for the newly created document" -msgstr "" +msgstr "Выберите ориентацию страницы для нового документа" #: ../geanylatex/src/geanylatex.c:1900 msgid "Use KOMA-script classes if possible" -msgstr "" +msgstr "Использовать KOMA-script классы, если возможно" #: ../geanylatex/src/geanylatex.c:1902 msgid "" @@ -2094,108 +2095,108 @@ "Keep in mind: To compile your document these classes have to be installed " "before." msgstr "" +"Использовать KOMA-script классы от Markus Kohm.\n" +"Примечание: для успешной компиляции этот класс нужно сначала установить." #: ../geanylatex/src/geanylatex.c:1909 msgid "Use draft mode" -msgstr "" +msgstr "Использовать режим черновика" #: ../geanylatex/src/geanylatex.c:1911 msgid "" "Set the draft flag inside new created documents to get documents with a " "number of debugging helpers" msgstr "" +"Установите флаг черновика внутри нового документа, чтобы включить " +"вспомогательные отладочные сообщения." #: ../geanylatex/src/geanylatex.c:1928 msgid "Run LaTeX-Wizard" -msgstr "" +msgstr "Запустить мастер LaTeX" #: ../geanylatex/src/geanylatex.c:1930 msgid "Insert \\label" -msgstr "" +msgstr "Вставить \\label" #: ../geanylatex/src/geanylatex.c:1932 msgid "Insert \\ref" -msgstr "" +msgstr "Вставить \\ref" #: ../geanylatex/src/geanylatex.c:1934 msgid "Insert linebreak \\\\ " -msgstr "" +msgstr "Вставить разрыв строки \\\\ " #: ../geanylatex/src/geanylatex.c:1937 msgid "Insert command" -msgstr "" +msgstr "Вставить команду" #: ../geanylatex/src/geanylatex.c:1939 msgid "Turn input replacement on/off" -msgstr "" +msgstr "Переключить автозамену ввода" #: ../geanylatex/src/geanylatex.c:1943 msgid "Replace special characters" -msgstr "" +msgstr "Заменять спецсимволы" #: ../geanylatex/src/geanylatex.c:1946 -#, fuzzy msgid "Run insert environment dialog" -msgstr "Вернуться к предыдущему диалогу" +msgstr "Запустить диалог вставки окружения" #: ../geanylatex/src/geanylatex.c:1948 msgid "Insert \\item" -msgstr "" +msgstr "Вставить \\item" #: ../geanylatex/src/geanylatex.c:1950 msgid "Format selection in bold font face" -msgstr "" +msgstr "Форматировать выделение жирным шрифтом" #: ../geanylatex/src/geanylatex.c:1952 msgid "Format selection in italic font face" -msgstr "" +msgstr "Форматировать выделение курсивным шрифтом" #: ../geanylatex/src/geanylatex.c:1954 msgid "Format selection in typewriter font face" -msgstr "" +msgstr "Форматировать выделение машинописным шрифтом" #: ../geanylatex/src/geanylatex.c:1956 msgid "Format selection centered" -msgstr "" +msgstr "Выровнять выделение по центру" #: ../geanylatex/src/geanylatex.c:1958 -#, fuzzy msgid "Format selection left-aligned" -msgstr "Сдвинить Выделение влево и вправо" +msgstr "Выровнять выделение по левому краю" #: ../geanylatex/src/geanylatex.c:1960 -#, fuzzy msgid "Format selection right-aligned" -msgstr "Сдвинить Выделение влево и вправо" +msgstr "Выровнять выделение по правому краю" #: ../geanylatex/src/geanylatex.c:1963 msgid "Insert description list" -msgstr "" +msgstr "Вставить список с описанием (description)" #: ../geanylatex/src/geanylatex.c:1966 msgid "Insert itemize list" -msgstr "" +msgstr "Вставить маркированный список (itemize)" #: ../geanylatex/src/geanylatex.c:1969 msgid "Insert enumerate list" -msgstr "" +msgstr "Вставить нумерованный список (enumerate)" #: ../geanylatex/src/geanylatex.c:1972 msgid "Set selection one level up" -msgstr "" +msgstr "Выделение на уровень выше" #: ../geanylatex/src/geanylatex.c:1975 msgid "Set selection one level down" -msgstr "" +msgstr "Выделение на уровень ниже" #: ../geanylatex/src/geanylatex.c:1978 msgid "Insert \\usepackage{}" -msgstr "" +msgstr "Вставить \\usepackage{}" #: ../geanylatex/src/geanylatex.c:1981 -#, fuzzy msgid "Insert BibTeX reference dialog" -msgstr "Настройки" +msgstr "Диалог вставки ссылки BibTeX" #: ../geanylatex/src/geanylatex.c:1988 msgid "" @@ -2203,302 +2204,302 @@ "\n" "Please report all bugs or feature requests to one of the authors." msgstr "" +"GeanyLaTeX - дополнение улучшенной поддержки LaTeX в Geany.\n" +"\n" +"Сообщения об ошибках и предложения отправляйте одному из авторов." #: ../geanylatex/src/geanylatex.c:2026 msgid "" "glatex_set_autocompletion_contextsize has been initialized with an invalid " "value. Default value taken. Please check your configuration file" msgstr "" +"glatex_set_autocompletion_contextsize инициализирован с некорректным значением. " +"Используется стандартное значение. Проверьте ваши файлы конфигурации" #: ../geanylatex/src/geanylatex.c:2048 ../geanylatex/src/geanylatex.c:2055 msgid "page \\pageref{{{reference}}}" -msgstr "" +msgstr "страница \\pageref{{{reference}}}" #: ../geanylatex/src/geanylatex.c:2052 ../geanylatex/src/geanylatex.c:2059 msgid "\\ref{{{reference}}}, page \\pageref{{{reference}}}" -msgstr "" +msgstr "\\ref{{{reference}}}, страница \\pageref{{{reference}}}" #. Build up menu for menubar #: ../geanylatex/src/geanylatex.c:2107 msgid "_LaTeX" -msgstr "" +msgstr "_LaTeX" #. Filling up menubar menus #. LaTeX menu #: ../geanylatex/src/geanylatex.c:2116 ../geanylatex/src/geanylatex.c:2328 msgid "LaTeX-_Wizard" -msgstr "" +msgstr "Мастер LaTeX" #: ../geanylatex/src/geanylatex.c:2119 ../geanylatex/src/geanylatex.c:2331 msgid "Starts a Wizard to easily create LaTeX-documents" -msgstr "" +msgstr "Запуск мастера для простого создания документов LaTeX" #: ../geanylatex/src/geanylatex.c:2124 msgid "I_nsert Special Character" -msgstr "" +msgstr "_Вставить специальный символ" #: ../geanylatex/src/geanylatex.c:2126 msgid "Helps to use some not very common letters and signs" -msgstr "" +msgstr "Доступ к некоторым не распространённым символам и знаками" #: ../geanylatex/src/geanylatex.c:2136 -#, fuzzy msgid "Insert _Reference" -msgstr "Настройки" +msgstr "Вставить _ссылку" #: ../geanylatex/src/geanylatex.c:2138 msgid "Inserting references to the document" -msgstr "" +msgstr "Вставка ссылок в документ" #: ../geanylatex/src/geanylatex.c:2143 msgid "Insert _Label" -msgstr "" +msgstr "Вставить _метку" #: ../geanylatex/src/geanylatex.c:2145 msgid "Helps at inserting labels to a document" -msgstr "" +msgstr "Вставляет метки в документ" #: ../geanylatex/src/geanylatex.c:2151 msgid "Insert _Environment" -msgstr "" +msgstr "Вставить _окружение" #: ../geanylatex/src/geanylatex.c:2153 msgid "Helps at inserting an environment a document" -msgstr "" +msgstr "Вставляет окружение в документ" #: ../geanylatex/src/geanylatex.c:2159 -#, fuzzy msgid "Insert P_ackage" -msgstr "Настройки" +msgstr "Вставить _пакет" #: ../geanylatex/src/geanylatex.c:2161 msgid "A small dialog to insert \\usepackage{} into header of current file" -msgstr "" +msgstr "Небольшой диалог для вставки \\usepackage{} в заголовок текущего файла" #: ../geanylatex/src/geanylatex.c:2166 ../scope/data/scope.glade.h:58 msgid "_Format" -msgstr "" +msgstr "_Форматирование" #. Add font size menu #: ../geanylatex/src/geanylatex.c:2183 -#, fuzzy msgid "F_ont size" -msgstr "_Продолжить" +msgstr "_Размер шрифта" #: ../geanylatex/src/geanylatex.c:2201 msgid "_Special Character Replacement" -msgstr "" +msgstr "_Экранирование специальных символов" #: ../geanylatex/src/geanylatex.c:2209 msgid "Bulk _Replace Special Characters" -msgstr "" +msgstr "_Экранировать специальные символы" #: ../geanylatex/src/geanylatex.c:2211 msgid "_Replace selected special characters with TeX substitutes" -msgstr "" +msgstr "Экранировать специальные символы TeX в выделении" #: ../geanylatex/src/geanylatex.c:2219 msgid "Toggle _Special Character Replacement" -msgstr "" +msgstr "_Переключить экранирование символов" #: ../geanylatex/src/geanylatex.c:2230 msgid "Insert _Command" -msgstr "" +msgstr "Вставить _команду" #: ../geanylatex/src/geanylatex.c:2232 msgid "Inserting costumized command to document" -msgstr "" +msgstr "Вставляет пользовательскую команду в документ" #: ../geanylatex/src/geanylatex.c:2257 msgid "_BibTeX" -msgstr "" +msgstr "_BibTeX" #: ../geanylatex/src/geanylatex.c:2265 -#, fuzzy msgid "Insert B_ibTeX reference" -msgstr "Настройки" +msgstr "Вставить ссылку B_ibTeX" #: ../geanylatex/src/geanylatex.c:2267 msgid "Helps to insert a reference out of BibTeX files" -msgstr "" +msgstr "Вставка ссылок из библиотеки BibTeX" #: ../geanylatex/src/geanylatex.c:2272 msgid "_BibTeX entries" -msgstr "" +msgstr "Записи _BibTeX" #: ../geanylatex/src/letters.c:40 msgid "LaTeX letters" -msgstr "" +msgstr "Символы LaTeX" #: ../geanylatex/src/letters.c:41 msgid "Greek letters" -msgstr "" +msgstr "Греческие символы" #: ../geanylatex/src/letters.c:42 msgid "German umlauts" -msgstr "" +msgstr "Немецкие умлауты" #: ../geanylatex/src/letters.c:43 msgid "Misc" -msgstr "" +msgstr "Другое" #: ../geanylatex/src/letters.c:44 msgid "Arrow characters" -msgstr "" +msgstr "Стрелки" #: ../geanylatex/src/letters.c:45 msgid "Relational" -msgstr "" +msgstr "Отношения" #: ../geanylatex/src/letters.c:46 msgid "Binary operation" -msgstr "" +msgstr "Бинарные операции" #: ../geanylatex/src/formatpatterns.c:38 msgid "Italic" -msgstr "" +msgstr "Курсив" #: ../geanylatex/src/formatpatterns.c:39 msgid "Bold" -msgstr "" +msgstr "Полужирный" #: ../geanylatex/src/formatpatterns.c:40 msgid "Underline" -msgstr "" +msgstr "Подчёркнутый" #: ../geanylatex/src/formatpatterns.c:41 msgid "Typewriter" -msgstr "" +msgstr "Машинописный" #: ../geanylatex/src/formatpatterns.c:42 msgid "Small Caps" -msgstr "" +msgstr "Капитель" #: ../geanylatex/src/formatpatterns.c:43 -#, fuzzy msgid "Slanted" -msgstr "загружено" +msgstr "Наклонный" #: ../geanylatex/src/formatpatterns.c:44 msgid "Emphasis" -msgstr "" +msgstr "Выделение (emphasis)" #: ../geanylatex/src/formatpatterns.c:64 msgid "tiny" -msgstr "" +msgstr "крохотный" #: ../geanylatex/src/formatpatterns.c:65 msgid "scriptsize" -msgstr "" +msgstr "миниатюрный" #: ../geanylatex/src/formatpatterns.c:66 msgid "footnotesize" -msgstr "" +msgstr "мелкий" #: ../geanylatex/src/formatpatterns.c:67 msgid "small" -msgstr "" +msgstr "маленький" #: ../geanylatex/src/formatpatterns.c:68 msgid "normalsize" -msgstr "" +msgstr "нормальный" #: ../geanylatex/src/formatpatterns.c:69 msgid "large" -msgstr "" +msgstr "большой" #: ../geanylatex/src/formatpatterns.c:70 msgid "Large" -msgstr "" +msgstr "великий" #: ../geanylatex/src/formatpatterns.c:71 msgid "LARGE" -msgstr "" +msgstr "огромный" #: ../geanylatex/src/formatpatterns.c:72 msgid "huge" -msgstr "" +msgstr "громадный" #: ../geanylatex/src/formatpatterns.c:73 msgid "Huge" -msgstr "" +msgstr "гигантский" #: ../geanylatex/src/latexencodings.c:37 msgid "UTF-8" -msgstr "" +msgstr "UTF-8" #: ../geanylatex/src/latexencodings.c:38 msgid "US-ASCII" -msgstr "" +msgstr "US-ASCII" #: ../geanylatex/src/latexencodings.c:39 msgid "ISO-8859-1 (Latin-1)" -msgstr "" +msgstr "ISO-8859-1 (Latin-1)" #: ../geanylatex/src/latexencodings.c:41 msgid "ISO-8859-2 (Latin-2)" -msgstr "" +msgstr "ISO-8859-2 (Latin-2)" #: ../geanylatex/src/latexencodings.c:43 msgid "ISO-8859-3 (Latin-3)" -msgstr "" +msgstr "ISO-8859-3 (Latin-3)" #: ../geanylatex/src/latexencodings.c:45 msgid "ISO-8859-4 (Latin-4)" -msgstr "" +msgstr "ISO-8859-4 (Latin-4)" #: ../geanylatex/src/latexencodings.c:47 msgid "ISO-8859-5 (Latin-5)" -msgstr "" +msgstr "ISO-8859-5 (Latin-5)" #: ../geanylatex/src/latexencodings.c:49 msgid "ISO-8859-9 (Latin-9)" -msgstr "" +msgstr "ISO-8859-9 (Latin-9)" #: ../geanylatex/src/latexencodings.c:51 msgid "ISO-8859-10 (Latin-10)" -msgstr "" +msgstr "ISO-8859-10 (Latin-10)" #: ../geanylatex/src/latexencodings.c:53 msgid "IBM 850 code page" -msgstr "" +msgstr "Кодировка IBM 850" #: ../geanylatex/src/latexencodings.c:55 msgid "IBM 852 code page" -msgstr "" +msgstr "Кодировка IBM 852" #: ../geanylatex/src/latexencodings.c:57 msgid "Don't set any encoding" -msgstr "" +msgstr "Не устанавливать никакой кодировки" #: ../geanylipsum/src/geanylipsum.c:40 msgid "GeanyLipsum" -msgstr "" +msgstr "GeanyLipsum" #: ../geanylipsum/src/geanylipsum.c:41 msgid "Creating dummy text with Geany" -msgstr "" +msgstr "Создаёт текст-рыбу" -#: ../geanylipsum/src/geanylipsum.c:86 +#: ../geanylipsum/src/geanylipsum.c:89 msgid "Lipsum-Generator" -msgstr "" +msgstr "Lipsum-генератор" -#: ../geanylipsum/src/geanylipsum.c:87 +#: ../geanylipsum/src/geanylipsum.c:90 msgid "Enter the length of Lipsum text here" -msgstr "" +msgstr "Введите длину текста" #. Building menu entry -#: ../geanylipsum/src/geanylipsum.c:163 +#: ../geanylipsum/src/geanylipsum.c:164 msgid "_Lipsum" -msgstr "" +msgstr "_Lipsum" #: ../geanylipsum/src/geanylipsum.c:165 msgid "Include Pseudotext to your code" -msgstr "" +msgstr "Вставить псевдотекст в ваш код" #: ../geanylipsum/src/geanylipsum.c:179 msgid "Insert Lipsum text" -msgstr "" +msgstr "Вставить текст Lipsum" #: ../geanylua/glspi.h:100 ../geanylua/gsdlg_lua.c:95 #: ../geanylua/glspi_kfile.c:54 @@ -2507,6 +2508,8 @@ "Error in module \"%s\" at function %s():\n" " expected type \"%s\" for argument #%d\n" msgstr "" +"Ошибка в модуле \"%s\" в функции %s():\n" +" ожидается тип \"%s\" для аргумента #%d\n" #: ../geanylua/glspi.h:114 #, c-format @@ -2514,6 +2517,8 @@ "Error in module \"%s\" at function %s():\n" " expected type \"%s\" or \"%s\" for argument #%d\n" msgstr "" +"Ошибка в модуле \"%s\" в функции %s():\n" +" ожидается тип \"%s\" или \"%s\" для аргумента #%d\n" #: ../geanylua/glspi.h:128 ../geanylua/gsdlg_lua.c:108 #, c-format @@ -2522,6 +2527,9 @@ " invalid table in argument #%d:\n" " expected type \"%s\" for element #%d\n" msgstr "" +"Ошибка в модуле \"%s\" в функции %s():\n" +" некорректная таблица в аргумента #%d:\n" +" ожидается тип \"%s\" для элемента #%d\n" #. #. * glspi_ver.c - This file is part of the Lua scripting plugin for the Geany IDE @@ -2529,66 +2537,68 @@ #. #: ../geanylua/glspi_ver.h:7 msgid "Lua Script" -msgstr "" +msgstr "Сценарий Lua" #: ../geanylua/glspi_ver.h:9 msgid "Write and run Lua scripts for custom commands." -msgstr "" +msgstr "Пишите и запускается сценарии на Lua как пользовательские команды." #: ../geanylua/glspi_ver.h:19 msgid "Lua Script Plugin" -msgstr "" +msgstr "Модуль сценариев Lua" #: ../geanylua/glspi_run.c:90 ../geanylua/glspi_run.c:97 msgid "Lua script error:" -msgstr "" +msgstr "Ошибка в сценарии Lua:" #: ../geanylua/glspi_run.c:197 msgid "Script timeout" -msgstr "" +msgstr "Время ожидания сценария" #: ../geanylua/glspi_run.c:198 msgid "" "A Lua script seems to be taking excessive time to complete.\n" "Do you want to continue waiting?" msgstr "" +"Похоже, что сценарий Lua выполняется слишком долго.\n" +"Хотите продолжить выполнение сценария?" #: ../geanylua/glspi_run.c:206 msgid "Script timeout exceeded." -msgstr "" +msgstr "Время ожидания сценария истекло." #: ../geanylua/glspi_run.c:382 msgid "(error object is not a string)" -msgstr "" +msgstr "(объект ошибка не является строкой)" #: ../geanylua/glspi_run.c:387 msgid "Unknown Error inside script." -msgstr "" +msgstr "Неизвестная ошибка в сценарии." #: ../geanylua/glspi_run.c:459 msgid "Out of memory." -msgstr "" +msgstr "Недостаточно памяти." #: ../geanylua/glspi_run.c:462 msgid "Failed to open script file." -msgstr "" +msgstr "Не удалось открыть файл со сценарием." #: ../geanylua/glspi_run.c:465 msgid "Unknown error while loading script file." -msgstr "" +msgstr "Неизвестная ошибка при загрузке файла со сценарием." #: ../geanylua/glspi_init.c:381 msgid "_Lua Scripts" -msgstr "" +msgstr "Сценарии _Lua" #: ../geanylua/glspi_init.c:428 #, c-format msgid " ==>> %s: Building menu from '%s'\n" -msgstr "" +msgstr " ==>> %s: Создание меню из '%s'\n" #: ../geanylua/glspi_init.c:527 msgid "Nothing to configure!" -msgstr "" +msgstr "Настройки не обнаружены!" #: ../geanylua/glspi_init.c:529 #, c-format @@ -2599,37 +2609,39 @@ "\n" "to add your own custom configuration dialog." msgstr "" +"Вы можете создать сценарий:\n" +"\n" +"\"%s\"\n" +"\n" +"чтобы создать собственный диалог настройки." #: ../geanylua/gsdlg.c:103 ../geanylua/glspi_dlg.c:420 msgid "Open file" -msgstr "" +msgstr "Открыть файл" #: ../geanylua/gsdlg.c:107 -#, fuzzy msgid "Select file" -msgstr "Выбрать шрифт" +msgstr "Выбрать файл" #: ../geanylua/gsdlg.c:154 msgid "Browse..." -msgstr "" +msgstr "Обзор..." -#: ../geanylua/gsdlg.c:175 -#, fuzzy +#: ../geanylua/gsdlg.c:176 msgid "Select Color" -msgstr "Выбрать шрифт" +msgstr "Выбрать цвет" -#: ../geanylua/gsdlg.c:205 +#: ../geanylua/gsdlg.c:207 msgid "Choose..." -msgstr "" +msgstr "Выбрать..." -#: ../geanylua/gsdlg.c:226 +#: ../geanylua/gsdlg.c:228 msgid "Select Font" msgstr "Выбрать шрифт" -#: ../geanylua/gsdlg.c:253 -#, fuzzy +#: ../geanylua/gsdlg.c:255 msgid "Select..." -msgstr "Выбрать шрифт" +msgstr "Выбрать..." #: ../geanylua/glspi_sci.c:427 #, c-format @@ -2637,6 +2649,8 @@ "Error in module \"%s\" at function navigate():\n" "unknown navigation mode \"%s\" for argument #1.\n" msgstr "" +"Ошибка в модуле \"%s\" в функции navigate():\n" +"неизвестный режим навигации \"%s\" в аргументе #1.\n" #: ../geanylua/glspi_sci.c:603 #, c-format @@ -2644,6 +2658,8 @@ "Error in module \"%s\" at function %s():\n" "API command \"%s\" not implemented.\n" msgstr "" +"Ошибка в модуле \"%s\" в функции %s():\n" +"Команда API \"%s\" не реализована.\n" #: ../geanylua/glspi_sci.c:614 #, c-format @@ -2651,13 +2667,17 @@ "Error in module \"%s\" at function %s():\n" "not enough arguments for command \"%s\".\n" msgstr "" +"Ошибка в модуле \"%s\" в функции %s():\n" +"недостаточно аргументов для команды \"%s\".\n" -#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:398 +#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:396 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" "unknown command \"%s\" given for argument #1.\n" msgstr "" +"Ошибка в модуле \"%s\" в функции %s():\n" +"неизвестная команда \"%s\" в аргументе #1.\n" #: ../geanylua/glspi_sci.c:794 #, c-format @@ -2666,65 +2686,72 @@ " invalid table in argument #%d:\n" " unknown flag \"%s\" for element #%d\n" msgstr "" +"Ошибка в модуле \"%s\" в функции %s():\n" +" некорректная таблица в аргументе #%d:\n" +" неизвестный флаг \"%s\" для элемента #%d\n" #: ../geanylua/glspi_sci.c:798 msgid "" -msgstr "" +msgstr "<слишком велик для отображения>" #: ../geanylua/glspi_dlg.c:336 msgid "File exists" -msgstr "" +msgstr "Файл существует" #: ../geanylua/glspi_dlg.c:336 msgid "Do you want to overwrite it?" -msgstr "" +msgstr "Вы действительно хотите перезаписать его?" #: ../geanylua/glspi_dlg.c:337 msgid "confirm" -msgstr "" +msgstr "подтвердить" #: ../geanylua/glspi_dlg.c:410 msgid "Save file" -msgstr "" +msgstr "Сохранить файл" -#: ../geanylua/glspi_dlg.c:436 +#: ../geanylua/glspi_dlg.c:438 #, c-format msgid "" "Error in module \"%s\" at function pickfile():\n" "failed to parse filter string at argument #3.\n" msgstr "" +"Ошибка в модуле \"%s\" в функции pickfile():\n" +"не удалось разобрать строку-фильтр в аргументе #3.\n" -#: ../geanylua/glspi_dlg.c:486 +#: ../geanylua/glspi_dlg.c:489 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" "expected string \"open\" or \"save\" for argument #1.\n" msgstr "" +"Ошибка в модуле \"%s\" в функции %s():\n" +"ожидается строка \"open\" или \"save\" для аргумента #1.\n" #: ../geanylua/geanylua.c:163 #, c-format msgid "%s: Can't load support library %s!\n" -msgstr "" +msgstr "%s: Не удалось загрузить вспомогательную библиотеку %s!\n" #: ../geanylua/geanylua.c:175 #, c-format msgid "%s: Failed to initialize support library %s!\n" -msgstr "" +msgstr "%s: Не удалось инициализировать вспомогательную библиотеку %s!\n" #: ../geanylua/geanylua.c:180 #, c-format msgid "%s: Support library version mismatch: %s for %s (should be %s)!\n" -msgstr "" +msgstr "%s: Не соответствует версия вспомогательной библиотеки: %s для %s (должна быть %s)!\n" #: ../geanylua/geanylua.c:186 #, c-format msgid "%s: Support library ABI mismatch: %d for %s (should be %d)!\n" -msgstr "" +msgstr "%s: Не соответствует ABI вспомогательной библиотеки: %d для %s (должно быть %d)!\n" #: ../geanylua/geanylua.c:215 #, c-format msgid "%s: Can't find support library %s!\n" -msgstr "" +msgstr "%s: Не удалось обнаружить вспомогательную библиотеку %s!\n" #: ../geanylua/geanylua.c:234 #, c-format @@ -2732,360 +2759,336 @@ "The %s plugin failed to load properly.\n" "Please check your installation." msgstr "" +"Не удалось загрузить модуль %s.\n" +"Проверьте правильность установки." -#: ../geanylua/glspi_app.c:19 +#: ../geanylua/glspi_app.c:21 #, c-format msgid "" "%s %s: %s\n" "Copyright (c) 2007-2010 " msgstr "" +"%s %s: %s\n" +"Copyright (c) 2007-2010 " -#: ../geanylua/glspi_app.c:149 +#: ../geanylua/glspi_app.c:151 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" "widget \"%s\" not found for argument #1.\n" msgstr "" +"Ошибка в модуле \"%s\" в функции %s():\n" +"виджет \"%s\" не найден для аргумента #1.\n" -#: ../geanylua/glspi_app.c:158 +#: ../geanylua/glspi_app.c:160 #, c-format msgid "" "Error in module \"%s\" at function %s() argument #2:\n" "widget \"%s\" has no signal named \"%s\".\n" msgstr "" +"Ошибка в модуле \"%s\" в функции %s() аргумент #2:\n" +"в виджете \"%s\" нет сигнала с названием \"%s\".\n" #: ../geanymacro/src/geanymacro.c:55 -#, fuzzy msgid "Cut to Clipboard" -msgstr "Скопировать полный путь в буфер обмена" +msgstr "Вырезать в буфер обмена" #: ../geanymacro/src/geanymacro.c:56 -#, fuzzy msgid "Copy to Clipboard" -msgstr "Скопировать полный путь в буфер обмена" +msgstr "Скопировать в буфер обмена" #: ../geanymacro/src/geanymacro.c:57 msgid "Paste from Clipboard" -msgstr "" +msgstr "Вставить из буфера обмена" #: ../geanymacro/src/geanymacro.c:58 msgid "Cut current line to Clipboard" -msgstr "" +msgstr "Вырезать текущую строку в буфер обмена" #: ../geanymacro/src/geanymacro.c:59 -#, fuzzy msgid "Copy current line to Clipboard" -msgstr "Скопировать полный путь в буфер обмена" +msgstr "Скопировать текущую строку в буфер обмена" #: ../geanymacro/src/geanymacro.c:61 msgid "Delete character to the left" -msgstr "" +msgstr "Удалить символ слева" #: ../geanymacro/src/geanymacro.c:62 msgid "Delete character to the right" -msgstr "" +msgstr "Удалить символ справа" #: ../geanymacro/src/geanymacro.c:63 msgid "Delete character to the left (but not newline)" -msgstr "" +msgstr "Удалить символ слева (но не новую строку)" #: ../geanymacro/src/geanymacro.c:64 msgid "Delete up to start of word to the Left" -msgstr "" +msgstr "Удалить до начала слова слева" #: ../geanymacro/src/geanymacro.c:65 msgid "Delete up to start of word to the Right" -msgstr "" +msgstr "Удалить до начала слова справа" #: ../geanymacro/src/geanymacro.c:66 msgid "Delete up to end of word to the Right" -msgstr "" +msgstr "Удалить до конца слова справа" #: ../geanymacro/src/geanymacro.c:67 -#, fuzzy msgid "Delete to beginning of line" -msgstr "Выделить до строки" +msgstr "Удалить до начала строки" #: ../geanymacro/src/geanymacro.c:68 -#, fuzzy msgid "Delete to end of line" -msgstr "Выделить до строки" +msgstr "Удалить до конца строки" #: ../geanymacro/src/geanymacro.c:69 -#, fuzzy msgid "Delete current line" -msgstr "Выделить до строки" +msgstr "Удалить текущую строку" #: ../geanymacro/src/geanymacro.c:70 msgid "Backwards Tab (deletes tab if nothing after it)" -msgstr "" +msgstr "Отмена отступа (удаляет отступ если после него ничего нет)" #: ../geanymacro/src/geanymacro.c:72 msgid "Scroll Display down a line" -msgstr "" +msgstr "Прокрутить экран вниз на одну строку" #: ../geanymacro/src/geanymacro.c:73 msgid "Scroll Display up a line" -msgstr "" +msgstr "Прокрутить экран вверх на одну строку" #: ../geanymacro/src/geanymacro.c:74 -#, fuzzy msgid "Zoom view in" -msgstr "Увеличить" +msgstr "Увеличить масштаб" #: ../geanymacro/src/geanymacro.c:75 -#, fuzzy msgid "Zoom view out" -msgstr "Уменьшить" +msgstr "Уменьшить масштаб" #: ../geanymacro/src/geanymacro.c:77 msgid "Move Cursor Down" -msgstr "" +msgstr "Переместить курсор вниз" #: ../geanymacro/src/geanymacro.c:78 msgid "Move Cursor Up" -msgstr "" +msgstr "Переместить курсор вверх" #: ../geanymacro/src/geanymacro.c:79 msgid "Move Cursor Left" -msgstr "" +msgstr "Переместить курсор влево" #: ../geanymacro/src/geanymacro.c:80 msgid "Move Cursor Right" -msgstr "" +msgstr "Переместить курсор вправо" #: ../geanymacro/src/geanymacro.c:81 msgid "Move Cursor to start of Word to the Left" -msgstr "" +msgstr "Переместить курсор к началу слова слева" #: ../geanymacro/src/geanymacro.c:82 msgid "Move Cursor to start of Word to the Right" -msgstr "" +msgstr "Переместить курсор к началу слова справа" #: ../geanymacro/src/geanymacro.c:83 msgid "Move Cursor to start of Part of Word to the Left" -msgstr "" +msgstr "Переместить курсор к началу части слова слева" #: ../geanymacro/src/geanymacro.c:84 msgid "Move Cursor to start of Part of Word to the Right" -msgstr "" +msgstr "Переместить курсор к началу части слова справа" #: ../geanymacro/src/geanymacro.c:85 msgid "Move Cursor to start of line" -msgstr "" +msgstr "Переместить курсор к началу строки" #: ../geanymacro/src/geanymacro.c:86 msgid "Move Cursor to end of line" -msgstr "" +msgstr "Переместить курсор к концу строки" #: ../geanymacro/src/geanymacro.c:87 msgid "Move Cursor to 1st line of Document" -msgstr "" +msgstr "Переместить курсор к первой строке документа" #: ../geanymacro/src/geanymacro.c:88 -#, fuzzy msgid "Move Cursor to last line of document" -msgstr "В документе отсутствуют теги" +msgstr "Переместить курсор к последней строке документа" #: ../geanymacro/src/geanymacro.c:89 msgid "Move Cursor up one Page" -msgstr "" +msgstr "Переместить курсор на одну страницу вверх" #: ../geanymacro/src/geanymacro.c:90 msgid "Move Cursor down one Page" -msgstr "" +msgstr "Переместить курсор на одну страницу вниз" #: ../geanymacro/src/geanymacro.c:91 -#, fuzzy msgid "Move Cursor to first visible character" -msgstr "Конвертировать выделение в таблицу" +msgstr "Переместить курсор к первому видимому символу" #: ../geanymacro/src/geanymacro.c:92 msgid "Move Cursor to last visible character" -msgstr "" +msgstr "Переместить курсор к последнему видимому символу" #: ../geanymacro/src/geanymacro.c:93 msgid "" "Move Cursor to 1st non-whitespace character of line, or 1st character of " "line if already at 1st non-whitespace character" msgstr "" +"Переместить курсор к первому непробельному символу строки или к началу строки, " +"если курсор уже находится возле первого непробельного символа" #: ../geanymacro/src/geanymacro.c:95 -#, fuzzy msgid "Move Cursor to beginning of next paragraph" -msgstr "Конвертировать выделение в таблицу" +msgstr "Переместить курсор к началу следующего абзаца" #: ../geanymacro/src/geanymacro.c:96 msgid "Move Cursor up to beginning of current/previous paragraph" -msgstr "" +msgstr "Переместить курсор к началу текущего/предыдущего абзаца" #: ../geanymacro/src/geanymacro.c:97 msgid "Move Cursor to end of Word to the Left" -msgstr "" +msgstr "Переместить курсор к концу слова слева" #: ../geanymacro/src/geanymacro.c:98 msgid "Move Cursor to end of Word to the Right" -msgstr "" +msgstr "Переместить курсор к концу слова справа" #: ../geanymacro/src/geanymacro.c:100 -#, fuzzy msgid "Extend Selection down a line" -msgstr "Конвертировать выделение в таблицу" +msgstr "Расширить выделение вниз на одну строку" #: ../geanymacro/src/geanymacro.c:101 -#, fuzzy msgid "Extend Selection up a line" -msgstr "Конвертировать выделение в таблицу" +msgstr "Расширить выделение вверх на одну строку" #: ../geanymacro/src/geanymacro.c:102 -#, fuzzy msgid "Extend Selection Left a line" -msgstr "Конвертировать выделение в таблицу" +msgstr "Расширить выделение влево" #: ../geanymacro/src/geanymacro.c:103 -#, fuzzy msgid "Extend Selection Right a line" -msgstr "Сдвинить Выделение влево и вправо" +msgstr "Расширить выделение вправо" #: ../geanymacro/src/geanymacro.c:104 -#, fuzzy msgid "Extend Selection to start of Word to the Left" -msgstr "Конвертировать выделение в таблицу" +msgstr "Расширить выделение до начала слова слева" #: ../geanymacro/src/geanymacro.c:105 -#, fuzzy msgid "Extend Selection to start of Word to the Right" -msgstr "Конвертировать выделение в таблицу" +msgstr "Расширить выделение до начала слова справа" #: ../geanymacro/src/geanymacro.c:106 -#, fuzzy msgid "Extend Selection to start of Part of Word to the Left" -msgstr "Конвертировать выделение в таблицу" +msgstr "Расширить выделение до начала части слова слева" #: ../geanymacro/src/geanymacro.c:107 -#, fuzzy msgid "Extend Selection to start of Part of Word to the Right" -msgstr "Конвертировать выделение в таблицу" +msgstr "Расширить выделение до начала части слова справа" #: ../geanymacro/src/geanymacro.c:108 -#, fuzzy msgid "Extend Selection to start of line" -msgstr "Конвертировать выделение в таблицу" +msgstr "Расширить выделение до начала строки" #: ../geanymacro/src/geanymacro.c:109 -#, fuzzy msgid "Extend Selection to end of line" -msgstr "Конвертировать выделение в таблицу" +msgstr "Расширить выделение до конца строки" #: ../geanymacro/src/geanymacro.c:110 -#, fuzzy msgid "Extend Selection to start of document" -msgstr "Конвертировать выделение в таблицу" +msgstr "Расширить выделение до начала документа" #: ../geanymacro/src/geanymacro.c:111 -#, fuzzy msgid "Extend Selection to end of document" -msgstr "В документе отсутствуют теги" +msgstr "Расширить выделение до конца документа" #: ../geanymacro/src/geanymacro.c:112 -#, fuzzy msgid "Extend Selection up one Page" -msgstr "Конвертировать выделение в таблицу" +msgstr "Расширить выделение на одну страницу вверх" #: ../geanymacro/src/geanymacro.c:113 -#, fuzzy msgid "Extend Selection down one Page" -msgstr "Конвертировать выделение в таблицу" +msgstr "Расширить выделение на одну страницу вниз" #: ../geanymacro/src/geanymacro.c:114 -#, fuzzy msgid "Extend Selection to fist visible character" -msgstr "Конвертировать выделение в таблицу" +msgstr "Расширить выделение до первого видимого символа" #: ../geanymacro/src/geanymacro.c:115 -#, fuzzy msgid "Extend Selection to last visible character" -msgstr "Конвертировать выделение в таблицу" +msgstr "Расширить выделение до последнего видимого символа" #: ../geanymacro/src/geanymacro.c:116 msgid "" "Extend Selection to 1st non-whitespace character of line, or 1st character " "of line if already at 1st non-whitespace character" msgstr "" +"Расширить выделение до первого непробельного символа строки или до начала " +"строки, если выделение уже находится возле первого непробельного символа" #: ../geanymacro/src/geanymacro.c:118 -#, fuzzy msgid "Extend Selection to beginning of next paragraph" -msgstr "Конвертировать выделение в таблицу" +msgstr "Расширить выделение до начала следующего абзаца" #: ../geanymacro/src/geanymacro.c:119 msgid "Extend Selection up to beginning of current/previous paragraph" -msgstr "" +msgstr "Расширить выделение до начала текущего/следующего абзаца" #: ../geanymacro/src/geanymacro.c:120 -#, fuzzy msgid "Extend Selection to end of Word to the Left" -msgstr "В документе отсутствуют теги" +msgstr "Расширить выделение до конца слова слева" #: ../geanymacro/src/geanymacro.c:121 -#, fuzzy msgid "Extend Selection to end of Word to the Right" -msgstr "В документе отсутствуют теги" +msgstr "Расширить выделение до конца слова справа" #: ../geanymacro/src/geanymacro.c:123 -#, fuzzy msgid "Extend Rectangular Selection down a line" -msgstr "Прямоугольное выделение до анкера" +msgstr "Расширить прямоугольное выделение на одну строку вниз" #: ../geanymacro/src/geanymacro.c:124 -#, fuzzy msgid "Extend Rectangular Selection up a line" -msgstr "Сдвинить Выделение влево и вправо" +msgstr "Расширить прямоугольное выделение на одну строку вверх" #: ../geanymacro/src/geanymacro.c:125 -#, fuzzy msgid "Extend Rectangular Selection Left a line" -msgstr "Сдвинить Выделение влево и вправо" +msgstr "Расширить прямоугольное выделение влево" #: ../geanymacro/src/geanymacro.c:126 -#, fuzzy msgid "Extend Rectangular Selection Right a line" -msgstr "Сдвинить Выделение влево и вправо" +msgstr "Расширить прямоугольное выделение вправо" #: ../geanymacro/src/geanymacro.c:127 -#, fuzzy msgid "Extend Rectangular Selection to start of line" -msgstr "Конвертировать выделение в таблицу" +msgstr "Расширить прямоугольное выделение до начала строки" #: ../geanymacro/src/geanymacro.c:128 -#, fuzzy msgid "Extend Rectangular Selection to end of line" -msgstr "Прямоугольное выделение до анкера" +msgstr "Расширить прямоугольное выделение до конца строки" #: ../geanymacro/src/geanymacro.c:129 -#, fuzzy msgid "Extend Rectangular Selection up one Page" -msgstr "Конвертировать выделение в таблицу" +msgstr "Расширить прямоугольное выделение на одну страницу вверх" #: ../geanymacro/src/geanymacro.c:130 -#, fuzzy msgid "Extend Rectangular Selection down one Page" -msgstr "Прямоугольное выделение до анкера" +msgstr "Расширить прямоугольное выделение на одну страницу вниз" #: ../geanymacro/src/geanymacro.c:131 msgid "" "Extend Rectangular Selection to 1st non-whitespace character of line, or 1st " "character of line if already at 1st non-whitespace character" msgstr "" +"Расширить прямоугольное выделение до первого непробельного символа строки " +"или до начала строки, если выделение уже находится возле первого " +"непробельного символа" #: ../geanymacro/src/geanymacro.c:134 -#, fuzzy msgid "Cancel Selection" -msgstr "Расширенное выделение" +msgstr "Сбросить выделение" #: ../geanymacro/src/geanymacro.c:136 msgid "Toggle Insert/Overwrite mode" -msgstr "" +msgstr "Переключить режим вставки/замены" #: ../geanymacro/src/geanymacro.c:137 ../pretty-printer/src/ConfigUI.c:239 msgid "Tab" @@ -3093,34 +3096,48 @@ #: ../geanymacro/src/geanymacro.c:138 msgid "Newline" -msgstr "" +msgstr "Новая строка" #: ../geanymacro/src/geanymacro.c:140 ../geanymacro/src/geanymacro.c:1625 #, c-format msgid "Insert/replace with \"\"" -msgstr "" +msgstr "Вставить/заменить на \"\"" #: ../geanymacro/src/geanymacro.c:142 msgid "Swap current line wih one above" -msgstr "" +msgstr "Поменять текущую строку и строку сверху местами" #: ../geanymacro/src/geanymacro.c:143 msgid "Change selected text to lowercase" -msgstr "" +msgstr "Конвертировать выделенный текст в нижний регистр" #: ../geanymacro/src/geanymacro.c:144 msgid "Change selected text to uppercase" -msgstr "" +msgstr "Конвертировать выделенный текст в верхний регистр" #: ../geanymacro/src/geanymacro.c:146 msgid "Insert duplicate of current line below" -msgstr "" +msgstr "Вставить дубликат строки сверху" #: ../geanymacro/src/geanymacro.c:147 msgid "" "Insert duplicate of selected text after selection. If nothing selected, " "duplicate line" msgstr "" +"Вставить дубликат выделенного текста после выделения. Если выделение пусто, " +"дублировать строку" + +#: ../geanymacro/src/geanymacro.c:150 +msgid "Search for next \"\"" +msgstr "Искать следующие \"\"" + +#: ../geanymacro/src/geanymacro.c:151 +msgid "Search for previous \"\"" +msgstr "Искать предыдущие \"\"" + +#: ../geanymacro/src/geanymacro.c:152 +msgid "Set start of search to beginning of selection" +msgstr "Установить начало поиска в начало выделения" #: ../geanymacro/src/geanymacro.c:181 msgid "Macros" @@ -3131,9 +3148,8 @@ msgstr "Макросы для Geany" #: ../geanymacro/src/geanymacro.c:369 -#, fuzzy msgid "No text in clipboard!" -msgstr "Скопировать полный путь в буфер обмена" +msgstr "Буфер обмена пуст!" #: ../geanymacro/src/geanymacro.c:546 #, c-format @@ -3162,16 +3178,20 @@ "This Plugin implements Macros in Geany.\n" "\n" msgstr "" +"Модуль, добавляющий поддержку макросов в Geany.\n" +"\n" #: ../geanymacro/src/geanymacro.c:856 msgid "This plugin allows you to record and use your own macros. " -msgstr "" +msgstr "Этот плагин позволяет записывать и использовать свои макросы. " #: ../geanymacro/src/geanymacro.c:857 msgid "" "These are sequences of actions that can then be repeated with a single key " "combination. " msgstr "" +"Макрос - это последовательность действий, которая может быть повторена" +" по нажатию горячей клавиши. " #: ../geanymacro/src/geanymacro.c:858 msgid "" @@ -3179,58 +3199,72 @@ "characters, you could simply start recording, press End, Backspace, " "Backspace, down line and then stop recording. " msgstr "" +"Например, если у вас множество строк, в которых вы хотите удалить " +"два последних символа, вы можете просто начать запись, нажать End, Backspace, " +"Backspace, перейти на строку вниз и остановить запись. " #: ../geanymacro/src/geanymacro.c:860 msgid "" "Then simply trigger the macro and it would automatically edit the line and " "move to the next. " msgstr "" +"Затем просто активируйте макрос и он автоматически отредактирует строку и " +"перейдёт к следующей. " #: ../geanymacro/src/geanymacro.c:861 msgid "" "Select Record Macro from the Tools menu and you will be prompted with a " "dialog box. " msgstr "" +"Выберите Запись макроса в меню Инструменты и откроется диалоговое окно. " #: ../geanymacro/src/geanymacro.c:862 msgid "" "You need to specify a key combination that isn't being used, and a name for " "the macro to help you identify it. " msgstr "" +"Установите неиспользуемое сочетание клавиш и название макроса, чтобы легко " +"идентифицировать его. " #: ../geanymacro/src/geanymacro.c:864 msgid "Then press Record. " -msgstr "" +msgstr "Затем нажмите Запись. " #: ../geanymacro/src/geanymacro.c:865 msgid "" "What you do in the editor is then recorded until you select Stop Recording " "Macro from the Tools menu. " msgstr "" +"Всё, что вы делаете в редакторе, записывается до тех пор пока не будет выбран " +"пункт Остановить запись из меню Инструменты. " #: ../geanymacro/src/geanymacro.c:867 msgid "Simply pressing the specified key combination will re-run the macro. " -msgstr "" +msgstr "Простое нажатие указанного сочетания клавиш запустит макрос. " #: ../geanymacro/src/geanymacro.c:868 msgid "To edit the macros you have, select Edit Macro from the Tools menu. " -msgstr "" +msgstr "Для того чтобы отредактировать макрос, выберите Редактировать макрос " +"в меню Инструменты. " #: ../geanymacro/src/geanymacro.c:869 msgid "You can select a macro and delete it, or re-record it. " -msgstr "" +msgstr "Вы можете выбрать макрос и удалить его или перезаписать его. " #: ../geanymacro/src/geanymacro.c:870 msgid "" "You can also click on a macro's name and change it, or the key combination " "and re-define that assuming that it's not already in use. " msgstr "" +"Вы также можете щёлкнуть по имени макроса и изменить его или по комбинации " +"клавиш и изменить её при условии, что она не используется. " #: ../geanymacro/src/geanymacro.c:872 msgid "" "Selecting the edit option allows you to view all the individual elements " "that make up the macro. " msgstr "" +"Щёлкните по кнопке Редактировать, чтобы увидеть составные элементы макроса. " #: ../geanymacro/src/geanymacro.c:874 msgid "" @@ -3239,6 +3273,10 @@ "that replaces the selected text, or is inserted.\n" "\n" msgstr "" +"Вы можете выбрать другую команду для каждого элемента, переместить её, " +"добавить новый элемента, удалить элемент или, если это вставка/замена, вы " +"можете редактировать текст, который будут вставлен или заменён.\n" +"\n" #: ../geanymacro/src/geanymacro.c:878 msgid "" @@ -3246,6 +3284,9 @@ "recorded, and won't be replayed when the macro is re-run.\n" "\n" msgstr "" +"Единственное что нужно учитывать, что действия отмены и возврата не " +"записываются и не будут воспроизводиться при запуске макроса.\n" +"\n" #: ../geanymacro/src/geanymacro.c:881 msgid "" @@ -3253,10 +3294,12 @@ "Manager under the Tools menu, selecting this plugin, and cliking " "Preferences. " msgstr "" +"Вы можете изменить стандартное поведение модуля, выделив модуль в Менеджере " +"модулей в меню Инструменты и щёлкнув по кнопке Настройки. " #: ../geanymacro/src/geanymacro.c:883 msgid "You can change:\n" -msgstr "" +msgstr "Вы можете изменить:\n" #: ../geanymacro/src/geanymacro.c:884 msgid "" @@ -3264,6 +3307,9 @@ "recorded macros and reload them for use the next time you open Geany, if not " "they will be lost when Geany is closed.\n" msgstr "" +"Сохранить макрос при закрытии Geany - если выбрано, Geany будет сохранять " +"записанные макросы и загружать их в следующий раз, когда вы откроете Geany. " +"Если не выбрано, макросы будут утеряны после закрытия Geany\n" #: ../geanymacro/src/geanymacro.c:887 msgid "" @@ -3273,6 +3319,10 @@ "otherwise it will simply erase any existing macros with the same name, or " "the same key trigger combination." msgstr "" +"Спрашивать при замене существующего макроса - если выбрано и вы попытаетесь " +"записать макрос поверх существующего, будет предложено либо перезаписать его " +"либо выбрать другое имя или сочетание клавиш для макроса, в противном случае " +"существующий макрос с таким же именем или сочетанием клавиш будет удалён." #. create dialog box #: ../geanymacro/src/geanymacro.c:1057 @@ -3322,136 +3372,124 @@ #: ../geanymacro/src/geanymacro.c:1333 #, c-format msgid "Search %s, looking for %s%s%s.%s%s%s%s%s" -msgstr "" +msgstr "Поиск %s, ищем %s%s%s.%s%s%s%s%s" #. create dialog box #: ../geanymacro/src/geanymacro.c:1388 -#, fuzzy msgid "Search Options:" -msgstr "Маркеры поиска:" +msgstr "Параметры поиска:" #. create buttons #: ../geanymacro/src/geanymacro.c:1393 ../geanymacro/src/geanymacro.c:1536 -#: ../geanymacro/src/geanymacro.c:1819 ../geanymacro/src/geanymacro.c:2116 +#: ../geanymacro/src/geanymacro.c:1826 ../geanymacro/src/geanymacro.c:2122 msgid "_Ok" -msgstr "" +msgstr "_Ok" #: ../geanymacro/src/geanymacro.c:1394 ../geanymacro/src/geanymacro.c:1537 -#: ../geanymacro/src/geanymacro.c:1820 -#, fuzzy +#: ../geanymacro/src/geanymacro.c:1827 msgid "_Cancel" -msgstr "Отмена" +msgstr "_Отмена" #: ../geanymacro/src/geanymacro.c:1403 -#, fuzzy msgid "Search Forwards" -msgstr "Искать:" +msgstr "Поиск вперёд" #: ../geanymacro/src/geanymacro.c:1404 -#, fuzzy msgid "Search Backwards" -msgstr "Маркеры поиска:" +msgstr "Поиск назад" #. create checkbox to check for search options #: ../geanymacro/src/geanymacro.c:1410 -#, fuzzy msgid "Search for contents of clipboard" -msgstr "Скопировать полный путь в буфер обмена" +msgstr "Поиск по содержимому буфера обмена" -#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:92 +#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:101 msgid "Search for:" msgstr "Искать:" #. create checkbox to check for search options #: ../geanymacro/src/geanymacro.c:1442 -#, fuzzy msgid "Search is case sensitive" -msgstr "С учётом регистра" +msgstr "Искать с учётом регистра" #: ../geanymacro/src/geanymacro.c:1447 -#, fuzzy msgid "Search for whole word" -msgstr "Искать:" +msgstr "Искать слово целиком" #: ../geanymacro/src/geanymacro.c:1452 -#, fuzzy msgid "Search for start of word" -msgstr "Искать:" +msgstr "Искать с начала слова" #: ../geanymacro/src/geanymacro.c:1457 -#, fuzzy msgid "Search text is regular expression" -msgstr "Недействительное регулярное выражение: %s" +msgstr "Строка поиска является регулярным выражением" #: ../geanymacro/src/geanymacro.c:1462 msgid "Search text is POSIX compatible" -msgstr "" +msgstr "Поиск текста совместимый с POSIX" #. create dialog box #: ../geanymacro/src/geanymacro.c:1531 msgid "Edit Insert/Replace Text" -msgstr "" +msgstr "Редактировать текст вставки/замены" #: ../geanymacro/src/geanymacro.c:1544 -#, fuzzy msgid "Text:" -msgstr "Консоль:" +msgstr "Текст:" -#: ../geanymacro/src/geanymacro.c:1571 ../geanymacro/src/geanymacro.c:1755 +#: ../geanymacro/src/geanymacro.c:1570 ../geanymacro/src/geanymacro.c:1758 #, c-format msgid "Insert/replace with \"%s\"" -msgstr "" +msgstr "Вставить заменить \"%s\"" #. create dialog box -#: ../geanymacro/src/geanymacro.c:1731 -#, fuzzy, c-format +#: ../geanymacro/src/geanymacro.c:1735 +#, c-format msgid "Edit: %s" -msgstr "Редактировать макрос" +msgstr "Редактировать: %s" #. add column -#: ../geanymacro/src/geanymacro.c:1794 +#: ../geanymacro/src/geanymacro.c:1801 msgid "Event" -msgstr "" +msgstr "Событие" #. add buttons -#: ../geanymacro/src/geanymacro.c:1809 +#: ../geanymacro/src/geanymacro.c:1816 msgid "Move _Up" -msgstr "" +msgstr "Переместить _вверх" -#: ../geanymacro/src/geanymacro.c:1811 +#: ../geanymacro/src/geanymacro.c:1818 msgid "Move Do_wn" -msgstr "" +msgstr "Переместить в_низ" -#: ../geanymacro/src/geanymacro.c:1813 +#: ../geanymacro/src/geanymacro.c:1820 msgid "New _Above" -msgstr "" +msgstr "_Добавить выше" -#: ../geanymacro/src/geanymacro.c:1814 +#: ../geanymacro/src/geanymacro.c:1821 msgid "New _Below" -msgstr "" +msgstr "Д_обавить ниже" -#: ../geanymacro/src/geanymacro.c:1817 ../geanymacro/src/geanymacro.c:2114 -#, fuzzy +#: ../geanymacro/src/geanymacro.c:1824 ../geanymacro/src/geanymacro.c:2120 msgid "_Delete" -msgstr "Удалить" +msgstr "_Удалить" #. create dialog box -#: ../geanymacro/src/geanymacro.c:2059 +#: ../geanymacro/src/geanymacro.c:2065 msgid "Edit Macros" msgstr "Редактировать макрос" -#: ../geanymacro/src/geanymacro.c:2089 +#: ../geanymacro/src/geanymacro.c:2095 msgid "Macro Name" msgstr "Имя макроса" # read/write/both -#: ../geanymacro/src/geanymacro.c:2095 +#: ../geanymacro/src/geanymacro.c:2101 msgid "Key Trigger" msgstr "Комбинация клавиш" #. add buttons -#: ../geanymacro/src/geanymacro.c:2110 -#, fuzzy +#: ../geanymacro/src/geanymacro.c:2116 msgid "_Re-Record" msgstr "Перезаписать" @@ -3470,178 +3508,222 @@ msgid "_Edit Macros" msgstr "Редактировать макрос" +#. *< \brief It's the information message about geany mini script +#: ../geanyminiscript/src/gms_gui.c:129 +msgid "" +"GMS : Geany Mini-Script filter Plugin\n" +"This plugin is a tool to apply a script filter on:\n" +" o the text selection,\n" +" o the current document,\n" +" o all documents of the current session.\n" +"\n" +"The filter type can be:\n" +" o Unix shell script,\n" +" o perl script,\n" +" o python script,\n" +" o sed commands,\n" +" o awk script.\n" +"\n" +"AUTHOR\n" +" Written by Pascal BURLOT (December,2008)\n" +"\n" +"LICENSE:\n" +"This program is free software; you can redistribute\n" +"it and/or modify it under the terms of the GNU \n" +"General Public License as published by the Free\n" +"Software Foundation; either version 2 of the License,\n" +"or (at your option) any later version." +msgstr "" +"Модуль фильтрующих мини-сценариев Geany (GMS)\n" +"Данный модуль предназначен для фильтрации мини-скриптами:\n" +" o выделенного текста,\n" +" o всего текущего документа,\n" +" o всех документов в текущем сеансе.\n" +"\n" +"Фильтры могут быть следующих видов:\n" +" o сценарий Unix Shell,\n" +" o сценарий perl,\n" +" o сценарий python,\n" +" o команда sed,\n" +" o сценарий awk.\n" +"\n" +"АВТОР\n" +" Разработал Pascal BURLOT (Декабрь 2008)\n" +"\n" +"ЛИЦЕНЗИЯ:\n" +"This program is free software; you can redistribute\n" +"it and/or modify it under the terms of the GNU \n" +"General Public License as published by the Free\n" +"Software Foundation; either version 2 of the License,\n" +"or (at your option) any later version." + #: ../geanyminiscript/src/gms_gui.c:253 msgid "Load Mini-Script File" -msgstr "" +msgstr "Загрузить файл мини-сценария" #: ../geanyminiscript/src/gms_gui.c:310 msgid "Save Mini-Script File" -msgstr "" +msgstr "Сохранить файл мини-сценария" -#: ../geanyminiscript/src/gms_gui.c:418 +#: ../geanyminiscript/src/gms_gui.c:419 msgid "Mini-Script Filter" -msgstr "" +msgstr "Фильтрующий мини-сценарий" -#: ../geanyminiscript/src/gms_gui.c:446 +#: ../geanyminiscript/src/gms_gui.c:445 msgid "Clear the mini-script window" -msgstr "" +msgstr "Очистить окно мини-сценария" -#: ../geanyminiscript/src/gms_gui.c:451 +#: ../geanyminiscript/src/gms_gui.c:450 msgid "Load a mini-script into this window" -msgstr "" +msgstr "Загрузить мини-сценарий в текущее окно" -#: ../geanyminiscript/src/gms_gui.c:456 +#: ../geanyminiscript/src/gms_gui.c:455 msgid "Save the mini-script into a file" -msgstr "" +msgstr "Сохранить мини-сценарий в файл" -#: ../geanyminiscript/src/gms_gui.c:461 -#, fuzzy +#: ../geanyminiscript/src/gms_gui.c:460 msgid "Display a information about the mini-script plugin" -msgstr "Отобразить дополнительную информацию о выбранном элементе." +msgstr "Отобразить дополнительную информацию о модуле мини-сценариев" -#: ../geanyminiscript/src/gms_gui.c:469 +#: ../geanyminiscript/src/gms_gui.c:468 msgid "select the mini-script type" -msgstr "" +msgstr "выберите тип мини-сценария" #. Hbox : Radio bouttons for choosing the input: #. * selection/current document/all documents of the current session -#: ../geanyminiscript/src/gms_gui.c:500 +#: ../geanyminiscript/src/gms_gui.c:499 msgid "filter input" -msgstr "" +msgstr "входные данные фильтра" -#: ../geanyminiscript/src/gms_gui.c:502 +#: ../geanyminiscript/src/gms_gui.c:501 msgid "select the input of mini-script filter" -msgstr "" +msgstr "выберите тип входных данных для фильтрующего мини-сценария" -#: ../geanyminiscript/src/gms_gui.c:508 -#, fuzzy +#: ../geanyminiscript/src/gms_gui.c:507 msgid "selection" -msgstr "Выбрать шрифт" +msgstr "выделение" -#: ../geanyminiscript/src/gms_gui.c:509 -#, fuzzy +#: ../geanyminiscript/src/gms_gui.c:508 msgid "document" -msgstr "Отправить файл" +msgstr "документ" -#: ../geanyminiscript/src/gms_gui.c:510 +#: ../geanyminiscript/src/gms_gui.c:509 msgid "session" -msgstr "" +msgstr "сеанс" #. Hbox : Radio bouttons for choosing the output: #. * current document/ or new document -#: ../geanyminiscript/src/gms_gui.c:519 +#: ../geanyminiscript/src/gms_gui.c:518 msgid "filter output" -msgstr "" +msgstr "вывод фильтра" -#: ../geanyminiscript/src/gms_gui.c:521 +#: ../geanyminiscript/src/gms_gui.c:520 msgid "select the output of mini-script filter" -msgstr "" +msgstr "выберите тип выходных данных для фильтрующего мини-сценария" -#: ../geanyminiscript/src/gms_gui.c:527 +#: ../geanyminiscript/src/gms_gui.c:526 msgid "Current Doc." -msgstr "" +msgstr "Текущий документ" -#: ../geanyminiscript/src/gms_gui.c:528 -#, fuzzy +#: ../geanyminiscript/src/gms_gui.c:527 msgid "New Doc." -msgstr "Новый проект" +msgstr "Новый документ" -#: ../geanyminiscript/src/gms_gui.c:749 -#, fuzzy +#: ../geanyminiscript/src/gms_gui.c:748 msgid "script configuration" -msgstr "Невозможно загрузить конфигурацию: %s" +msgstr "настройки сценария" -#. All plugins must set name, description, version and author. #: ../geanyminiscript/src/gms.c:58 msgid "Mini Script" -msgstr "" +msgstr "Мини сценарии" -#: ../geanyminiscript/src/gms.c:58 +#: ../geanyminiscript/src/gms.c:59 msgid "" "A tool to apply a script filter on a text selection or current document(s)" msgstr "" +"Применяет сценарии-фильтры к текущему выделению или документу(ам)" -#: ../geanyminiscript/src/gms.c:59 +#: ../geanyminiscript/src/gms.c:60 msgid "Pascal BURLOT, a Geany user" -msgstr "" +msgstr "Pascal BURLOT, пользователь Geany" #. Add an item to the Tools menu -#: ../geanyminiscript/src/gms.c:278 +#: ../geanyminiscript/src/gms.c:249 msgid "_Mini-Script" -msgstr "" +msgstr "Мини-сценарий" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:58 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:61 msgid "Numbered Bookmarks for Geany" -msgstr "" +msgstr "Нумерованные закладки для Geany" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:923 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:927 #, c-format msgid "Unable to apply all markers to '%s' as all being used." -msgstr "" +msgstr "Невозможно применить все маркеры к '%s' так как они все используются." -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:925 -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:969 -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1392 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:929 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:973 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1396 msgid "_Okay" -msgstr "" +msgstr "_OK" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:967 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:971 #, c-format msgid "" "'%s' has been edited since it was last saved by geany. Marker positions may " "be unreliable and will not be loaded.\n" "Press Ignore to try an load markers anyway." msgstr "" +"'%s' был отредактирован с момента последнего сохранения в Geany. Положения " +"могут не соответствовать действительности и не будут загружены.\n" +"Нажмите Игнорировать, чтобы попробовать загрузить маркеры в любом случае." -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:970 -#, fuzzy +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:974 msgid "_Ignore" -msgstr "З_акрыть все" +msgstr "_Игнорировать" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1215 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1219 msgid "remember fold state" -msgstr "" +msgstr "Запоминать состояние свернутых блоков кода" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1221 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1225 msgid "Center view when goto bookmark" -msgstr "" +msgstr "Центрировать вид при переходе к закладке" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1228 -#, fuzzy +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1232 msgid "Move to start of line" -msgstr "Конвертировать выделение в таблицу" +msgstr "Переходить в начало строки" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1229 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1233 msgid "Move to remembered position in line" -msgstr "" +msgstr "Переходить к сохранённой позиции в строке" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1230 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1234 msgid "Move to position in current line" -msgstr "" +msgstr "Перемещение в текущей строке" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1231 -#, fuzzy +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1235 msgid "Move to End of line" -msgstr "Конвертировать выделение в таблицу" +msgstr "Переходить в конец строки" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1237 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1241 msgid "Save file settings with program settings" -msgstr "" +msgstr "Сохранять настройки файла вместе с настройками программы" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1238 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1242 msgid "Save file settings to filename with suffix" -msgstr "" +msgstr "Сохранять настройки файла с суффиксом" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1243 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1247 msgid "remember normal Bookmarks" -msgstr "" +msgstr "Запоминать стандартные закладки" #. create dialog box -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1263 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1267 msgid "Numbered Bookmarks help" -msgstr "" +msgstr "Помощь по нумерованным закладкам" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1270 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1274 msgid "" "This Plugin implements Numbered Bookmarks in Geany, as well as remembering " "the state of folds, and positions of standard non-numbered bookmarks when a " @@ -3656,15 +3738,29 @@ "shown, but you can have more than one bookmark per line. To move to a " "previously set bookmark, press Ctrl+a number from 0 to 9." msgstr "" +"Данный модуль добавляет в Geany нумерованные закладки, а также возможность " +"сохранять состояние свернутых блоков кода и позиции стандартных " +"ненумерованных закладок при сохранении файла.\n" +"\n" +"Он позволяет использовать до 10 нумерованных закладок. Чтобы установить " +"нумерованную закладку, нажмите сочетание клавиш Ctrl+Shift+число от 0 до 9. " +"Вы увидите маркер рядом с номером строки. Если нажать сочетание " +"Ctrl+Shift+число на строке, в которой уже есть закладка с таким номером, " +"закладка удаляется, в противном случае закладка перемещается, если она уже " +"была назначена на другой строке или создаётся, если она ещё не была " +"установлена. Возле номера строки отображается только последняя закладка, " +"но можно устанавливать более одной закладки на одну строку. Чтобы перейти " +"к ранее установленной закладке, нажмите сочетание клавиш " +"Ctrl+число от 0 до 9." -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1391 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1395 msgid "Unable to apply markers as all being used." -msgstr "" +msgstr "Невозможно применить маркеры так как они все уже используются." #: ../geanypg/src/decrypt_cb.c:33 ../geanypg/src/encrypt_cb.c:32 #: ../geanypg/src/sign_cb.c:33 msgid "couldn't create tempfile" -msgstr "" +msgstr "не удалось создать временный файл" #: ../geanypg/src/encrypt_cb.c:84 #, c-format @@ -3676,182 +3772,187 @@ "\n" "Are you *really* sure you want to use this key anyway?" msgstr "" +"Ключ с ID пользователя \"%s\" имеет достоверность \"%s\".\n" +"\n" +"ВНИМАНИЕ: Невозможно гарантировать, что этот ключ принадлежит пользователю " +"таким ID.\n" +"\n" +"Вы *действительно* уверены, что хотите использовать этот ключ в любом случае?" #: ../geanypg/src/encrypt_cb.c:96 msgid "" "No recipients were selected,\n" "use symetric cipher?" msgstr "" +"Не выбран ни один из получателей,\n" +"использовать симметричное шифрование?" #: ../geanypg/src/geanypg.c:37 msgid "gpg encryption plugin for geany" -msgstr "" +msgstr "модуль шифрования gpg для geany" #: ../geanypg/src/geanypg.c:39 msgid "Hans Alves " -msgstr "" +msgstr "Hans Alves " #: ../geanypg/src/geanypg.c:47 msgid "Using libgpgme version:" -msgstr "" +msgstr "Используется libgpgme версии:" #: ../geanypg/src/geanypg.c:60 ../geanypg/src/geanypg.c:61 -#, fuzzy msgid "Error from" -msgstr "Ошибка:" +msgstr "Ошибка из" #: ../geanypg/src/geanypg.c:86 msgid "Encrypt" -msgstr "" +msgstr "Зашифровать" #: ../geanypg/src/geanypg.c:87 msgid "Sign" -msgstr "" +msgstr "Подписать" #: ../geanypg/src/geanypg.c:88 msgid "Decrypt / Verify" -msgstr "" +msgstr "Расшифровать / проверить" #: ../geanypg/src/geanypg.c:89 msgid "Verify detached signature" -msgstr "" +msgstr "Проверить подпись" #: ../geanypg/src/key_selection_dialog.c:152 -#, fuzzy msgid "Please select any recipients" -msgstr "Удалить контрольную точку?" +msgstr "Выберите получателей" #: ../geanypg/src/key_selection_dialog.c:154 msgid "Sign the message as:" -msgstr "" +msgstr "Подписать сообщение как:" #: ../geanypg/src/key_selection_dialog.c:162 -#, fuzzy msgid "Select recipients" -msgstr "Выбрать шрифт" +msgstr "Выбрать получателей" #: ../geanypg/src/key_selection_dialog.c:224 msgid "Choose a key to sign with:" -msgstr "" +msgstr "Выберите ключ для подписи:" #: ../geanypg/src/key_selection_dialog.c:232 -#, fuzzy msgid "Select signer" -msgstr "Выбрать шрифт" +msgstr "Выберите подписывающегося" #. shouldn't get here -#: ../geanypg/src/pinentry.c:107 +#: ../geanypg/src/pinentry.c:111 msgid "Could not use pinentry." -msgstr "" +msgstr "Не удалось использовать pinentry." -#: ../geanypg/src/pinentry.c:119 +#: ../geanypg/src/pinentry.c:123 msgid "Unexpected output from pinentry." -msgstr "" +msgstr "Неожиданный вывод из pinentry." #. read the rest of the first line after OK -#: ../geanypg/src/pinentry.c:127 +#: ../geanypg/src/pinentry.c:131 msgid "Passphrase entry" -msgstr "" +msgstr "Пароль" -#: ../geanypg/src/pinentry.c:131 +#: ../geanypg/src/pinentry.c:135 msgid "Passphrase" -msgstr "" +msgstr "Пароль" -#: ../geanypg/src/pinentry.c:136 +#: ../geanypg/src/pinentry.c:140 msgid "Enter passphrase for" -msgstr "" +msgstr "Введите пароль для" -#: ../geanypg/src/pinentry.c:167 +#: ../geanypg/src/pinentry.c:171 msgid "pinentry gave error" -msgstr "" +msgstr "pinentry вернул ошибку" -#: ../geanypg/src/pinentry.c:170 +#: ../geanypg/src/pinentry.c:174 msgid "Unexpected error from pinentry." -msgstr "" +msgstr "Неожиданная ошибка от pinentry." -#: ../geanypg/src/pinentry.c:195 +#: ../geanypg/src/pinentry.c:199 msgid "" "Error, Passphrase input without using gpg-agent is not supported on Windows " "yet." msgstr "" +"Ошибка, ввод пароля без использования gpg-agent не поддерживается в Windows." #: ../geanypg/src/verify_aux.c:53 msgid "a key with fingerprint" -msgstr "" +msgstr "ключ с отпечатком" -#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:522 -#: ../spellcheck/src/gui.c:533 +#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:527 +#: ../spellcheck/src/gui.c:538 msgid "unknown" msgstr "неизвестно" #: ../geanypg/src/verify_aux.c:67 msgid "undefined" -msgstr "" +msgstr "неопределено" #: ../geanypg/src/verify_aux.c:68 msgid "never" -msgstr "" +msgstr "никогда" #: ../geanypg/src/verify_aux.c:69 msgid "marginal" -msgstr "" +msgstr "ограниченно" #: ../geanypg/src/verify_aux.c:70 msgid "full" -msgstr "" +msgstr "полное" #: ../geanypg/src/verify_aux.c:71 msgid "ultimate" -msgstr "" +msgstr "абсолютно" #: ../geanypg/src/verify_aux.c:72 ../geanypg/src/verify_aux.c:74 msgid "[bad validity value]" -msgstr "" +msgstr "[плохое значение достоверности]" #. buffer should be more than 105 bytes long #: ../geanypg/src/verify_aux.c:79 msgid " valid" -msgstr "" +msgstr " действительный" #: ../geanypg/src/verify_aux.c:80 msgid " green" -msgstr "" +msgstr " зелёный" #: ../geanypg/src/verify_aux.c:81 msgid " red" -msgstr "" +msgstr " красный" #: ../geanypg/src/verify_aux.c:82 msgid " revoked" -msgstr "" +msgstr " отозван" #: ../geanypg/src/verify_aux.c:83 msgid " key-expired" -msgstr "" +msgstr " ключ прострочен" #: ../geanypg/src/verify_aux.c:84 msgid " sig-expired" -msgstr "" +msgstr " подпись просрочена" #: ../geanypg/src/verify_aux.c:85 msgid " key-missing" -msgstr "" +msgstr " ключ отсутствует" #: ../geanypg/src/verify_aux.c:86 msgid " crl-missing" -msgstr "" +msgstr " CRL отсутствует" #: ../geanypg/src/verify_aux.c:87 msgid " crl-too-old" -msgstr "" +msgstr " CRL слишком старый" #: ../geanypg/src/verify_aux.c:88 msgid " bad-policy" -msgstr "" +msgstr " плохая политика" #: ../geanypg/src/verify_aux.c:89 msgid " sys-error" -msgstr "" +msgstr " системная ошибка" #: ../geanypg/src/verify_aux.c:96 #, c-format @@ -3868,77 +3969,86 @@ "other flags:%s%s\n" "notations .: %s\n" msgstr "" +"статус ....: %s\n" +"резюме ....:%s\n" +"отпечаток .: %s\n" +"создан ....: %sистекает ..: %sдостоверн. : %s\n" +"причина ...: %s\n" +"ключ алг. .: %s\n" +"хэш-функ. .: %s\n" +"pka адрес .: %s\n" +"pka довер. : %s\n" +"др. флаги .:%s%s\n" +"прим. .....: %s\n" #: ../geanypg/src/verify_aux.c:119 ../geanypg/src/verify_aux.c:124 -#, fuzzy msgid "Unknown\n" -msgstr "(неизвестно)" +msgstr "Неизвестно\n" #: ../geanypg/src/verify_aux.c:129 ../geanypg/src/verify_aux.c:136 #: ../geanypg/src/verify_aux.c:147 ../geanypg/src/verify_aux.c:154 msgid "[None]" -msgstr "" +msgstr "[Нет]" #: ../geanypg/src/verify_aux.c:134 ../geanypg/src/verify_aux.c:135 #: ../geanypg/src/verify_aux.c:152 ../geanypg/src/verify_aux.c:153 -#, fuzzy msgid "Unknown" -msgstr "(неизвестно)" +msgstr "Неизвестно" #: ../geanypg/src/verify_aux.c:137 ../geanypg/src/verify_aux.c:155 msgid "n/a" -msgstr "" +msgstr "н/д" #: ../geanypg/src/verify_aux.c:137 ../geanypg/src/verify_aux.c:155 msgid "bad" -msgstr "" +msgstr "плохой" #: ../geanypg/src/verify_aux.c:137 ../geanypg/src/verify_aux.c:155 msgid "okay" -msgstr "" +msgstr "хороший" #: ../geanypg/src/verify_aux.c:137 ../geanypg/src/verify_aux.c:155 msgid "RFU" -msgstr "" +msgstr "RFU" #: ../geanypg/src/verify_aux.c:138 ../geanypg/src/verify_aux.c:156 msgid " wrong-key-usage" -msgstr "" +msgstr " некорректное использование ключа" #: ../geanypg/src/verify_aux.c:139 ../geanypg/src/verify_aux.c:156 msgid " chain-model" -msgstr "" +msgstr " модель цепочки" #: ../geanypg/src/verify_aux.c:140 ../geanypg/src/verify_aux.c:157 msgid "yes" -msgstr "" +msgstr "да" #: ../geanypg/src/verify_aux.c:140 ../geanypg/src/verify_aux.c:157 msgid "no" -msgstr "" +msgstr "нет" #: ../geanypg/src/verify_aux.c:175 msgid "Found a signature from" -msgstr "" +msgstr "Обнаружена подпись от" #: ../geanypg/src/verify_aux.c:178 msgid "Signature" -msgstr "" +msgstr "Подпись" #: ../geanypg/src/verify_aux.c:201 msgid "Could not find verification results" -msgstr "" +msgstr "Не удалось обнаружить результаты проверки" #: ../geanypg/src/verify_aux.c:202 msgid "Error, could not find verification results" -msgstr "" +msgstr "Ошибка, не удалось найти результаты проверки" #: ../geanypg/src/verify_cb.c:27 msgid "Open a signature file" -msgstr "" +msgstr "Открыть файл с подписью" #: ../geanyprj/src/geanyprj.c:38 ../geanyprj/src/sidebar.c:456 -#: ../gproject/src/gproject-sidebar.c:822 +#: ../gproject/src/gproject-sidebar.c:870 msgid "Project" msgstr "Проект" @@ -3948,12 +4058,11 @@ #: ../geanyprj/src/geanyprj.c:224 msgid "Find a text in geanyprj's project" -msgstr "" +msgstr "Найти текст в проекте geanyprj" #: ../geanyprj/src/geanyprj.c:238 -#, fuzzy msgid "Display sidebar" -msgstr "Скрыть боковую панель" +msgstr "Показать боковую панель" #: ../geanyprj/src/menu.c:92 msgid "Project Preferences" @@ -3968,7 +4077,7 @@ msgid "C_reate" msgstr "Создать" -#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:116 +#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:114 msgid "Name:" msgstr "Имя:" @@ -4045,7 +4154,7 @@ msgid "Remove File" msgstr "Удалить файл" -#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:803 +#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:849 msgid "H_ide Sidebar" msgstr "Скрыть боковую панель" @@ -4054,6 +4163,48 @@ msgid "Project \"%s\" opened." msgstr "Проект \"%s\" открыт." +#: ../geanypy/src/geanypy-plugin.c:34 +msgid "GeanyPy" +msgstr "GeanyPy" + +#: ../geanypy/src/geanypy-plugin.c:35 +msgid "Python plugins support" +msgstr "Поддержка модулей на Python" + +#: ../geanypy/src/geanypy-plugin.c:77 +#, c-format +msgid "Unable to pre-load Python library: %s." +msgstr "Невозможно загрузить библиотеку Python: %s." + +#: ../geanypy/src/geanypy-plugin.c:157 +msgid "Failed to import manager module" +msgstr "Не удалось импортировать управляющий модуль" + +#: ../geanypy/src/geanypy-plugin.c:166 +msgid "Failed to retrieve PluginManager from manager module" +msgstr "Не удалось получить PluginManager из управляющего модуля" + +#: ../geanypy/src/geanypy-plugin.c:182 +msgid "System plugin directory not found." +msgstr "Системный каталог с модулями не найден." + +#: ../geanypy/src/geanypy-plugin.c:211 +msgid "Unable to instantiate new PluginManager" +msgstr "Невозможно создать экземпляр PluginManager" + +#: ../geanypy/src/geanypy-plugin.c:227 +msgid "Unable to get show_all() method on plugin manager" +msgstr "Невозможно получить метод show_all() в менеджере модулей" + +#: ../geanypy/src/geanypy-plugin.c:255 +#, c-format +msgid "Unable to create Python plugins directory: %s: %s" +msgstr "Невозможно создать каталог модулей Python: %s: %s" + +#: ../geanypy/src/geanypy-plugin.c:266 +msgid "Python Plugin Manager" +msgstr "Менеджер модулей Python" + #: ../geanysendmail/src/geanysendmail.c:43 msgid "GeanySendMail" msgstr "Отправка почты" @@ -4074,12 +4225,12 @@ msgid "Enter the recipient's e-mail address:" msgstr "Введите электронный адрес получателя" -#: ../geanysendmail/src/geanysendmail.c:136 +#: ../geanysendmail/src/geanysendmail.c:138 msgid "Filename placeholder not found. The executed command might have failed." msgstr "" "Шаблон имени файла не найден. Выполняемая команда могла завершиться неудачно" -#: ../geanysendmail/src/geanysendmail.c:142 +#: ../geanysendmail/src/geanysendmail.c:144 msgid "" "Recipient address placeholder not found. The executed command might have " "failed." @@ -4087,34 +4238,33 @@ "Шаблон адреса получателя не найден. Выполняемая команда могла завершиться " "неудачно" -#: ../geanysendmail/src/geanysendmail.c:157 +#: ../geanysendmail/src/geanysendmail.c:159 msgid "Could not execute mailer. Please check your configuration." msgstr "" "Невозможно запустить почтовую программу. Пожалуйста проверьте настройки." -#: ../geanysendmail/src/geanysendmail.c:166 +#: ../geanysendmail/src/geanysendmail.c:168 msgid "Please define a mail client first." msgstr "Пожалуйста, выберите почтовую программу" -#: ../geanysendmail/src/geanysendmail.c:171 +#: ../geanysendmail/src/geanysendmail.c:173 msgid "File has to be saved before sending." msgstr "Файл должен быт сохранён перед отправкой" -#: ../geanysendmail/src/geanysendmail.c:187 +#: ../geanysendmail/src/geanysendmail.c:191 msgid "Mail" msgstr "Почта" -#: ../geanysendmail/src/geanysendmail.c:218 +#: ../geanysendmail/src/geanysendmail.c:222 msgid "Send by mail" msgstr "Отправить по почте" #. add a label and a text entry to the dialog -#: ../geanysendmail/src/geanysendmail.c:308 +#: ../geanysendmail/src/geanysendmail.c:312 msgid "Path and options for the mail client:" msgstr "Путь и опции почтового клиента:" -#: ../geanysendmail/src/geanysendmail.c:316 -#, fuzzy +#: ../geanysendmail/src/geanysendmail.c:320 msgid "" "Note: \n" "\t%f will be replaced by your file.\n" @@ -4125,36 +4275,36 @@ "\tmutt -s \"Sending '%b'\" -a \"%f\" \"%r\"" msgstr "" "Замечание: \n" -"\t\\%f будет заменено на полный путь к файла.\n" -"\t\\%r будет заменено на адрес получателя.\n" -"\t\\%b будет заменено на имя файла\n" -"\tПример:\n" -"\tsylpheed --attach \"\\%f\" --compose \"\\%r\"\n" -"\tmutt -s \"Отсылаем '\\%b'\" -a \"\\%f\" \"\\%r\"" +"\t%f будет заменено на полный путь к файлу.\n" +"\t%r будет заменено на адрес получателя.\n" +"\t%b будет заменено на имя файла\n" +"\tПримеры:\n" +"\tsylpheed --attach \"%f\" --compose \"%r\"\n" +"\tmutt -s \"Отсылаем '%b'\" -a \"%f\" \"%r\"" -#: ../geanysendmail/src/geanysendmail.c:326 +#: ../geanysendmail/src/geanysendmail.c:330 msgid "Show toolbar icon" msgstr "Показывать иконку в панели инструментов" -#: ../geanysendmail/src/geanysendmail.c:328 +#: ../geanysendmail/src/geanysendmail.c:332 msgid "Shows a icon in the toolbar to send file more easy." msgstr "" "Показывать иконку в панели инструментов для упрощения процесса отправки" -#: ../geanysendmail/src/geanysendmail.c:334 +#: ../geanysendmail/src/geanysendmail.c:338 msgid "Use dialog for entering email address of recipients" msgstr "Использовать диалог для ввода электронного адреса получателя" -#: ../geanysendmail/src/geanysendmail.c:356 +#: ../geanysendmail/src/geanysendmail.c:360 msgid "Send file by mail" msgstr "Отправить файл по электронной почте" #. Build up menu entry -#: ../geanysendmail/src/geanysendmail.c:379 +#: ../geanysendmail/src/geanysendmail.c:383 msgid "_Mail document" msgstr "Отправить файл" -#: ../geanysendmail/src/geanysendmail.c:382 +#: ../geanysendmail/src/geanysendmail.c:386 msgid "" "Sends the opened file as unzipped attachment by any mailer from your $PATH" msgstr "" @@ -4175,77 +4325,101 @@ msgid "geanyvc: s_spawn_sync error: %s" msgstr "geanyvc: ошибка s_spawn_sync: %s" -#: ../geanyvc/src/geanyvc.c:609 ../geanyvc/src/geanyvc.c:620 +#: ../geanyvc/src/geanyvc.c:561 +#, c-format +msgid "File %s: action %s executed via %s." +msgstr "Файл %s: действие %s выполняется через %s." + +#: ../geanyvc/src/geanyvc.c:614 ../geanyvc/src/geanyvc.c:625 #, c-format msgid "geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'" msgstr "geanyvc: vcdiff_file_activated: Невозможно переименовать '%s' в '%s'" -#: ../geanyvc/src/geanyvc.c:646 ../geanyvc/src/geanyvc.c:696 +#: ../geanyvc/src/geanyvc.c:651 ../geanyvc/src/geanyvc.c:701 msgid "No changes were made." msgstr "Изменения не были применены." -#: ../geanyvc/src/geanyvc.c:723 -#, fuzzy +#: ../geanyvc/src/geanyvc.c:728 msgid "No history available" msgstr "История не доступна" -#: ../geanyvc/src/geanyvc.c:916 ../geanyvc/src/geanyvc.c:924 +#: ../geanyvc/src/geanyvc.c:921 ../geanyvc/src/geanyvc.c:929 #, c-format msgid "Do you really want to revert: %s?" msgstr "Вы действительно хотите отменить изменения: %s?" -#: ../geanyvc/src/geanyvc.c:932 +#: ../geanyvc/src/geanyvc.c:937 #, c-format msgid "Do you really want to add: %s?" msgstr "Вы действительно хотите добавить в репозиторий: %s?" -#: ../geanyvc/src/geanyvc.c:939 +#: ../geanyvc/src/geanyvc.c:944 #, c-format msgid "Do you really want to remove: %s?" msgstr "Вы действительно хотите удалиь из репозитория: %s?" -#: ../geanyvc/src/geanyvc.c:962 +#: ../geanyvc/src/geanyvc.c:967 msgid "Do you really want to update?" msgstr "Вы действительно хотите обновить из репозитория: %s?" -#: ../geanyvc/src/geanyvc.c:1225 +#: ../geanyvc/src/geanyvc.c:1094 +msgid "" +"The resulting differences cannot be displayed because the changes are too " +"big to display here and would slow down the UI significantly.\n" +"\n" +"To view the differences, cancel this dialog and open the differences in " +"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)." +msgstr "" +"Полученный список различий не может быть отображен так как " +"изменений слишком много и это может значительно замедлить интерфейс.\n" +"\n" +"Чтобы увидеть различия закройте это диалоговое окно и откройте список " +"различий в Geany непосредственно используя меню GeanyVC " +"(Базовая директория -> Разница)." + +#: ../geanyvc/src/geanyvc.c:1243 msgid "Commit Y/N" msgstr "Фиксировать изменения Да/Нет" -#: ../geanyvc/src/geanyvc.c:1235 +#: ../geanyvc/src/geanyvc.c:1253 msgid "Status" msgstr "Статус" -#: ../geanyvc/src/geanyvc.c:1242 +#: ../geanyvc/src/geanyvc.c:1260 msgid "Path" msgstr "Путь" -#: ../geanyvc/src/geanyvc.c:1330 +#: ../geanyvc/src/geanyvc.c:1324 +#, c-format +msgid "Line: %d Column: %d" +msgstr "Строка: %d позиция: %d" + +#: ../geanyvc/src/geanyvc.c:1370 msgid "Commit" msgstr "Фиксировать" -#: ../geanyvc/src/geanyvc.c:1372 +#: ../geanyvc/src/geanyvc.c:1412 msgid "_De-/select all files" msgstr "Все файлы" -#: ../geanyvc/src/geanyvc.c:1413 +#: ../geanyvc/src/geanyvc.c:1456 msgid "Commit message:" msgstr "Комментарий к изменениям:" -#: ../geanyvc/src/geanyvc.c:1426 +#: ../geanyvc/src/geanyvc.c:1475 msgid "C_ommit" msgstr "Ф_иксировать изменения" -#: ../geanyvc/src/geanyvc.c:1500 +#: ../geanyvc/src/geanyvc.c:1556 msgid "Nothing to commit." msgstr "Отсутствуют локальные изменения." -#: ../geanyvc/src/geanyvc.c:1546 +#: ../geanyvc/src/geanyvc.c:1602 #, c-format msgid "Error initializing spell checking: %s" msgstr "Ошибка инициализации системы проверки правописания: %s" -#: ../geanyvc/src/geanyvc.c:1558 +#: ../geanyvc/src/geanyvc.c:1614 #, c-format msgid "" "Error while setting up language for spellchecking. Please check " @@ -4254,11 +4428,11 @@ "В процессе установки языка для проверки орфографии произошла ошибка. " "Пожалуйста проверьте настройки. Сообщение об ошибке: %s" -#: ../geanyvc/src/geanyvc.c:1834 +#: ../geanyvc/src/geanyvc.c:1890 msgid "Set Changed-flag for document tabs created by the plugin" msgstr "Устанавливать флаг \"изменённый\" для вкладок созданных плагином" -#: ../geanyvc/src/geanyvc.c:1837 +#: ../geanyvc/src/geanyvc.c:1893 msgid "" "If this option is activated, every new by the VC-plugin created document tab " "will be marked as changed. Even this option is useful in some cases, it " @@ -4268,275 +4442,278 @@ "как модифицированный. Несмотря на то, что данная опция в некоторых случаях " "полезна, она может вызвать большое количество диалогов сохранения файла." -#: ../geanyvc/src/geanyvc.c:1845 +#: ../geanyvc/src/geanyvc.c:1901 msgid "Confirm adding new files to a VCS" msgstr "Подтверждать добавление файлов в репозиторий" -#: ../geanyvc/src/geanyvc.c:1848 +#: ../geanyvc/src/geanyvc.c:1904 msgid "Shows a confirmation dialog on adding a new (created) file to VCS." msgstr "" "Показывать диалог подтверждения при добавлении новых файлов в репозиторий" -#: ../geanyvc/src/geanyvc.c:1854 +#: ../geanyvc/src/geanyvc.c:1910 msgid "Maximize commit dialog" msgstr "Разворачивать диалог фиксации изменений" -#: ../geanyvc/src/geanyvc.c:1855 +#: ../geanyvc/src/geanyvc.c:1911 msgid "Show commit dialog maximize." msgstr "Максимизировать диалог фиксации изменений " -#: ../geanyvc/src/geanyvc.c:1861 +#: ../geanyvc/src/geanyvc.c:1917 msgid "Use external diff viewer" msgstr "Использовать внешнюю программу просмотра разницы" -#: ../geanyvc/src/geanyvc.c:1863 +#: ../geanyvc/src/geanyvc.c:1919 msgid "Use external diff viewer for file diff." msgstr "Использовать внешнюю программу просмотра разницы для файла" -#: ../geanyvc/src/geanyvc.c:1869 +#: ../geanyvc/src/geanyvc.c:1925 msgid "Show VC entries at editor menu" msgstr "Показывать пункты системы контроля версий в меню редактора" -#: ../geanyvc/src/geanyvc.c:1871 +#: ../geanyvc/src/geanyvc.c:1927 msgid "Show entries for VC functions inside editor menu" msgstr "Показывать пункты меню системы контроля версий в меню редактора" -#: ../geanyvc/src/geanyvc.c:1876 +#: ../geanyvc/src/geanyvc.c:1932 msgid "Attach menu to menubar" -msgstr "" +msgstr "Разместить меню на главной панели" -#: ../geanyvc/src/geanyvc.c:1878 +#: ../geanyvc/src/geanyvc.c:1934 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " "directly inside Geany's menubar.Will take in account after next start of " "GeanyVC" msgstr "" +"Располагать меню данного модуля либо внутри меню Инструменты либо " +"непосредственно на главной панели меню Geany. Изменения вступают в силу " +"только после перезапуска расширения GeanyVC" -#: ../geanyvc/src/geanyvc.c:1886 +#: ../geanyvc/src/geanyvc.c:1942 msgid "Enable CVS" -msgstr "CVS" +msgstr "Включить CVS" -#: ../geanyvc/src/geanyvc.c:1891 +#: ../geanyvc/src/geanyvc.c:1947 msgid "Enable GIT" -msgstr "GIT" +msgstr "Включить GIT" -#: ../geanyvc/src/geanyvc.c:1896 +#: ../geanyvc/src/geanyvc.c:1952 msgid "Enable SVN" -msgstr "SVN" +msgstr "Включить SVN" -#: ../geanyvc/src/geanyvc.c:1901 +#: ../geanyvc/src/geanyvc.c:1957 msgid "Enable SVK" -msgstr "SVK" +msgstr "Включить SVK" -#: ../geanyvc/src/geanyvc.c:1906 +#: ../geanyvc/src/geanyvc.c:1962 msgid "Enable Bazaar" -msgstr "Bazaar" +msgstr "Включить Bazaar" -#: ../geanyvc/src/geanyvc.c:1911 +#: ../geanyvc/src/geanyvc.c:1967 msgid "Enable Mercurial" -msgstr "Mercurial" +msgstr "Включить Mercurial" -#: ../geanyvc/src/geanyvc.c:1917 +#: ../geanyvc/src/geanyvc.c:1973 msgid "Spellcheck language" msgstr "Язык проверки орфографии" -#: ../geanyvc/src/geanyvc.c:2008 +#: ../geanyvc/src/geanyvc.c:2064 msgid "_VC file Actions" msgstr "Контроль версий" #. Diff of current file #. Diff of the current dir #. Complete diff of base directory -#: ../geanyvc/src/geanyvc.c:2014 ../geanyvc/src/geanyvc.c:2091 -#: ../geanyvc/src/geanyvc.c:2131 +#: ../geanyvc/src/geanyvc.c:2070 ../geanyvc/src/geanyvc.c:2147 +#: ../geanyvc/src/geanyvc.c:2187 msgid "_Diff" msgstr "_Разница" -#: ../geanyvc/src/geanyvc.c:2017 +#: ../geanyvc/src/geanyvc.c:2073 msgid "Make a diff from the current active file" msgstr "Показать разницу для текущего файла" #. Revert current file #. Revert current dir #. Revert everything -#: ../geanyvc/src/geanyvc.c:2022 ../geanyvc/src/geanyvc.c:2100 -#: ../geanyvc/src/geanyvc.c:2139 +#: ../geanyvc/src/geanyvc.c:2078 ../geanyvc/src/geanyvc.c:2156 +#: ../geanyvc/src/geanyvc.c:2195 msgid "_Revert" msgstr "Отменить изменения" -#: ../geanyvc/src/geanyvc.c:2025 +#: ../geanyvc/src/geanyvc.c:2081 msgid "Restore pristine working copy file (undo local edits)." msgstr "Восстановить файл из рабочей копии (отмена локальных изменений)." #. Blame for current file -#: ../geanyvc/src/geanyvc.c:2034 +#: ../geanyvc/src/geanyvc.c:2090 msgid "_Blame" msgstr "_Изменения" -#: ../geanyvc/src/geanyvc.c:2037 +#: ../geanyvc/src/geanyvc.c:2093 msgid "Shows the changes made at one file per revision and author." msgstr "Показать изменения сделанные в файле по номеру ревизии и автору." #. History/log of current file #. History/log of the current dir #. Complete History/Log of base directory -#: ../geanyvc/src/geanyvc.c:2044 ../geanyvc/src/geanyvc.c:2110 -#: ../geanyvc/src/geanyvc.c:2151 +#: ../geanyvc/src/geanyvc.c:2100 ../geanyvc/src/geanyvc.c:2166 +#: ../geanyvc/src/geanyvc.c:2207 msgid "_History (log)" msgstr "_История" -#: ../geanyvc/src/geanyvc.c:2047 +#: ../geanyvc/src/geanyvc.c:2103 msgid "Shows the log of the current file" msgstr "Показать лог для текущего файла" #. base version of the current file -#: ../geanyvc/src/geanyvc.c:2052 +#: ../geanyvc/src/geanyvc.c:2108 msgid "_Original" msgstr "_Оригинал" -#: ../geanyvc/src/geanyvc.c:2055 -#, fuzzy +#: ../geanyvc/src/geanyvc.c:2111 msgid "Shows the original of the current file" msgstr "Показать оригинальный файл из рабочей копии" #. add current file -#: ../geanyvc/src/geanyvc.c:2063 +#: ../geanyvc/src/geanyvc.c:2119 msgid "_Add to Version Control" msgstr "Добавить в репозиторий" -#: ../geanyvc/src/geanyvc.c:2065 +#: ../geanyvc/src/geanyvc.c:2121 msgid "Add file to repository." msgstr "Добавить файл в репозиторий" #. remove current file -#: ../geanyvc/src/geanyvc.c:2071 +#: ../geanyvc/src/geanyvc.c:2127 msgid "_Remove from Version Control" msgstr "Удалить из репозитория" -#: ../geanyvc/src/geanyvc.c:2073 +#: ../geanyvc/src/geanyvc.c:2129 msgid "Remove file from repository." msgstr "Удалить файл из репозитория" -#: ../geanyvc/src/geanyvc.c:2088 +#: ../geanyvc/src/geanyvc.c:2144 msgid "_Directory" msgstr "_Директория" -#: ../geanyvc/src/geanyvc.c:2094 +#: ../geanyvc/src/geanyvc.c:2150 msgid "Make a diff from the directory of the current active file" msgstr "Показать разницу для директории текущего файла" -#: ../geanyvc/src/geanyvc.c:2103 +#: ../geanyvc/src/geanyvc.c:2159 msgid "Restore original files in the current folder (undo local edits)." msgstr "Восстановить файлы в текущей директории из рабочей копии" -#: ../geanyvc/src/geanyvc.c:2113 +#: ../geanyvc/src/geanyvc.c:2169 msgid "Shows the log of the current directory" msgstr "Показать лог для текущей директории" -#: ../geanyvc/src/geanyvc.c:2127 +#: ../geanyvc/src/geanyvc.c:2183 msgid "_Base Directory" msgstr "_Базовая директория" -#: ../geanyvc/src/geanyvc.c:2133 +#: ../geanyvc/src/geanyvc.c:2189 msgid "Make a diff from the top VC directory" msgstr "Показать разницу для корневой папки рабочей копии" -#: ../geanyvc/src/geanyvc.c:2141 +#: ../geanyvc/src/geanyvc.c:2197 msgid "Revert any local edits." msgstr "Отменить все локальные изменения." -#: ../geanyvc/src/geanyvc.c:2154 +#: ../geanyvc/src/geanyvc.c:2210 msgid "Shows the log of the top VC directory" msgstr "Показать лог для корневой папки рабочей копии" -#: ../geanyvc/src/geanyvc.c:2180 +#: ../geanyvc/src/geanyvc.c:2236 msgid "VC _Commit" msgstr "Фиксировать изменения" -#: ../geanyvc/src/geanyvc.c:2215 +#: ../geanyvc/src/geanyvc.c:2271 msgid "Show diff of file" msgstr "Показать разницу для файла" -#: ../geanyvc/src/geanyvc.c:2217 +#: ../geanyvc/src/geanyvc.c:2273 msgid "Show diff of directory" msgstr "Показать разницу для директории" -#: ../geanyvc/src/geanyvc.c:2219 +#: ../geanyvc/src/geanyvc.c:2275 msgid "Show diff of basedir" msgstr "Показать разницу для корневой директории" -#: ../geanyvc/src/geanyvc.c:2222 +#: ../geanyvc/src/geanyvc.c:2278 msgid "Commit changes" msgstr "Фиксировать локальные изменения" -#: ../geanyvc/src/geanyvc.c:2224 +#: ../geanyvc/src/geanyvc.c:2280 msgid "Show status" msgstr "Показать статус" -#: ../geanyvc/src/geanyvc.c:2226 +#: ../geanyvc/src/geanyvc.c:2282 msgid "Revert single file" msgstr "Отменить изменения для файла" -#: ../geanyvc/src/geanyvc.c:2228 +#: ../geanyvc/src/geanyvc.c:2284 msgid "Revert directory" msgstr "Отменить изменения для директории" -#: ../geanyvc/src/geanyvc.c:2230 +#: ../geanyvc/src/geanyvc.c:2286 msgid "Revert base directory" msgstr "Отменить изменения для корневой директории" -#: ../geanyvc/src/geanyvc.c:2232 +#: ../geanyvc/src/geanyvc.c:2288 msgid "Update file" msgstr "Обновить файл" -#: ../geanyvc/src/geanyvc.c:2260 +#: ../geanyvc/src/geanyvc.c:2316 msgid "_VC" msgstr "Контроль версий" -#: ../geanyvc/src/geanyvc.c:2266 -#, fuzzy +#: ../geanyvc/src/geanyvc.c:2322 msgid "_Version Control" -msgstr "Добавить в репозиторий" +msgstr "Контроль версий" #. Status of basedir -#: ../geanyvc/src/geanyvc.c:2288 +#: ../geanyvc/src/geanyvc.c:2344 msgid "_Status" msgstr "_Статус" -#: ../geanyvc/src/geanyvc.c:2290 +#: ../geanyvc/src/geanyvc.c:2346 msgid "Show status." -msgstr "Показать статус " +msgstr "Показать статус." -#: ../geanyvc/src/geanyvc.c:2297 +#: ../geanyvc/src/geanyvc.c:2353 msgid "Update from remote repository." msgstr "Обновить из репозитория." #. Commit all changes -#: ../geanyvc/src/geanyvc.c:2302 +#: ../geanyvc/src/geanyvc.c:2358 msgid "_Commit" msgstr "Ф_иксировать" -#: ../geanyvc/src/geanyvc.c:2304 +#: ../geanyvc/src/geanyvc.c:2360 msgid "Commit changes." msgstr "Фиксировать локальные изменения" #: ../geniuspaste/src/geniuspaste.c:101 msgid "Paste your code on your favorite pastebin" -msgstr "" +msgstr "Публикуйте свой код на одну из площадок pastebin" #: ../geniuspaste/src/geniuspaste.c:222 msgid "Refusing to create blank paste" -msgstr "" +msgstr "Нельзя публиковать пустой код" #: ../geniuspaste/src/geniuspaste.c:341 msgid "" "Unable to paste the code on codepad.org\n" "Retry or select another pastebin." msgstr "" +"Невозможно опубликовать код на codepad.org\n" +"Попробуйте снова или выберите другую площадку." #: ../geniuspaste/src/geniuspaste.c:393 msgid "Paste Successful" -msgstr "" +msgstr "Опубликовано успешно" #: ../geniuspaste/src/geniuspaste.c:395 #, c-format @@ -4544,6 +4721,8 @@ "Your paste can be found here:\n" "%s" msgstr "" +"Ваш код опубликован здесь:\n" +"%s" #: ../geniuspaste/src/geniuspaste.c:403 #, c-format @@ -4551,32 +4730,32 @@ "Unable to paste the code. Check your connection and retry.\n" "Error code: %d\n" msgstr "" +"Невозможно опубликовать код. Проверьте ваше соединение и повторите снова.\n" +"Код ошибки: %d\n" #: ../geniuspaste/src/geniuspaste.c:416 msgid "There are no opened documents. Open one and retry.\n" -msgstr "" +msgstr "Не открыто ни одного документа. Откройте хотя бы один и повторите.\n" #: ../geniuspaste/src/geniuspaste.c:429 -#, fuzzy msgid "The author name field is empty!" -msgstr "идентификатор совпадения пустой" +msgstr "Поле автора пусто!" #: ../geniuspaste/src/geniuspaste.c:448 -#, fuzzy msgid "Select a pastebin:" -msgstr "Выбрать шрифт" +msgstr "Выберите площадку:" #: ../geniuspaste/src/geniuspaste.c:451 msgid "Enter the author name:" -msgstr "" +msgstr "Введите имя автора:" #: ../geniuspaste/src/geniuspaste.c:466 msgid "Show your paste in a new browser tab" -msgstr "" +msgstr "Отображать опубликованный код в новой вкладке браузера" #: ../geniuspaste/src/geniuspaste.c:488 msgid "_Paste it!" -msgstr "" +msgstr "_Опубликовать!" #: ../gproject/src/gproject-main.c:36 ../gproject/src/gproject-project.c:455 msgid "GProject" @@ -4672,98 +4851,249 @@ "Замечание: устанавливает шаблоны файлов принадлежащих проекту для " "отображения во вкладке проекта в боковой панели." -#: ../gproject/src/gproject-sidebar.c:81 -#: ../gproject/src/gproject-sidebar.c:792 +#: ../gproject/src/gproject-sidebar.c:90 +#: ../gproject/src/gproject-sidebar.c:838 msgid "Find File" msgstr "Найти файл" -#: ../gproject/src/gproject-sidebar.c:108 +#: ../gproject/src/gproject-sidebar.c:117 msgid "Search inside:" msgstr "Искать внутри:" -#: ../gproject/src/gproject-sidebar.c:120 +#: ../gproject/src/gproject-sidebar.c:129 msgid "C_ase sensitive" msgstr "С учётом регистра" -#: ../gproject/src/gproject-sidebar.c:123 +#: ../gproject/src/gproject-sidebar.c:132 msgid "Search in full path" msgstr "Искать в полных путях" -#: ../gproject/src/gproject-sidebar.c:702 +#: ../gproject/src/gproject-sidebar.c:745 msgid "Reload all" msgstr "Перезагрузить всё" -#: ../gproject/src/gproject-sidebar.c:711 -#: ../treebrowser/src/treebrowser.c:1282 +#: ../gproject/src/gproject-sidebar.c:754 +#: ../treebrowser/src/treebrowser.c:1283 msgid "Expand all" msgstr "Развернуть всё" -#: ../gproject/src/gproject-sidebar.c:717 -#: ../treebrowser/src/treebrowser.c:1286 +#: ../gproject/src/gproject-sidebar.c:761 +#: ../treebrowser/src/treebrowser.c:1287 msgid "Collapse all" msgstr "Свернуть всё" -#: ../gproject/src/gproject-sidebar.c:726 +#: ../gproject/src/gproject-sidebar.c:771 msgid "Follow active editor" msgstr "Следовать пути активного документа" -#: ../gproject/src/gproject-sidebar.c:774 +#: ../gproject/src/gproject-sidebar.c:820 msgid "Expand All" msgstr "Развернуть всё" -#: ../gproject/src/gproject-sidebar.c:783 -#: ../treebrowser/src/treebrowser.c:1234 +#: ../gproject/src/gproject-sidebar.c:829 msgid "Find in Files" msgstr "Найти в файлах" #. POSITION OF VIEW -#: ../markdown/src/conf.c:570 -#, fuzzy +#: ../markdown/src/conf.c:567 msgid "Position:" -msgstr "Условие" +msgstr "Позиция:" -#: ../markdown/src/conf.c:576 -#, fuzzy +#: ../markdown/src/conf.c:573 msgid "Sidebar" -msgstr "Скрыть боковую панель" +msgstr "Боковая панель" -#: ../markdown/src/conf.c:584 -#, fuzzy +#: ../markdown/src/conf.c:581 msgid "Message Window" -msgstr "_Скрыть окно сообщений" +msgstr "Окно сообщений" -#: ../markdown/src/conf.c:598 +#: ../markdown/src/conf.c:595 msgid "Font:" -msgstr "" +msgstr "Шрифт:" -#: ../markdown/src/conf.c:616 +#: ../markdown/src/conf.c:612 msgid "Code Font:" -msgstr "" +msgstr "Шрифт для исходного текста:" -#: ../markdown/src/conf.c:634 +#: ../markdown/src/conf.c:629 msgid "BG Color:" -msgstr "" +msgstr "Цвет фона:" -#: ../markdown/src/conf.c:651 +#: ../markdown/src/conf.c:645 msgid "FG Color:" -msgstr "" +msgstr "Цвет шрифта:" -#: ../markdown/src/conf.c:670 -#, fuzzy +#: ../markdown/src/conf.c:663 msgid "Select Template File" -msgstr "Выделить до строки" +msgstr "Выберите шаблон" -#: ../markdown/src/plugin.c:33 +#: ../markdown/src/plugin.c:35 msgid "Real-time Markdown preview" -msgstr "" +msgstr "Предпросмотр Markdown в реальном времени" -#: ../markdown/src/plugin.c:49 +#: ../markdown/src/plugin.c:51 msgid "Markdown Preview" -msgstr "" +msgstr "Предпросмотр Markdown" -#: ../markdown/src/plugin.c:160 +#: ../markdown/src/plugin.c:162 msgid "The current document does not have a Markdown filetype." +msgstr "Текущий документ не является документом Markdown." + +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:35 +msgid "Pair Tag Highlighter" +msgstr "Подсветка парных тэгов" + +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:36 +msgid "Finds and highlights matching opening/closing HTML tag" +msgstr "Находит и подсвечивает соответствующий открывающий/закрывающий HTML тэг" + +#: ../pohelper/data/menus.ui.h:1 +msgid "_Translation Helper" +msgstr "Помощник переводчика" + +#: ../pohelper/data/menus.ui.h:2 +msgid "_Previous String" +msgstr "_Предыдущая строка" + +#: ../pohelper/data/menus.ui.h:3 ../pohelper/src/gph-plugin.c:1034 +msgid "Go to previous string" +msgstr "Перейти к предыдущей строке" + +#: ../pohelper/data/menus.ui.h:4 +msgid "_Next String" +msgstr "_Следующая строка" + +#: ../pohelper/data/menus.ui.h:5 ../pohelper/src/gph-plugin.c:1037 +msgid "Go to next string" +msgstr "Перейти к следующей строке" + +#: ../pohelper/data/menus.ui.h:6 +msgid "Pre_vious Untranslated" +msgstr "П_редыдущая непереведённая" + +#: ../pohelper/data/menus.ui.h:7 ../pohelper/src/gph-plugin.c:1040 +msgid "Go to previous untranslated string" +msgstr "Перейти к предыдущей непереведённой строке" + +#: ../pohelper/data/menus.ui.h:8 +msgid "Next _Untranslated" +msgstr "С_ледующая непереведённая" + +#: ../pohelper/data/menus.ui.h:9 ../pohelper/src/gph-plugin.c:1043 +msgid "Go to next untranslated string" +msgstr "Перейти к следующей непереведённой строке" + +#: ../pohelper/data/menus.ui.h:10 +msgid "Previous Fu_zzy" +msgstr "Предыдущая fu_zzy-строка" + +#: ../pohelper/data/menus.ui.h:11 ../pohelper/src/gph-plugin.c:1046 +msgid "Go to previous fuzzily translated string" +msgstr "Перейти к предыдущей fuzzy-строке" + +#: ../pohelper/data/menus.ui.h:12 +msgid "Next _Fuzzy" +msgstr "Следующая _fuzzy" + +#: ../pohelper/data/menus.ui.h:13 ../pohelper/src/gph-plugin.c:1049 +msgid "Go to next fuzzily translated string" +msgstr "Перейти к следующей fuzzy-строке" + +#: ../pohelper/data/menus.ui.h:14 +msgid "Previous Untranslated or Fuzz_y" +msgstr "Предыдущая непереведённая или fuzz_y-строка" + +#: ../pohelper/data/menus.ui.h:15 ../pohelper/src/gph-plugin.c:1052 +msgid "Go to previous untranslated or fuzzy string" +msgstr "Перейти к предыдущей непереведённой или fuzzy-строке" + +#: ../pohelper/data/menus.ui.h:16 +msgid "Next Untranslated _or Fuzzy" +msgstr "Следующая непереведённая _или fuzzy-строка" + +#: ../pohelper/data/menus.ui.h:17 ../pohelper/src/gph-plugin.c:1056 +msgid "Go to next untranslated or fuzzy string" +msgstr "Перейти к следующей непереведённой или fuzzy-строке" + +#: ../pohelper/data/menus.ui.h:18 ../pohelper/src/gph-plugin.c:1067 +msgid "Toggle current translation fuzziness" +msgstr "Переключить флаг fuzzy у текущего перевода" + +#: ../pohelper/data/menus.ui.h:19 +msgid "_Toggle Fuzziness" +msgstr "П_ереключить флаг fuzzy" + +#: ../pohelper/data/menus.ui.h:20 +msgid "Paste _Message as Translation" +msgstr "_Вставить сообщение как перевод" + +#: ../pohelper/data/menus.ui.h:21 +msgid "Paste the original untranslated string to the translation" +msgstr "Вставить непереведённый оригинал в качестве перевода" + +#: ../pohelper/data/menus.ui.h:22 ../pohelper/src/gph-plugin.c:1064 +msgid "Reflow the current translation string" +msgstr "Форматирует текущую строку перевода" + +#: ../pohelper/data/menus.ui.h:23 +msgid "_Reflow Translation" +msgstr "Пере_форматировать перевод" + +#: ../pohelper/data/menus.ui.h:24 +msgid "" +"Whether to update the translation headers (author, revision date, ...) upon " +"file save" +msgstr "" +"Обновлять заголовки перевода (автор, дата обновления, ...) при сохранении " +"файла" + +#: ../pohelper/data/menus.ui.h:25 +msgid "Update _Headers Upon Save" +msgstr "О_бновлять заголовки при сохранении" + +#: ../pohelper/src/gph-plugin.c:41 +msgid "Translation Helper" +msgstr "Помощник переводчика" + +#: ../pohelper/src/gph-plugin.c:42 +msgid "Improves support for GetText translation files." +msgstr "Улучшенная поддержка файлов перевода GetText." + +#: ../pohelper/src/gph-plugin.c:1060 +msgid "Paste original untranslated string to translation" +msgstr "Скопировать исходную непереведённую строку в перевод" + +#: ../pohelper/src/gph-plugin.c:1102 +#, c-format +msgid "Failed to load configuration file: %s" +msgstr "Невозможно загрузить файл конфигурации: %s" + +#: ../pohelper/src/gph-plugin.c:1127 +#, c-format +msgid "Failed to create configuration directory \"%s\": %s" +msgstr "Невозможно создать каталог конфигурации \"%s\": %s" + +#: ../pohelper/src/gph-plugin.c:1130 +#, c-format +msgid "Failed to save configuration file: %s" +msgstr "Невозможно сохранить конфигурационный файл: %s" + +#: ../pohelper/src/gph-plugin.c:1185 +#, c-format +msgid "" +"Failed to load UI definition, please check your installation. The error was: " +"%s" msgstr "" +"Невозможно загрузить интерфейс, проверьте правильность установки. Ошибка: %s" + +#: ../pohelper/src/gph-plugin.c:1225 +#, c-format +msgid "" +"Cannot find widget \"%s\" in the UI definition, please check your " +"installation." +msgstr "" +"Невозможно найти виджет \"%s\" в файле интерфейса, проверьте правильность " +"установки." #: ../pretty-printer/src/PluginEntry.c:37 msgid "XML PrettyPrinter" @@ -4856,880 +5186,875 @@ #: ../scope/data/scope.glade.h:1 msgid "Debu_g" -msgstr "Отладчик" +msgstr "_Отладчик" #: ../scope/data/scope.glade.h:2 msgid "_Setup Program" -msgstr "" +msgstr "На_строить программу" #: ../scope/data/scope.glade.h:3 -#, fuzzy msgid "Recent _Programs" -msgstr "нет программы" +msgstr "Последние программы" #: ../scope/data/scope.glade.h:4 -#, fuzzy msgid "_Run/Continue" msgstr "Запустить / Продолжить" #: ../scope/data/scope.glade.h:5 -#, fuzzy msgid "Run to _Cursor" msgstr "Выполнить до позиции курсора" #: ../scope/data/scope.glade.h:6 -#, fuzzy msgid "Run to _Source" -msgstr "Выполнить до позиции курсора" +msgstr "Выполнить до исходника" #: ../scope/data/scope.glade.h:7 -#, fuzzy msgid "Step _Into" msgstr "Шаг в" #: ../scope/data/scope.glade.h:8 -#, fuzzy msgid "Step _Over" msgstr "Шаг через" #: ../scope/data/scope.glade.h:9 -#, fuzzy msgid "Step O_ut" msgstr "Шаг из" #: ../scope/data/scope.glade.h:10 -#, fuzzy msgid "_Terminate" -msgstr "прервано" +msgstr "Прервать" #: ../scope/data/scope.glade.h:11 -#, fuzzy msgid "Toggle _Breakpoint" -msgstr "Точки останова" +msgstr "Переключить точку останова" #: ../scope/data/scope.glade.h:12 -#, fuzzy msgid "_GDB Command" -msgstr "Команда 0:" +msgstr "Команда GDB" #: ../scope/data/scope.glade.h:13 -#, fuzzy msgid "_More" -msgstr "Больше..." +msgstr "Дополнительно" #: ../scope/data/scope.glade.h:14 -#, fuzzy msgid "_Show Terminal" msgstr "Открыть терминал" #: ../scope/data/scope.glade.h:15 msgid "_Reset Markers" -msgstr "" +msgstr "Сбросить маркеры" #: ../scope/data/scope.glade.h:16 msgid "_Cleanup Files" -msgstr "" +msgstr "Очистить файлы" #: ../scope/data/scope.glade.h:17 msgid "_Feed" -msgstr "" +msgstr "_Передать" #: ../scope/data/scope.glade.h:18 -#, fuzzy msgid "_Window" -msgstr "Окна" +msgstr "_Окно" #: ../scope/data/scope.glade.h:19 msgid "_Auto Show" -msgstr "" +msgstr "_Автоотображение" #: ../scope/data/scope.glade.h:20 msgid "Auto _Hide" -msgstr "" +msgstr "Авто_скрытие" #: ../scope/data/scope.glade.h:21 msgid "Show on _Error" -msgstr "" +msgstr "Показывать при _ошибке" #: ../scope/data/scope.glade.h:22 msgid "_Unsorted" -msgstr "" +msgstr "_Несортированное" #: ../scope/data/scope.glade.h:23 msgid "_View Source" -msgstr "" +msgstr "П_росмотреть исходник" #: ../scope/data/scope.glade.h:24 msgid "S_ynchronize" -msgstr "" +msgstr "С_инхронизировать" #: ../scope/data/scope.glade.h:25 msgid "_Interrupt" -msgstr "" +msgstr "_Прервать" #: ../scope/data/scope.glade.h:26 msgid "_Send Signal" -msgstr "" +msgstr "О_тправить сигнал" #: ../scope/data/scope.glade.h:27 -#, fuzzy msgid "S_elect on" -msgstr "Выбрать шрифт" +msgstr "Вы_брать в" #: ../scope/data/scope.glade.h:28 -#, fuzzy msgid "_Running" -msgstr "выполняется" +msgstr "_Выполняется" #: ../scope/data/scope.glade.h:29 -#, fuzzy msgid "_Stopped" -msgstr "остановленно" +msgstr "_Остановленно" #: ../scope/data/scope.glade.h:30 msgid "_Exited" -msgstr "" +msgstr "_Завершено" #: ../scope/data/scope.glade.h:31 msgid "_Follow" -msgstr "" +msgstr "С_ледовать" #: ../scope/data/scope.glade.h:32 -#, fuzzy msgid "_Columns" -msgstr "Режим выделения по столбцам" +msgstr "_Столбцы" #: ../scope/data/scope.glade.h:33 msgid "Show _Group" -msgstr "" +msgstr "Показать _группу" #: ../scope/data/scope.glade.h:34 -#, fuzzy msgid "Show _Core" -msgstr "Показывать панель инструментов" +msgstr "Показать _core" #: ../scope/data/scope.glade.h:35 -#, fuzzy msgid "Add _Break" -msgstr "Добавить точку останова" +msgstr "Новая _точка останова" #: ../scope/data/scope.glade.h:36 -#, fuzzy msgid "Add _Watch" -msgstr "Наблюдение" +msgstr "Новое _наблюдение" #: ../scope/data/scope.glade.h:37 msgid "Apply on _Run" -msgstr "" +msgstr "П_рименить при запуске" #: ../scope/data/scope.glade.h:38 msgid "_Show @entry" -msgstr "" +msgstr "_Показать @entry" #: ../scope/data/scope.glade.h:39 -#, fuzzy msgid "Show _Address" -msgstr "Адрес" +msgstr "Показать _адрес" #: ../scope/data/scope.glade.h:40 msgid "_Modify" -msgstr "" +msgstr "_Изменить" #: ../scope/data/scope.glade.h:41 -#, fuzzy msgid "_Watch" -msgstr "Наблюдение" +msgstr "_Наблюдение" #: ../scope/data/scope.glade.h:42 msgid "_Inspect" -msgstr "" +msgstr "_Инспекция" #: ../scope/data/scope.glade.h:43 msgid "_8-bit mode" -msgstr "" +msgstr "_8-битный режим" #: ../scope/data/scope.glade.h:44 -#, fuzzy msgid "_Default" -msgstr "По умолчанию (%s)" +msgstr "_По умолчанию" #: ../scope/data/scope.glade.h:45 msgid "_7 bit" -msgstr "" +msgstr "_7 бит" #: ../scope/data/scope.glade.h:46 msgid "_Locale" -msgstr "" +msgstr "_Локаль" #: ../scope/data/scope.glade.h:47 msgid "_UTF-8" -msgstr "" +msgstr "_UTF-8" #: ../scope/data/scope.glade.h:48 -#, fuzzy msgid "_Show .names" -msgstr "Показывать иконки" +msgstr "_Показывать .names" #: ../scope/data/scope.glade.h:49 msgid "R_ead" -msgstr "" +msgstr "_Читать" #: ../scope/data/scope.glade.h:50 msgid "_Group by" -msgstr "" +msgstr "_Группировать по" #: ../scope/data/scope.glade.h:51 msgid "_1" -msgstr "" +msgstr "_1" #: ../scope/data/scope.glade.h:52 msgid "_2" -msgstr "" +msgstr "_2" #: ../scope/data/scope.glade.h:53 msgid "_4" -msgstr "" +msgstr "_4" #: ../scope/data/scope.glade.h:54 msgid "_8" -msgstr "" +msgstr "_8" #: ../scope/data/scope.glade.h:55 msgid "_Jump To" -msgstr "" +msgstr "П_ереход к" #: ../scope/data/scope.glade.h:56 msgid "_Apply" -msgstr "" +msgstr "_Применить" #: ../scope/data/scope.glade.h:57 -#, fuzzy msgid "_Expand" -msgstr "Развернуть всё" +msgstr "_Развернуть" #: ../scope/data/scope.glade.h:59 msgid "_Natural" -msgstr "" +msgstr "_Натуральное" #: ../scope/data/scope.glade.h:60 msgid "_Decimal" -msgstr "" +msgstr "_Десятичное" #: ../scope/data/scope.glade.h:61 msgid "_Hex" -msgstr "" +msgstr "_Шестнадцатеричное" #: ../scope/data/scope.glade.h:62 msgid "_Octal" -msgstr "" +msgstr "_Восьмеричное" #: ../scope/data/scope.glade.h:63 msgid "_Binary" -msgstr "" +msgstr "Д_воичное" #: ../scope/data/scope.glade.h:64 -msgid "_Evaluate/Modify" -msgstr "" +msgid "_Raw" +msgstr "Н_еобработанное" #: ../scope/data/scope.glade.h:65 -msgid "_Watch Expression" -msgstr "" +msgid "_Evaluate/Modify" +msgstr "_Вычислить/изменить" #: ../scope/data/scope.glade.h:66 -#, fuzzy -msgid "_Inspect Variable" -msgstr "Переменные окружения" +msgid "_Watch Expression" +msgstr "_Наблюдать за выражением" #: ../scope/data/scope.glade.h:67 -#, fuzzy -msgid "Program Terminal" -msgstr "Терминал" +msgid "_Inspect Variable" +msgstr "_Инспекция переменной" #: ../scope/data/scope.glade.h:68 -#, fuzzy msgid "Threads" -msgstr "Поток %i" +msgstr "Потоки" -#: ../scope/data/scope.glade.h:70 -#, fuzzy +#: ../scope/data/scope.glade.h:69 msgid "Stack" -msgstr "Трассировка" +msgstr "Стек" -#: ../scope/data/scope.glade.h:71 +#: ../scope/data/scope.glade.h:70 msgid "Locals" -msgstr "" +msgstr "Локали" -#: ../scope/data/scope.glade.h:72 -#, fuzzy +#: ../scope/data/scope.glade.h:71 msgid "Watches" -msgstr "Наблюдение" +msgstr "Наблюдатели" -#: ../scope/data/scope.glade.h:73 +#: ../scope/data/scope.glade.h:72 msgid "Memory" -msgstr "" +msgstr "Память" -#: ../scope/data/scope.glade.h:74 -#, fuzzy -msgid "Debug Console" -msgstr "Консоль:" - -#: ../scope/data/scope.glade.h:75 -#, fuzzy +#: ../scope/data/scope.glade.h:73 msgid "Enter gdb command:" -msgstr "Внешняя команда" +msgstr "Введите команду gdb:" -#: ../scope/data/scope.glade.h:76 -#, fuzzy +#: ../scope/data/scope.glade.h:74 msgid "Convert _UTF-8 to locale" -msgstr "_Конвертировать в таблицу" +msgstr "Конвертировать _UTF-8 в локаль" -#: ../scope/data/scope.glade.h:77 -#, fuzzy +#: ../scope/data/scope.glade.h:75 msgid "_Thread" -msgstr "Поток %i" +msgstr "_Поток" -#: ../scope/data/scope.glade.h:78 +#: ../scope/data/scope.glade.h:76 msgid "_Group" -msgstr "" +msgstr "Группа" # Кадр? часть? блок? wtf frame :) -#: ../scope/data/scope.glade.h:79 -#, fuzzy +# Имеется ввиду что-то вроде стэк фрейма. Возможно лучше вообще не переводить? +#: ../scope/data/scope.glade.h:77 msgid "_Frame" -msgstr "Информация о блоке" +msgstr "_Фрейм" -#: ../scope/data/scope.glade.h:80 -#, fuzzy +#: ../scope/data/scope.glade.h:78 msgid "Setup Program" -msgstr "нет программы" +msgstr "Настроить программу" -#: ../scope/data/scope.glade.h:81 +#: ../scope/data/scope.glade.h:79 msgid "_Executable:" -msgstr "" +msgstr "_Исполняемый файл:" -#: ../scope/data/scope.glade.h:82 -#, fuzzy +#: ../scope/data/scope.glade.h:80 msgid "_Arguments:" -msgstr "Выравнивание" +msgstr "_Аргументы:" -#: ../scope/data/scope.glade.h:83 -#, fuzzy +#: ../scope/data/scope.glade.h:81 msgid "En_vironment:" msgstr "_Окружение" -#: ../scope/data/scope.glade.h:84 +#: ../scope/data/scope.glade.h:82 msgid "_Working dir:" -msgstr "" +msgstr "_Рабочий каталог:" -#: ../scope/data/scope.glade.h:85 +#: ../scope/data/scope.glade.h:83 msgid "_Load script:" -msgstr "" +msgstr "_Сценарий загрузки:" -#: ../scope/data/scope.glade.h:86 +#: ../scope/data/scope.glade.h:84 msgid "Auto _run program/exit gdb" -msgstr "" +msgstr "Автоматический _запуск программы/выход из gdb" -#: ../scope/data/scope.glade.h:87 +#: ../scope/data/scope.glade.h:85 msgid "_Non-stop mode" -msgstr "" +msgstr "_Бесконечный режим" -#: ../scope/data/scope.glade.h:88 -msgid "_Temporary breakpoint at:" -msgstr "" +#: ../scope/data/scope.glade.h:86 +msgid "_Temporary breakpoint on load at:" +msgstr "_Временная точка останова при загрузке в:" -#: ../scope/data/scope.glade.h:89 -msgid "_Delete all breakpoints, watches and inspects" -msgstr "" +#: ../scope/data/scope.glade.h:87 +msgid "_Delete all breakpoints, watches, inspects and registers" +msgstr "_Удалить все точки останова, наблюдения, инспекторы и регистры" -#: ../scope/data/scope.glade.h:90 ../scope/src/prefs.c:337 -#, fuzzy +#: ../scope/data/scope.glade.h:88 ../scope/src/scope.c:522 msgid "Program" -msgstr "нет программы" +msgstr "Программа" -#: ../scope/data/scope.glade.h:91 -#, fuzzy +#: ../scope/data/scope.glade.h:89 msgid "Open on" -msgstr "Открыть URI" +msgstr "Открыть при" -#: ../scope/data/scope.glade.h:92 +#: ../scope/data/scope.glade.h:90 msgid "g_db load" -msgstr "" +msgstr "загрузке g_db" -#: ../scope/data/scope.glade.h:93 +#: ../scope/data/scope.glade.h:91 msgid "p_rogram start" -msgstr "" +msgstr "_запуске программы" -#: ../scope/data/scope.glade.h:94 -#, fuzzy +#: ../scope/data/scope.glade.h:92 msgid "Update all _views" -msgstr "Обновить список задач" +msgstr "Обновить все" -#: ../scope/data/scope.glade.h:95 +#: ../scope/data/scope.glade.h:93 msgid "Panel" -msgstr "" +msgstr "Панель" -#: ../scope/data/scope.glade.h:96 +#: ../scope/data/scope.glade.h:94 msgid "Default 8-bit text mode:" -msgstr "" +msgstr "Стандартный 8-битный режим:" -#: ../scope/data/scope.glade.h:97 +#: ../scope/data/scope.glade.h:95 msgid "_7-bit \\nnn" -msgstr "" +msgstr "_7-бит \\nnn" -#: ../scope/data/scope.glade.h:98 -#, fuzzy +#: ../scope/data/scope.glade.h:96 msgid "Display" -msgstr "Скрыть боковую панель" +msgstr "Показывать" -#: ../scope/data/scope.glade.h:99 +#: ../scope/data/scope.glade.h:97 msgid "_member" -msgstr "" +msgstr "_элемент" -#: ../scope/data/scope.glade.h:100 -#, fuzzy +#: ../scope/data/scope.glade.h:98 msgid "and" -msgstr "загружено" +msgstr "и" -#: ../scope/data/scope.glade.h:101 -#, fuzzy +#: ../scope/data/scope.glade.h:99 msgid "_argument" -msgstr "Отправить файл" +msgstr "_имена" -#: ../scope/data/scope.glade.h:102 -#, fuzzy +#: ../scope/data/scope.glade.h:100 msgid "names" -msgstr "Переименовать" +msgstr "аргументов" -#: ../scope/data/scope.glade.h:103 +#: ../scope/data/scope.glade.h:101 msgid "Values" -msgstr "" +msgstr "Значения" -#: ../scope/data/scope.glade.h:104 -#, fuzzy +#: ../scope/data/scope.glade.h:102 msgid "E_xpand on apply" -msgstr "Развернуть всё" +msgstr "Р_азвернуть при применении" -#: ../scope/data/scope.glade.h:105 +#: ../scope/data/scope.glade.h:103 msgid "S_how" -msgstr "" +msgstr "П_оказывать" -#: ../scope/data/scope.glade.h:106 +#: ../scope/data/scope.glade.h:104 msgid "children" -msgstr "" +msgstr "потомков" -#: ../scope/data/scope.glade.h:107 +#: ../scope/data/scope.glade.h:105 msgid "Inspect" -msgstr "" +msgstr "Инспекция" -#: ../scope/data/scope.glade.h:108 +#: ../scope/data/scope.glade.h:106 msgid "Show =li_brary messages" -msgstr "" +msgstr "Отображать сообщения =li_brary" -#: ../scope/data/scope.glade.h:109 -#, fuzzy +#: ../scope/data/scope.glade.h:107 msgid "Show _tooltips" msgstr "Показывать подсказки" -#: ../scope/data/scope.glade.h:110 +#: ../scope/data/scope.glade.h:108 msgid "Others" -msgstr "" +msgstr "Другое" -#: ../scope/data/scope.glade.h:111 -#, fuzzy +#: ../scope/data/scope.glade.h:109 msgid "Options" -msgstr "Маркеры поиска:" +msgstr "Параметры" -#: ../scope/data/scope.glade.h:112 +#: ../scope/data/scope.glade.h:110 msgid "_Import" -msgstr "" +msgstr "_Импорт" -#: ../scope/data/scope.glade.h:113 -#, fuzzy +#: ../scope/data/scope.glade.h:111 msgid "Enter assignment expression:" -msgstr "Не могу вычислить выражение" +msgstr "Введите выражение присваивания:" -#: ../scope/data/scope.glade.h:114 -#, fuzzy +#: ../scope/data/scope.glade.h:112 msgid "Inspect" -msgstr "Веб-инспектор" +msgstr "Инспекция" -#: ../scope/data/scope.glade.h:115 -#, fuzzy +#: ../scope/data/scope.glade.h:113 msgid "Object:" -msgstr "Информация об объекте " +msgstr "Объект:" -#: ../scope/data/scope.glade.h:117 +#: ../scope/data/scope.glade.h:115 msgid "-" -msgstr "" +msgstr "-" -#: ../scope/data/scope.glade.h:118 -#, fuzzy +#: ../scope/data/scope.glade.h:116 msgid "Frame:" -msgstr "Имя:" +msgstr "Фрейм:" -#: ../scope/data/scope.glade.h:119 +#: ../scope/data/scope.glade.h:117 msgid "@" -msgstr "" +msgstr "@" -#: ../scope/data/scope.glade.h:120 +#: ../scope/data/scope.glade.h:118 msgid "_Apply on run" -msgstr "" +msgstr "Применить при запуске" -#: ../scope/data/scope.glade.h:121 -#, fuzzy +#: ../scope/data/scope.glade.h:119 msgid "Expand" msgstr "Развернуть всё" -#: ../scope/data/scope.glade.h:122 -#, fuzzy +#: ../scope/data/scope.glade.h:120 msgid "Start:" msgstr "Старт:" -#: ../scope/data/scope.glade.h:123 +#: ../scope/data/scope.glade.h:121 msgid "Count:" -msgstr "" +msgstr "Счётчик:" -#: ../scope/data/scope.glade.h:124 -#, fuzzy +#: ../scope/data/scope.glade.h:122 msgid "_Expand on apply" -msgstr "Развернуть всё" +msgstr "Развернуть при применении" + +#: ../scope/data/scope.glade.h:123 ../scope/src/scope.c:522 +msgid "Program Terminal" +msgstr "Терминал программы" + +#: ../scope/data/scope.glade.h:125 +msgid "Registers" +msgstr "Регистры" + +#: ../scope/src/break.c:97 +msgid "breakpoint" +msgstr "точка останова" -#: ../scope/src/break.c:947 +#: ../scope/src/break.c:98 +msgid "hardware breakpoint" +msgstr "аппаратная точка останова" + +#: ../scope/src/break.c:99 +msgid "tracepoint" +msgstr "точка контроля" + +#: ../scope/src/break.c:100 +msgid "fast tracepoint" +msgstr "быстрая точка контроля" + +#: ../scope/src/break.c:101 +msgid "write watchpoint" +msgstr "точка наблюдения на записб" + +#: ../scope/src/break.c:104 +msgid "access watchpoint" +msgstr "точка наблюдения на доступ" + +#: ../scope/src/break.c:106 +msgid "read watchpoint" +msgstr "точка наблюдения на чтение" + +#: ../scope/src/break.c:108 +msgid "catchpoint" +msgstr "точка отлова" + +#: ../scope/src/break.c:135 ../scope/src/break.c:139 +msgid "CLI" +msgstr "CLI" + +#: ../scope/src/break.c:136 +msgid "unsupported MI" +msgstr "неподдерживаемый MI" + +#: ../scope/src/break.c:141 +msgid "on load" +msgstr "при загрузке" + +#: ../scope/src/break.c:142 +msgid "Run to Cursor" +msgstr "Выполнить до позиции курсора" + +#: ../scope/src/break.c:1013 #, c-format msgid "" "There are two or more breakpoints at %s:%d.\n" +"\n" "Use the breakpoint list to remove the exact one." msgstr "" +"Обнаружено две или более точки останова в %s:%d.\n" +"\n" +"Используйте список точек останова для удаления только одной." -#: ../scope/src/break.c:1200 -#, fuzzy +#: ../scope/src/break.c:1252 +#, c-format +msgid ", %s" +msgstr ", %s" + +#: ../scope/src/break.c:1278 +#, c-format +msgid "func %s" +msgstr "функция %s" + +#: ../scope/src/break.c:1309 msgid "Add Breakpoint" msgstr "Добавить точку останова" -#: ../scope/src/break.c:1215 -#, fuzzy +#: ../scope/src/break.c:1324 msgid "Add Watchpoint" -msgstr "Добавить точку контроля" +msgstr "Добавить точку наблюдения" #: ../scope/src/conterm.c:106 -#, fuzzy msgid "Feed Terminal" -msgstr "Открыть терминал" +msgstr "Передать в терминал" #: ../scope/src/conterm.c:106 msgid "Enter char # (0..255):" -msgstr "" +msgstr "Введите символ # (0..255):" -#: ../scope/src/conterm.c:466 ../scope/src/scope.c:502 -#, fuzzy, c-format +#: ../scope/src/conterm.c:509 ../scope/src/scope.c:550 +#: ../scope/src/scope.c:551 +#, c-format msgid "Scope: %s." -msgstr "Закрыть: %s" +msgstr "Scope: %s." #: ../scope/src/debug.c:115 ../scope/src/debug.c:120 ../scope/src/utils.c:37 -#, fuzzy, c-format +#, c-format msgid "%s: %s." -msgstr "%s:%u:%u: %s" +msgstr "%s: %s." #: ../scope/src/debug.c:363 #, c-format msgid "GDB died unexpectedly with status %d." -msgstr "" +msgstr "GDB неожиданно завершился с кодом %d." #: ../scope/src/debug.c:365 -#, fuzzy msgid "Program terminated." -msgstr "прервано" +msgstr "Программа завершена." -#: ../scope/src/debug.c:468 +#: ../scope/src/debug.c:469 msgid "No breakpoints. Hanging." -msgstr "" +msgstr "Нет точек останова. Прерывание." -#: ../scope/src/debug.c:596 ../scope/src/thread.c:97 -#, fuzzy, c-format +#: ../scope/src/debug.c:598 ../scope/src/thread.c:92 +#, c-format msgid "%s." -msgstr "%s:" +msgstr "%s." -#: ../scope/src/inspect.c:77 -#, fuzzy +#: ../scope/src/inspect.c:66 msgid "..." -msgstr "Больше..." +msgstr "..." -#: ../scope/src/inspect.c:324 -#, fuzzy +#: ../scope/src/inspect.c:339 msgid "invalid data" -msgstr "Недействительный тег" +msgstr "некорректные данные" -#: ../scope/src/inspect.c:356 +#: ../scope/src/inspect.c:371 msgid "no children in range" -msgstr "" +msgstr "нет потомков в диапазоне" -#: ../scope/src/inspect.c:440 -#, fuzzy +#: ../scope/src/inspect.c:454 msgid "out of scope" -msgstr "Контрольная точка #%s вне области видимости" +msgstr "вне зоны видимости" -#: ../scope/src/inspect.c:587 +#: ../scope/src/inspect.c:627 msgid "Duplicate inspect variable name." -msgstr "" +msgstr "Дублировать имя переменной под инспекцией." -#: ../scope/src/memory.c:299 +#: ../scope/src/memory.c:292 msgid "Read Memory" -msgstr "" +msgstr "Чтение памяти" -#: ../scope/src/memory.c:408 -msgid "Scope: pointer size > 8, Data disabled." -msgstr "" +#: ../scope/src/memory.c:396 +#, c-format +msgid "Scope: pointer size > %d, Data disabled." +msgstr "Scope: размер указателя > %d, данные отключены." -#: ../scope/src/menu.c:380 +#: ../scope/src/menu.c:375 msgid "Modify" -msgstr "" +msgstr "Изменить" -#: ../scope/src/menu.c:490 +#: ../scope/src/menu.c:481 msgid "Evaluate/modify" -msgstr "" +msgstr "Вычислить/модифицировать" -#: ../scope/src/menu.c:491 -#, fuzzy +#: ../scope/src/menu.c:482 msgid "Watch expression" -msgstr "Не могу вычислить выражение" +msgstr "Наблюдать за выражением" -#: ../scope/src/menu.c:492 -#, fuzzy +#: ../scope/src/menu.c:483 msgid "Inspect variable" -msgstr "Удалить переменную?" +msgstr "Инспекция переменной" -#: ../scope/src/parse.c:416 +#: ../scope/src/parse.c:437 msgid "Undefined GDB error." -msgstr "" +msgstr "Неизвестная ошибка GDB." #: ../scope/src/plugme.c:81 -#, fuzzy msgid "Select Folder" -msgstr "Выбрать шрифт" +msgstr "Выберите папку" #: ../scope/src/plugme.c:81 -#, fuzzy msgid "Select File" -msgstr "Выбрать шрифт" - -#: ../scope/src/prefs.c:338 -#, fuzzy -msgid "Breaks" -msgstr "Точки останова" - -#: ../scope/src/prefs.c:339 -#, fuzzy -msgid "Console" -msgstr "Консоль:" +msgstr "Выберите файл" -#: ../scope/src/prefs.c:347 ../scope/src/utils.c:570 +#: ../scope/src/prefs.c:294 ../scope/src/utils.c:438 #, c-format msgid "Scope: %s: %s." -msgstr "" +msgstr "Scope: %s: %s." -#: ../scope/src/prefs.c:352 -#, fuzzy +#: ../scope/src/prefs.c:299 msgid "Scope: created configuration file." -msgstr "Принудительно перезагрузить конфигурационные файлы" +msgstr "Scope: создан файл конфигурации." -#: ../scope/src/program.c:231 +#: ../scope/src/program.c:251 #, c-format msgid "Loaded debug settings for %s." -msgstr "" +msgstr "Загружены параметры отладки для %s." -#: ../scope/src/program.c:239 -#, fuzzy, c-format +#: ../scope/src/program.c:259 +#, c-format msgid "Could not load debug settings file %s: %s." -msgstr "Невозможно загрузить файл \"%s\": %s" +msgstr "Не удалось загрузить файл с параметрами отладки %s: %s." -#: ../scope/src/program.c:359 -#, fuzzy, c-format +#: ../scope/src/program.c:379 +#, c-format msgid "" "%s: %s.\n" "\n" "Continue?" -msgstr "Продолжить" - -#: ../scope/src/program.c:394 -msgid "Delete all breakpoints, watches and inspects?" msgstr "" +"%s: %s.\n" +"\n" +"Продолжить?" + +#: ../scope/src/program.c:415 +msgid "Delete all breakpoints, watches et cetera?" +msgstr "Удалить все точки останова, наблюдения и т. п.?" -#: ../scope/src/program.c:501 +#: ../scope/src/program.c:523 msgid "as _Name=value" -msgstr "" +msgstr "как _Name=value" -#: ../scope/src/program.c:502 +#: ../scope/src/program.c:524 msgid "as _Name = value" -msgstr "" +msgstr "как _Name = value" #: ../scope/src/scope.c:34 -#, fuzzy msgid "Scope Debugger" -msgstr "Отладчик" +msgstr "Отладчик Scope" #: ../scope/src/scope.c:35 -msgid "Simple GDB front-end." -msgstr "" +msgid "Relatively simple GDB front-end." +msgstr "Относительно простая обёртка над GDB." -#: ../scope/src/scope.c:63 -#, fuzzy +#: ../scope/src/scope.c:62 msgid "Setup program" -msgstr "нет программы" +msgstr "Настроить программу" -#: ../scope/src/scope.c:64 -#, fuzzy +#: ../scope/src/scope.c:63 msgid "Run/continue" -msgstr "Запустить / Продолжить" +msgstr "Запустить/продолжить" -#: ../scope/src/scope.c:66 -#, fuzzy +#: ../scope/src/scope.c:65 msgid "Run to source" -msgstr "Выполнить до позиции курсора" +msgstr "Выполнить до исходника" -#: ../scope/src/scope.c:70 -#, fuzzy +#: ../scope/src/scope.c:69 msgid "Terminate" -msgstr "прервано" +msgstr "Прервать" -#: ../scope/src/scope.c:71 -#, fuzzy +#: ../scope/src/scope.c:70 msgid "Toggle breakpoint" -msgstr "точка останова" +msgstr "Переключить точку останова" -#: ../scope/src/scope.c:73 ../scope/src/scope.c:76 +#: ../scope/src/scope.c:72 ../scope/src/scope.c:75 msgid "GDB command" -msgstr "" +msgstr "Команда GDB" -#: ../scope/src/scope.c:74 -#, fuzzy +#: ../scope/src/scope.c:73 msgid "Show terminal" -msgstr "Запуск в терминале" +msgstr "Показать терминал" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Busy" -msgstr "" +msgstr "Занят" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Ready" -msgstr "" +msgstr "Готов" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Hang" -msgstr "" +msgstr "Завис" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Assem" -msgstr "" +msgstr "Асм" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Load" -msgstr "" +msgstr "Загрузка" -#: ../scope/src/scope.c:394 +#: ../scope/src/scope.c:421 msgid "Build action activated. Terminate debugging?" -msgstr "" +msgstr "Запущена сборка. Прервать отладку?" + +#: ../scope/src/scope.c:524 +msgid "Breaks" +msgstr "Прерывания" -#: ../scope/src/thread.c:58 +#: ../scope/src/scope.c:526 +msgid "Console" +msgstr "Консоль" + +#: ../scope/src/scope.c:526 +msgid "Debug Console" +msgstr "Консоль отладчика" + +#: ../scope/src/thread.c:48 #, c-format msgid "Thread group %s started." -msgstr "" +msgstr "Группа потоков %s запущена." -#: ../scope/src/thread.c:76 -#, fuzzy +#: ../scope/src/thread.c:63 msgid "Thread group " -msgstr "Поток %i" +msgstr "Группа потоков " -#: ../scope/src/thread.c:88 +#: ../scope/src/thread.c:83 msgid " exited" -msgstr "" +msgstr " завершился" -#: ../scope/src/thread.c:91 +#: ../scope/src/thread.c:86 #, c-format msgid " with exit code %s" -msgstr "" +msgstr " с кодом завершения %s" -#: ../scope/src/thread.c:788 -#, fuzzy +#: ../scope/src/thread.c:748 msgid "Send Signal" -msgstr "Отправить по почте" +msgstr "Отправить сигнал" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 msgid "Enter signal #:" -msgstr "" +msgstr "Введите номер сигнала:" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Terminate Process" -msgstr "" +msgstr "Прервать процесс" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Enter exit code:" -msgstr "" +msgstr "Введите код завершения:" -#: ../scope/src/thread.c:937 -#, fuzzy +#: ../scope/src/thread.c:891 msgid "Running" -msgstr "выполняется" +msgstr "Выполняется" -#: ../scope/src/thread.c:938 -#, fuzzy +#: ../scope/src/thread.c:892 msgid "Stopped" -msgstr "остановленно" +msgstr "Остановлен" -#: ../scope/src/utils.c:44 +#: ../scope/src/utils.c:45 #, c-format -msgid "%s: error %lu." -msgstr "" +msgid "%s: %s" +msgstr "%s: %s" -#: ../scope/src/utils.c:358 +#: ../scope/src/utils.c:225 #, c-format msgid "Scope: error reading [%s]." -msgstr "" +msgstr "Scope: ошибка чтения [%s]." -#: ../scope/src/views.c:505 +#: ../scope/src/views.c:526 msgid "…" -msgstr "" +msgstr "…" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Send" -msgstr "" +msgstr "_Отправить" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Busy" -msgstr "" +msgstr "_Занят" -#: ../scope/src/views.c:535 -#, fuzzy +#: ../scope/src/views.c:558 msgid "GDB Command" -msgstr "Команда 0:" +msgstr "Команда GDB" -#: ../spellcheck/src/speller.c:94 +#: ../spellcheck/src/speller.c:180 msgid "Try: " msgstr "Попробуйте: " -#: ../spellcheck/src/speller.c:173 +#: ../spellcheck/src/speller.c:252 msgid "Checking" msgstr "Идёт проверка" -#: ../spellcheck/src/speller.c:186 +#: ../spellcheck/src/speller.c:265 #, c-format msgid "Checking file \"%s\" (lines %d to %d using %s):" msgstr "Проверяется файл \"%s\" (строки с %d по %d используя %s):" -#: ../spellcheck/src/speller.c:196 +#: ../spellcheck/src/speller.c:275 #, c-format msgid "Checking file \"%s\" (using %s):" -msgstr "Проверяется файл \"%s\" (используя %s):" +msgstr "Проверяется файл \"%s\" (используя %s):" -#: ../spellcheck/src/speller.c:223 +#: ../spellcheck/src/speller.c:302 msgid "The checked text is spelled correctly." msgstr "Текст не содержит ошибок." -#: ../spellcheck/src/speller.c:233 +#: ../spellcheck/src/speller.c:312 #, c-format msgid "The Enchant library couldn't be initialized (%s)." msgstr "Ошибка инициализации библиотеки Enchant (%s)." -#: ../spellcheck/src/speller.c:234 +#: ../spellcheck/src/speller.c:313 msgid "unknown error (maybe the chosen language is not available)" msgstr "неизвестная ошибка (возможно выбранный язык недоступен)" @@ -5823,17 +6148,17 @@ msgid "Ignore All" msgstr "Игнорировать всё" -#: ../spellcheck/src/gui.c:521 +#: ../spellcheck/src/gui.c:526 #, c-format msgid "Default (%s)" msgstr "По умолчанию (%s)" -#: ../spellcheck/src/gui.c:532 +#: ../spellcheck/src/gui.c:537 #, c-format msgid "Toggle spell check while typing (current language: %s)" msgstr "Включить проверку орфографии по мере набора текста (текущий язык: %s)" -#: ../spellcheck/src/gui.c:587 +#: ../spellcheck/src/gui.c:592 msgid "Spelling Suggestions" msgstr "Варианты замены" @@ -5864,28 +6189,28 @@ #. OK. Something went not as expected. #. * We did have a selection but cannot parse it into rows. #. * Aborting -#: ../tableconvert/src/tableconvert.c:236 +#: ../tableconvert/src/tableconvert.c:237 msgid "Something went wrong on parsing selection. Aborting" msgstr "При разборе содержимого произошла ошибка. Остановка." -#: ../tableconvert/src/tableconvert.c:268 +#: ../tableconvert/src/tableconvert.c:269 msgid "Convert selection to table" msgstr "Конвертировать выделение в таблицу" #. Build up menu entry -#: ../tableconvert/src/tableconvert.c:281 +#: ../tableconvert/src/tableconvert.c:282 msgid "_Convert to table" msgstr "_Конвертировать в таблицу" -#: ../tableconvert/src/tableconvert.c:284 +#: ../tableconvert/src/tableconvert.c:285 msgid "Converts current marked list to a table." msgstr "Конвертирует отмеченные списки в таблицу" -#: ../treebrowser/src/treebrowser.c:120 +#: ../treebrowser/src/treebrowser.c:124 msgid "TreeBrowser" msgstr "Дерево файлов" -#: ../treebrowser/src/treebrowser.c:121 +#: ../treebrowser/src/treebrowser.c:125 msgid "" "This plugin adds a tree browser to Geany, allowing the user to browse files " "using a tree view of the directory being browsed." @@ -5893,30 +6218,30 @@ "Этот плагин добавляет в Geany панель, которая позволяет просматривать файлы " "в виде дерева папок и файлов. " -#: ../treebrowser/src/treebrowser.c:430 +#: ../treebrowser/src/treebrowser.c:434 #, c-format msgid "%s: no such directory." msgstr "%s: нет такой директории." -#: ../treebrowser/src/treebrowser.c:526 ../treebrowser/src/treebrowser.c:561 -#: ../treebrowser/src/treebrowser.c:663 +#: ../treebrowser/src/treebrowser.c:537 ../treebrowser/src/treebrowser.c:572 +#: ../treebrowser/src/treebrowser.c:670 msgid "(Empty)" msgstr "(Пусто)" -#: ../treebrowser/src/treebrowser.c:966 +#: ../treebrowser/src/treebrowser.c:973 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Невозможно выполнить заданную внешнюю команду '%s' (%s)." -#: ../treebrowser/src/treebrowser.c:1037 +#: ../treebrowser/src/treebrowser.c:1044 msgid "NewDirectory" msgstr "Новая папка" -#: ../treebrowser/src/treebrowser.c:1039 +#: ../treebrowser/src/treebrowser.c:1046 msgid "NewFile" msgstr "Новый файл" -#: ../treebrowser/src/treebrowser.c:1044 +#: ../treebrowser/src/treebrowser.c:1051 #, c-format msgid "" "Target file '%s' exists\n" @@ -5925,96 +6250,100 @@ "Файл '%s' существует\n" ", вы действительно хотите заменить его пустым файлом?" -#: ../treebrowser/src/treebrowser.c:1089 +#: ../treebrowser/src/treebrowser.c:1097 #, c-format msgid "Do you really want to delete '%s' ?" msgstr "Вы действительно хотите удалить файл '%s' ?" -#: ../treebrowser/src/treebrowser.c:1208 ../treebrowser/src/treebrowser.c:1692 +#: ../treebrowser/src/treebrowser.c:1209 ../treebrowser/src/treebrowser.c:1740 msgid "Go up" msgstr "Перейти на уровень вверх" -#: ../treebrowser/src/treebrowser.c:1212 ../treebrowser/src/treebrowser.c:1707 +#: ../treebrowser/src/treebrowser.c:1213 ../treebrowser/src/treebrowser.c:1755 msgid "Set path from document" msgstr "Установить корневой папку текущего документа" -#: ../treebrowser/src/treebrowser.c:1216 -msgid "Open externally" +#: ../treebrowser/src/treebrowser.c:1217 +msgid "_Open externally" msgstr "Открыть используя внешнюю программу" -#: ../treebrowser/src/treebrowser.c:1221 +#: ../treebrowser/src/treebrowser.c:1222 msgid "Open Terminal" msgstr "Открыть терминал" -#: ../treebrowser/src/treebrowser.c:1225 +#: ../treebrowser/src/treebrowser.c:1226 msgid "Set as root" msgstr "Сделать корневой папкой" -#: ../treebrowser/src/treebrowser.c:1230 ../treebrowser/src/treebrowser.c:1697 -#: ../treebrowser/src/treebrowser.c:2060 +#: ../treebrowser/src/treebrowser.c:1231 ../treebrowser/src/treebrowser.c:1745 +#: ../treebrowser/src/treebrowser.c:2125 msgid "Refresh" msgstr "Обновить" -#: ../treebrowser/src/treebrowser.c:1242 +#: ../treebrowser/src/treebrowser.c:1235 +msgid "_Find in Files" +msgstr "Найти в файлах" + +#: ../treebrowser/src/treebrowser.c:1243 msgid "Create new directory" msgstr "Создать новую директорию" -#: ../treebrowser/src/treebrowser.c:1246 +#: ../treebrowser/src/treebrowser.c:1247 msgid "Create new file" msgstr "Создать новый файл" -#: ../treebrowser/src/treebrowser.c:1250 +#: ../treebrowser/src/treebrowser.c:1251 msgid "Rename" msgstr "Переименовать" -#: ../treebrowser/src/treebrowser.c:1255 +#: ../treebrowser/src/treebrowser.c:1256 msgid "Delete" msgstr "Удалить" -#: ../treebrowser/src/treebrowser.c:1263 +#: ../treebrowser/src/treebrowser.c:1264 #, c-format msgid "Close: %s" msgstr "Закрыть: %s" -#: ../treebrowser/src/treebrowser.c:1268 +#: ../treebrowser/src/treebrowser.c:1269 #, c-format msgid "Close Child Documents " msgstr "Закрыть дочерние документы" -#: ../treebrowser/src/treebrowser.c:1273 -msgid "Copy full path to clipboard" +#: ../treebrowser/src/treebrowser.c:1274 +msgid "_Copy full path to clipboard" msgstr "Скопировать полный путь в буфер обмена" -#: ../treebrowser/src/treebrowser.c:1293 ../treebrowser/src/treebrowser.c:1974 +#: ../treebrowser/src/treebrowser.c:1294 ../treebrowser/src/treebrowser.c:2034 msgid "Show bookmarks" msgstr "Показывать закладки" -#: ../treebrowser/src/treebrowser.c:1298 ../treebrowser/src/treebrowser.c:1928 +#: ../treebrowser/src/treebrowser.c:1299 ../treebrowser/src/treebrowser.c:1983 msgid "Show hidden files" msgstr "Показывать скрытые файлы" -#: ../treebrowser/src/treebrowser.c:1303 +#: ../treebrowser/src/treebrowser.c:1304 msgid "Show toolbars" msgstr "Показывать панель инструментов" -#: ../treebrowser/src/treebrowser.c:1574 +#: ../treebrowser/src/treebrowser.c:1623 #, c-format msgid "Target file '%s' exists, do you really want to replace it?" msgstr "Файл '%s' существует, вы действительно хотите его заменить?" -#: ../treebrowser/src/treebrowser.c:1702 +#: ../treebrowser/src/treebrowser.c:1750 msgid "Home" msgstr "Домой" -#: ../treebrowser/src/treebrowser.c:1712 +#: ../treebrowser/src/treebrowser.c:1760 msgid "Track path" msgstr "Перейти к текущему файлу" -#: ../treebrowser/src/treebrowser.c:1717 +#: ../treebrowser/src/treebrowser.c:1765 msgid "Hide bars" msgstr "Скрыть панель инструментов" -#: ../treebrowser/src/treebrowser.c:1727 +#: ../treebrowser/src/treebrowser.c:1775 msgid "" "Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' " "reverse try for example this '!;*.c;*.h;*.cpp'" @@ -6022,19 +6351,19 @@ "Фильтр (*.c;*.h;*.cpp). Чтобы инвертировать результаты поиска, используйте " "формат '!;*.c;*.h;*.cpp'." -#: ../treebrowser/src/treebrowser.c:1735 +#: ../treebrowser/src/treebrowser.c:1783 msgid "Addressbar for example '/projects/my-project'" msgstr "Строка адреса" -#: ../treebrowser/src/treebrowser.c:1760 +#: ../treebrowser/src/treebrowser.c:1808 msgid "Tree Browser" msgstr "Дерево файлов" -#: ../treebrowser/src/treebrowser.c:1892 +#: ../treebrowser/src/treebrowser.c:1947 msgid "External open command" msgstr "Внешняя команда" -#: ../treebrowser/src/treebrowser.c:1897 +#: ../treebrowser/src/treebrowser.c:1952 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -6048,53 +6377,53 @@ "%f будет заменено на имя файла включая полный путь\n" "%d будет заменено на путь к директории текущего файла" -#: ../treebrowser/src/treebrowser.c:1905 +#: ../treebrowser/src/treebrowser.c:1960 msgid "Toolbar" msgstr "Панель инструментов" -#: ../treebrowser/src/treebrowser.c:1907 +#: ../treebrowser/src/treebrowser.c:1962 msgid "Hidden" msgstr "Скрытая" -#: ../treebrowser/src/treebrowser.c:1908 +#: ../treebrowser/src/treebrowser.c:1963 msgid "Top" msgstr "Верх" -#: ../treebrowser/src/treebrowser.c:1909 +#: ../treebrowser/src/treebrowser.c:1964 msgid "Bottom" msgstr "Низ" -#: ../treebrowser/src/treebrowser.c:1914 +#: ../treebrowser/src/treebrowser.c:1969 msgid "If position is changed, the option require plugin restart." msgstr "Изменение положения требует перезапуска плагина" -#: ../treebrowser/src/treebrowser.c:1918 +#: ../treebrowser/src/treebrowser.c:1973 msgid "Show icons" msgstr "Показывать иконки" -#: ../treebrowser/src/treebrowser.c:1920 +#: ../treebrowser/src/treebrowser.c:1975 msgid "None" msgstr "Нет" -#: ../treebrowser/src/treebrowser.c:1921 +#: ../treebrowser/src/treebrowser.c:1976 msgid "Base" msgstr "Базовые" -#: ../treebrowser/src/treebrowser.c:1922 +#: ../treebrowser/src/treebrowser.c:1977 msgid "Content-type" msgstr "Тип файла" -#: ../treebrowser/src/treebrowser.c:1933 +#: ../treebrowser/src/treebrowser.c:1988 msgid "On Windows, this just hide files that are prefixed with '.' (dot)" msgstr "" "В ОС Windows, эта опция скрывает файлы, имена которых начинаются с символа " "'.' (dot)" -#: ../treebrowser/src/treebrowser.c:1935 +#: ../treebrowser/src/treebrowser.c:1990 msgid "Hide object files" msgstr "Не показывать объектные файлы" -#: ../treebrowser/src/treebrowser.c:1940 +#: ../treebrowser/src/treebrowser.c:1995 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -6102,51 +6431,57 @@ "Не показывать объектные файлы (*.o, *.obj. *.so, *.dll, *.a, *.lib) в дереве " "файлов" -#: ../treebrowser/src/treebrowser.c:1942 +#: ../treebrowser/src/treebrowser.c:1997 msgid "Reverse filter" msgstr "Инвертировать фильтр" -#: ../treebrowser/src/treebrowser.c:1947 +#: ../treebrowser/src/treebrowser.c:2002 msgid "Follow current document" msgstr "Следовать пути текущего документа" -#: ../treebrowser/src/treebrowser.c:1952 +#: ../treebrowser/src/treebrowser.c:2007 msgid "Single click, open document and focus it" msgstr "Одиночный клик открывает документ" -#: ../treebrowser/src/treebrowser.c:1957 +#: ../treebrowser/src/treebrowser.c:2012 msgid "Double click open directory" msgstr "Двойной клик открывает папку" -#: ../treebrowser/src/treebrowser.c:1962 +#: ../treebrowser/src/treebrowser.c:2017 msgid "On delete file, close it if is opened" msgstr "При удалении файла, закрывать его если открыт" -#: ../treebrowser/src/treebrowser.c:1967 +#: ../treebrowser/src/treebrowser.c:2022 +msgid "Focus editor on file open" +msgstr "Передать фокус редактору при открытии файла" + +#: ../treebrowser/src/treebrowser.c:2027 msgid "Show tree lines" msgstr "Показывать соединительные линии" -#: ../treebrowser/src/treebrowser.c:2050 +#: ../treebrowser/src/treebrowser.c:2039 +msgid "Open new files" +msgstr "Открыть новый файл" + +#: ../treebrowser/src/treebrowser.c:2115 msgid "Focus File List" msgstr "Перейти к списку файлов" -#: ../treebrowser/src/treebrowser.c:2052 +#: ../treebrowser/src/treebrowser.c:2117 msgid "Focus Path Entry" msgstr "Перейти к строке адреса" -#: ../treebrowser/src/treebrowser.c:2054 +#: ../treebrowser/src/treebrowser.c:2119 msgid "Rename Object" msgstr "Переименовать объект" -#: ../treebrowser/src/treebrowser.c:2056 -#, fuzzy +#: ../treebrowser/src/treebrowser.c:2121 msgid "Create New File" msgstr "Создать новый файл" -#: ../treebrowser/src/treebrowser.c:2058 -#, fuzzy +#: ../treebrowser/src/treebrowser.c:2123 msgid "Create New Directory" -msgstr "Создать новую директорию" +msgstr "Создать новый каталог" #: ../updatechecker/src/updatechecker.c:41 msgid "Updatechecker" @@ -6185,73 +6520,71 @@ msgstr "Проверить обновления" #: ../webhelper/src/gwh-enum-types.c:15 -#, fuzzy msgid "message-window" -msgstr "_Скрыть окно сообщений" +msgstr "окно сообщений" #: ../webhelper/src/gwh-enum-types.c:16 -#, fuzzy msgid "sidebar" -msgstr "Скрыть боковую панель" +msgstr "боковая панель" #: ../webhelper/src/gwh-enum-types.c:17 msgid "separate-window" -msgstr "" +msgstr "отдельное окно" #: ../webhelper/src/gwh-enum-types.c:32 msgid "none" -msgstr "" +msgstr "нет" #: ../webhelper/src/gwh-enum-types.c:33 msgid "on-connexion" -msgstr "" +msgstr "на связи" #: ../webhelper/src/gwh-enum-types.c:48 msgid "normal" -msgstr "" +msgstr "нормальный" #: ../webhelper/src/gwh-enum-types.c:49 msgid "utility" -msgstr "" +msgstr "утилита" -#: ../webhelper/src/gwh-settings.c:775 +#: ../webhelper/src/gwh-settings.c:782 #, c-format msgid "%s:" msgstr "%s:" -#: ../webhelper/src/gwh-browser.c:528 +#: ../webhelper/src/gwh-browser.c:534 msgid "_Zoom" msgstr "_Увеличить" -#: ../webhelper/src/gwh-browser.c:550 +#: ../webhelper/src/gwh-browser.c:556 msgid "Full-_content zoom" -msgstr "Изменение масштаба всего содержимого" +msgstr "Изменение масштаба всего _содержимого" -#: ../webhelper/src/gwh-browser.c:561 +#: ../webhelper/src/gwh-browser.c:567 msgid "Flip panes orientation" msgstr "Переключить ориентацию панелей" -#: ../webhelper/src/gwh-browser.c:808 +#: ../webhelper/src/gwh-browser.c:814 msgid "Back" msgstr "Назад" -#: ../webhelper/src/gwh-browser.c:812 +#: ../webhelper/src/gwh-browser.c:818 msgid "Forward" msgstr "Вперёд" -#: ../webhelper/src/gwh-browser.c:816 +#: ../webhelper/src/gwh-browser.c:822 msgid "Cancel loading" msgstr "Остановить загрузку" -#: ../webhelper/src/gwh-browser.c:820 +#: ../webhelper/src/gwh-browser.c:826 msgid "Reload current page" msgstr "Перезагрузить страницу" -#: ../webhelper/src/gwh-browser.c:833 ../webhelper/src/gwh-browser.c:879 +#: ../webhelper/src/gwh-browser.c:839 ../webhelper/src/gwh-browser.c:885 msgid "Web inspector" msgstr "Веб-инспектор" -#: ../webhelper/src/gwh-browser.c:834 +#: ../webhelper/src/gwh-browser.c:840 msgid "Toggle web inspector" msgstr "Показать Веб-инспектор" @@ -6330,13 +6663,12 @@ msgstr "Последние сохранённые размеры окна инспектора" #: ../webhelper/src/gwh-plugin.c:343 -#, fuzzy msgid "Inspector detached" -msgstr "Размер окна инспектора" +msgstr "Инспектор отсоединён" #: ../webhelper/src/gwh-plugin.c:344 msgid "Whether the inspector is in a separate window or docked in the browser" -msgstr "" +msgstr "Инспектор в отдельном окне или внутри браузера" #: ../webhelper/src/gwh-plugin.c:349 msgid "Secondary windows skip task bar" @@ -6464,9 +6796,6 @@ #~ msgid "tty temporary directory not specified!\n" #~ msgstr "tty: директория для временных файлов не указанна!\n" -#~ msgid "tty temporary directory not found!\n" -#~ msgstr "tty: директория для временных файлов не найдена!\n" - #~ msgid "tty helper program not specified!\n" #~ msgstr "программа ttyhelper, не указанна!\n" @@ -6535,21 +6864,12 @@ #~ msgid "No %s selected" #~ msgstr "Не выбрана %s " -#~ msgid "watchpoint" -#~ msgstr "точка контроля" - #~ msgid "Delete selected watchpoint?" #~ msgstr "Удалить контрольную точку?" #~ msgid "Delete selected breakpoint?" #~ msgstr "Удалить точку останова?" -#~ msgid "Edit watchpoint" -#~ msgstr "Править точку контроля" - -#~ msgid "Edit breakpoint" -#~ msgstr "Править точку останова" - #~ msgid "Enabled" #~ msgstr "Включено" @@ -6668,9 +6988,6 @@ #~ msgid "(no program)" #~ msgstr "(нет программы)" -#~ msgid "loaded" -#~ msgstr "загружено" - #~ msgid "starting" #~ msgstr "запущено" @@ -6755,74 +7072,8 @@ #~ msgid "Search for current tag in Google Code Search" #~ msgstr "Поиск текущего тэга в Google Code Search" -#, fuzzy -#~ msgid "" -#~ "This Plugin implements Macros in Geany.\n" -#~ "\n" -#~ "This plugin allows you to record and use your own macros. These are " -#~ "sequences of actions that can then be repeated with a single key " -#~ "combination. So if you had dozens of lines where you wanted to delete the " -#~ "last 2 characters, you could simple start recording, press End, " -#~ "Backspace, Backspace, down line and then stop recording. Then simply " -#~ "trigger the macro and it would automatically edit the line and move to " -#~ "the next. Select Record Macro from the Tools menu and you will be " -#~ "prompted with a dialog box. You need to specify a key combination that " -#~ "isn't being used, and a name for the macro to help you identify it. Then " -#~ "press Record. What you do in the editor is then recorded until you select " -#~ "Stop Recording Macro from the Tools menu. Simply pressing the specified " -#~ "key combination will re-run the macro. To edit the macros you have, " -#~ "select Edit Macro from the Tools menu. You can select a macro and delete " -#~ "it, or re-record it. You can also click on a macro's name and change it, " -#~ "or the key combination and re-define that assuming that it's not already " -#~ "in use. Selecting the edit option allows you to view all the individual " -#~ "elements that make up the macro. You can select a diferent command for " -#~ "each element, move them, add new elements, delete elements, or if it's " -#~ "replace/insert, you can edit the text that replaces the selected text, or " -#~ "is inserted.\n" -#~ "\n" -#~ "The only thing to bear in mind is that undo and redo actions are not " -#~ "recorded, and won't be replayed when the macro is re-run.\n" -#~ "\n" -#~ "You can alter the default behaviour of this plugin by selecting Plugin " -#~ "Manager under the Tools menu, selecting this plugin, and cliking " -#~ "Preferences. You can change:\n" -#~ "Save Macros when close Geany - If this is selected then Geany will save " -#~ "any recorded macros and reload them for use the next time you open Geany, " -#~ "if not they will be lost when Geany is closed.\n" -#~ "Ask before replaceing existing Macros - If this is selected then if you " -#~ "try recording a macro over an existing one it will check before over-" -#~ "writing it, giving you the option of trying a different name or key " -#~ "trigger combination, otherwise it will simply erase any existing macros " -#~ "with the same name, or the same key trigger combination." -#~ msgstr "" -#~ "Это плагин осуществляет поддержку макросов в Geany.\n" -#~ "\n" -#~ "Этот плагин позволяет вам добавлять и использовать свои макросы. Макросы " -#~ "это последовательности действий которые потом могут быть выполнены по " -#~ "нажатию горячей клавиши. Например, если у вас есть большое количество " -#~ "строк во всех которых вы хотите удалить последние два символа, вы можете " -#~ "начать запись макроса, нажать End, Backspace, Backspace, спуститься на " -#~ "строку ниже и остановить запись. Потом, вы просто вызываете макрос и он " -#~ "автоматически редактирует строку и переходит на следующую. Выберите " -#~ "\"Запись макроса\" в меню инструментов, после чего на экран будет выведен " -#~ "диалог, в котором вы должны будете указать незадействованную комбинацию " -#~ "клавиш, имя макроса и нажать кнопку начала записи. Все действия, которые " -#~ "вы далее будете выполнять в редакторе будут записываться, пока вы не " -#~ "остановите запись с помощью пункта меню инструментов \"Остановить запись " -#~ "макроса\". Просто нажмите комбинацию клавиш макроса чтобы запустить его. " -#~ "Для редактирования макроса выберите пункт меню инструментов " -#~ "\"Редактировать макрос\". Вы можете удалить макрос или перезаписать его. " -#~ "Вы также можете изменить имя макроса или комбинацию клавиш.\n" -#~ "\n" -#~ "Вы можете изменить некоторые настройки этого плагина через диалог " -#~ "настроек: \n" -#~ "Сохранять макрос при выходе из Geany - если включено, Geany будет " -#~ "сохранять все записанные макросы и загружать их при следующем запуске " -#~ "Geany, если не выключено - они будут удалены при закрытии Geany.\n" -#~ "Спрашивать перед перезаписью существующего макроса - если включено, то " -#~ "при попытке перезаписи макроса вам будет предложено выбрать другое имя " -#~ "или комбинацию клавиш, в противном случае существующий макрос будет " -#~ "перезаписан новым макросом с совпадающим именем или комбинацией клавиш." + #~ msgid "You must define a key trigger combination" #~ msgstr "Вы должны указать комбинацию клавиш" + diff -Nru geany-plugins-1.23+dfsg/po/tr.po geany-plugins-1.24+dfsg/po/tr.po --- geany-plugins-1.23+dfsg/po/tr.po 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/po/tr.po 2014-04-12 14:28:39.000000000 +0000 @@ -1,14 +1,14 @@ # Turkish translation for geany-plugins -# Copyright (C) 2009 - 2013 THE PACKAGE'S COPYRIGHT HOLDER +# Copyright (C) 2009 - 2014 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany-plugins package. # -# Gürkan Gür , 2009 - 2013 +# Gürkan Gür , 2009 - 2014 # msgid "" msgstr "" -"Project-Id-Version: geany-plugins 1.23\n" +"Project-Id-Version: geany-plugins 1.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-09 10:11+0100\n" +"POT-Creation-Date: 2014-04-09 03:19+0000\n" "PO-Revision-Date: \n" "Last-Translator: Gürkan Gür \n" "Language-Team: \n" @@ -36,12 +36,12 @@ msgid "Contents" msgstr "İçerik" -#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:624 +#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:625 msgid "Bookmarks" msgstr "Yer İmleri" #. complete update -#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2295 +#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2351 msgid "_Update" msgstr "G_üncelle" @@ -78,15 +78,15 @@ msgid "Context:" msgstr "İçerik:" -#: ../addons/src/ao_xmltagging.c:56 +#: ../addons/src/ao_xmltagging.c:54 msgid "XML tagging" msgstr "XML etiketleme" -#: ../addons/src/ao_xmltagging.c:67 +#: ../addons/src/ao_xmltagging.c:65 msgid "Tag name to be inserted:" msgstr "Eklenecek etiket adı:" -#: ../addons/src/ao_xmltagging.c:71 +#: ../addons/src/ao_xmltagging.c:69 #, c-format msgid "" "%s will be replaced with your current selection. Please keep care on your " @@ -156,11 +156,12 @@ msgid "Run XML tagging" msgstr "" -#: ../addons/src/addons.c:417 ../geanylatex/src/geanylatex.c:241 -#: ../geanyprj/src/geanyprj.c:174 ../geanysendmail/src/geanysendmail.c:121 -#: ../geanysendmail/src/geanysendmail.c:287 ../geanyvc/src/geanyvc.c:1798 +#: ../addons/src/addons.c:417 ../autoclose/src/autoclose.c:871 +#: ../geanylatex/src/geanylatex.c:241 ../geanyprj/src/geanyprj.c:174 +#: ../geanysendmail/src/geanysendmail.c:123 +#: ../geanysendmail/src/geanysendmail.c:291 ../geanyvc/src/geanyvc.c:1854 #: ../geniuspaste/src/geniuspaste.c:140 ../spellcheck/src/scplugin.c:146 -#: ../treebrowser/src/treebrowser.c:1883 +#: ../treebrowser/src/treebrowser.c:1935 #: ../updatechecker/src/updatechecker.c:253 msgid "Plugin configuration directory could not be created." msgstr "Eklenti düzenleme dizini oluşturulamadı." @@ -247,6 +248,14 @@ msgid "Enclose selection automatically (without having to press a keybinding)" msgstr "" +#: ../autoclose/src/autoclose.c:50 +msgid "Auto-close" +msgstr "" + +#: ../autoclose/src/autoclose.c:51 +msgid "Auto-close braces and brackets with lot of features" +msgstr "" + #: ../codenav/src/codenavigation.c:52 msgid "Code navigation" msgstr "Kod gezgini" @@ -309,8 +318,8 @@ msgid "Various debuggers integration." msgstr "" -#: ../debugger/src/plugin.c:131 ../debugger/src/keys.c:76 -#: ../scope/data/scope.glade.h:125 ../scope/src/scope.c:225 +#: ../debugger/src/plugin.c:133 ../debugger/src/keys.c:76 +#: ../scope/data/scope.glade.h:124 ../scope/src/scope.c:226 msgid "Debug" msgstr "Hata Ayıkla" @@ -442,7 +451,7 @@ msgid "Target" msgstr "Hedef" -#: ../debugger/src/tabs.c:135 ../scope/data/scope.glade.h:69 +#: ../debugger/src/tabs.c:135 ../scope/src/scope.c:524 msgid "Breakpoints" msgstr "Aralıklar" @@ -479,22 +488,22 @@ msgstr "Yeniden Başlat" #: ../debugger/src/keys.c:52 ../debugger/src/btnpanel.c:113 -#: ../scope/src/scope.c:67 +#: ../scope/src/scope.c:66 msgid "Step into" msgstr "" #: ../debugger/src/keys.c:53 ../debugger/src/btnpanel.c:110 -#: ../scope/src/scope.c:68 +#: ../scope/src/scope.c:67 msgid "Step over" msgstr "" #: ../debugger/src/keys.c:54 ../debugger/src/btnpanel.c:122 -#: ../scope/src/scope.c:69 +#: ../scope/src/scope.c:68 msgid "Step out" msgstr "" #: ../debugger/src/keys.c:55 ../debugger/src/btnpanel.c:125 -#: ../scope/src/scope.c:65 +#: ../scope/src/scope.c:64 msgid "Run to cursor" msgstr "" @@ -535,6 +544,14 @@ msgid "Save debug session data to a project" msgstr "" +#: ../defineformat/src/defineformat.c:56 +msgid "Define formatter" +msgstr "" + +#: ../defineformat/src/defineformat.c:57 +msgid "Automatically align backslash in multi-line defines" +msgstr "" + #. never search for more than this many chars #: ../devhelp/src/dhp.h:38 msgid "Documentation" @@ -772,12 +789,12 @@ msgid "A developers' help browser for GNOME" msgstr "" -#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2010 +#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2066 msgid "_File" msgstr "_Dosya" -#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1815 -#: ../geanymacro/src/geanymacro.c:2112 +#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1822 +#: ../geanymacro/src/geanymacro.c:2118 msgid "_Edit" msgstr "Düz_enle" @@ -958,55 +975,63 @@ msgid "Column mode, select to line / brace / anchor." msgstr "" -#: ../geanyextrasel/src/extrasel.c:482 +#: ../geanyextrasel/src/extrasel.c:502 msgid "E_xtra Selection" msgstr "Fazladan Se_çim" -#: ../geanyextrasel/src/extrasel.c:489 +#: ../geanyextrasel/src/extrasel.c:509 msgid "_Column Mode" msgstr "S_ütun Modu" -#: ../geanyextrasel/src/extrasel.c:494 +#: ../geanyextrasel/src/extrasel.c:514 msgid "Column mode" msgstr "Sütun Modu" -#: ../geanyextrasel/src/extrasel.c:496 +#: ../geanyextrasel/src/extrasel.c:516 msgid "Select to _Line" msgstr "" -#: ../geanyextrasel/src/extrasel.c:500 +#: ../geanyextrasel/src/extrasel.c:520 msgid "Select to line" msgstr "" -#: ../geanyextrasel/src/extrasel.c:502 +#: ../geanyextrasel/src/extrasel.c:522 msgid "Select to Matching _Brace" msgstr "" -#: ../geanyextrasel/src/extrasel.c:506 +#: ../geanyextrasel/src/extrasel.c:526 msgid "Select to matching brace" msgstr "" -#: ../geanyextrasel/src/extrasel.c:510 +#: ../geanyextrasel/src/extrasel.c:528 +msgid "_Toggle Stream/Rectangular" +msgstr "" + +#: ../geanyextrasel/src/extrasel.c:532 +msgid "Convert selection" +msgstr "Seçimi dönüştür" + +#: ../geanyextrasel/src/extrasel.c:537 msgid "_Set Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:514 +#: ../geanyextrasel/src/extrasel.c:541 msgid "Set anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:516 +#: ../geanyextrasel/src/extrasel.c:543 msgid "Select to _Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:520 +#: ../geanyextrasel/src/extrasel.c:547 msgid "Select to anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:522 +#: ../geanyextrasel/src/extrasel.c:549 msgid "_Rectangle Select to Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:527 +#: ../geanyextrasel/src/extrasel.c:554 msgid "Rectangle select to anchor" msgstr "" @@ -1398,76 +1423,76 @@ msgid "Default documentation type for languages that does not have one set" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:37 ../geanyinsertnum/src/insertnum.c:329 -#: ../geanyinsertnum/src/insertnum.c:461 +#: ../geanyinsertnum/src/insertnum.c:44 ../geanyinsertnum/src/insertnum.c:337 +#: ../geanyinsertnum/src/insertnum.c:484 msgid "Insert Numbers" msgstr "Numara Girin" -#: ../geanyinsertnum/src/insertnum.c:37 +#: ../geanyinsertnum/src/insertnum.c:44 msgid "Insert/Fill columns with numbers." msgstr "" -#: ../geanyinsertnum/src/insertnum.c:140 +#: ../geanyinsertnum/src/insertnum.c:146 msgid "Counting..." msgstr "Sayılıyor..." -#: ../geanyinsertnum/src/insertnum.c:188 +#: ../geanyinsertnum/src/insertnum.c:194 msgid "Preparing..." msgstr "Hazırlanıyor..." -#: ../geanyinsertnum/src/insertnum.c:194 +#: ../geanyinsertnum/src/insertnum.c:200 msgid "Inserting..." msgstr "Ekleniyor..." -#: ../geanyinsertnum/src/insertnum.c:318 +#: ../geanyinsertnum/src/insertnum.c:333 msgid "For base 11 and above" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:341 +#: ../geanyinsertnum/src/insertnum.c:353 msgid "_Start:" msgstr "Ba_şla:" -#: ../geanyinsertnum/src/insertnum.c:346 +#: ../geanyinsertnum/src/insertnum.c:358 msgid "S_tep:" msgstr "_Adım:" -#: ../geanyinsertnum/src/insertnum.c:352 +#: ../geanyinsertnum/src/insertnum.c:364 msgid "_Base:" msgstr "_Temel:" -#: ../geanyinsertnum/src/insertnum.c:363 +#: ../geanyinsertnum/src/insertnum.c:380 msgid "Letters:" msgstr "Harfler:" -#: ../geanyinsertnum/src/insertnum.c:366 +#: ../geanyinsertnum/src/insertnum.c:383 msgid "_Upper" msgstr "B_üyük" -#: ../geanyinsertnum/src/insertnum.c:371 +#: ../geanyinsertnum/src/insertnum.c:388 msgid "_Lower" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:376 +#: ../geanyinsertnum/src/insertnum.c:393 msgid "Base _prefix" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:378 +#: ../geanyinsertnum/src/insertnum.c:395 msgid "0 for octal, 0x for hex, + for positive decimal" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:380 +#: ../geanyinsertnum/src/insertnum.c:397 msgid "Padding:" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:382 +#: ../geanyinsertnum/src/insertnum.c:399 msgid "Sp_ace" msgstr "Bo_şluk" -#: ../geanyinsertnum/src/insertnum.c:385 +#: ../geanyinsertnum/src/insertnum.c:402 msgid "_Zero" msgstr "S_ıfır" -#: ../geanyinsertnum/src/insertnum.c:454 +#: ../geanyinsertnum/src/insertnum.c:477 msgid "Insert _Numbers" msgstr "Sayı Giri_n" @@ -1918,7 +1943,7 @@ #. * Adds custom templates if there are any. If there are none just #. * adds default one #. TEMPLATE FILE -#: ../geanylatex/src/geanylatex.c:1731 ../markdown/src/conf.c:668 +#: ../geanylatex/src/geanylatex.c:1731 ../markdown/src/conf.c:659 msgid "Template:" msgstr "Şablon:" @@ -2413,16 +2438,16 @@ msgid "Creating dummy text with Geany" msgstr "Geany için rastgele yazı yazı üretiliyor" -#: ../geanylipsum/src/geanylipsum.c:86 +#: ../geanylipsum/src/geanylipsum.c:89 msgid "Lipsum-Generator" msgstr "Lipsum-Oluşturucu" -#: ../geanylipsum/src/geanylipsum.c:87 +#: ../geanylipsum/src/geanylipsum.c:90 msgid "Enter the length of Lipsum text here" msgstr "Rastgele yazının uzunluğunu giriniz" #. Building menu entry -#: ../geanylipsum/src/geanylipsum.c:163 +#: ../geanylipsum/src/geanylipsum.c:164 msgid "_Lipsum" msgstr "_Lipsum" @@ -2551,19 +2576,19 @@ msgid "Browse..." msgstr "Gözat..." -#: ../geanylua/gsdlg.c:175 +#: ../geanylua/gsdlg.c:176 msgid "Select Color" msgstr "Renk Seç" -#: ../geanylua/gsdlg.c:205 +#: ../geanylua/gsdlg.c:207 msgid "Choose..." msgstr "Seç..." -#: ../geanylua/gsdlg.c:226 +#: ../geanylua/gsdlg.c:228 msgid "Select Font" msgstr "Yazıtipi Seçin" -#: ../geanylua/gsdlg.c:253 +#: ../geanylua/gsdlg.c:255 msgid "Select..." msgstr "Seç..." @@ -2590,7 +2615,7 @@ "\"%s\" modülü %s() fonksiyonunda hata:\n" "\"%s\" komutu için yeterli argüman girilmedi.\n" -#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:398 +#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:396 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2628,14 +2653,14 @@ msgid "Save file" msgstr "Dosyayı kaydet" -#: ../geanylua/glspi_dlg.c:436 +#: ../geanylua/glspi_dlg.c:438 #, c-format msgid "" "Error in module \"%s\" at function pickfile():\n" "failed to parse filter string at argument #3.\n" msgstr "" -#: ../geanylua/glspi_dlg.c:486 +#: ../geanylua/glspi_dlg.c:489 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2676,7 +2701,7 @@ "%s eklentisi düzgün yüklenemedi.\n" "Lütfen kurulumu kontrol edin." -#: ../geanylua/glspi_app.c:19 +#: ../geanylua/glspi_app.c:21 #, c-format msgid "" "%s %s: %s\n" @@ -2685,7 +2710,7 @@ "%s %s: %s\n" "Copyright (c) 2007-2008 " -#: ../geanylua/glspi_app.c:149 +#: ../geanylua/glspi_app.c:151 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2694,7 +2719,7 @@ "\"%s\" modülü %s() fonksiyonunda hata:\n" "\"%s\", #1 argümanında bulunamadı.\n" -#: ../geanylua/glspi_app.c:158 +#: ../geanylua/glspi_app.c:160 #, c-format msgid "" "Error in module \"%s\" at function %s() argument #2:\n" @@ -2748,7 +2773,6 @@ msgstr "Sağa doğru kelimenin sonuna kadar sil" #: ../geanymacro/src/geanymacro.c:67 -#, fuzzy msgid "Delete to beginning of line" msgstr "Satırın başına kadar sil" @@ -2825,9 +2849,8 @@ msgstr "İşaretçiyi belgenin ilk satırına kaydır" #: ../geanymacro/src/geanymacro.c:88 -#, fuzzy msgid "Move Cursor to last line of document" -msgstr "Dökümanda etiket yok" +msgstr "İmleci dökümanın son satırına götür" #: ../geanymacro/src/geanymacro.c:89 msgid "Move Cursor up one Page" @@ -2838,9 +2861,8 @@ msgstr "İşaretçiyi bir sayfa aşağı kaydır" #: ../geanymacro/src/geanymacro.c:91 -#, fuzzy msgid "Move Cursor to first visible character" -msgstr "İşaretçiyi ilk görülen karaktere götür" +msgstr "İmleci görülen ilk karaktere götür" #: ../geanymacro/src/geanymacro.c:92 msgid "Move Cursor to last visible character" @@ -2853,9 +2875,8 @@ msgstr "" #: ../geanymacro/src/geanymacro.c:95 -#, fuzzy msgid "Move Cursor to beginning of next paragraph" -msgstr "Seçimi tabloya dönüştür" +msgstr "İmleci sonraki paragrafın başına götür" #: ../geanymacro/src/geanymacro.c:96 msgid "Move Cursor up to beginning of current/previous paragraph" @@ -2878,14 +2899,12 @@ msgstr "Seçimi bir sıra yukarı genişlet" #: ../geanymacro/src/geanymacro.c:102 -#, fuzzy msgid "Extend Selection Left a line" -msgstr "Seçimi tabloya dönüştür" +msgstr "Seçimi sola genişlet" #: ../geanymacro/src/geanymacro.c:103 -#, fuzzy msgid "Extend Selection Right a line" -msgstr "Seçimi sağa hizala" +msgstr "Seçimi sağa genişlet" #: ../geanymacro/src/geanymacro.c:104 #, fuzzy @@ -3040,14 +3059,12 @@ msgstr "" #: ../geanymacro/src/geanymacro.c:143 -#, fuzzy msgid "Change selected text to lowercase" -msgstr "Seçili metni eğik olarak işaretler" +msgstr "Seçilen metni küçük harfe çevir" #: ../geanymacro/src/geanymacro.c:144 -#, fuzzy msgid "Change selected text to uppercase" -msgstr "Seçili metni kalın olarak işaretler" +msgstr "Seçilen metni büyük harfe çevir" #: ../geanymacro/src/geanymacro.c:146 msgid "Insert duplicate of current line below" @@ -3059,6 +3076,19 @@ "duplicate line" msgstr "" +#: ../geanymacro/src/geanymacro.c:150 +msgid "Search for next \"\"" +msgstr "Sonraki için ara \"\"" + +#: ../geanymacro/src/geanymacro.c:151 +msgid "Search for previous \"\"" +msgstr "Önceki için ara \"\"" + +#: ../geanymacro/src/geanymacro.c:152 +#, fuzzy +msgid "Set start of search to beginning of selection" +msgstr "Satırın başına kadar sil" + #: ../geanymacro/src/geanymacro.c:181 msgid "Macros" msgstr "Makrolar" @@ -3278,12 +3308,12 @@ #. create buttons #: ../geanymacro/src/geanymacro.c:1393 ../geanymacro/src/geanymacro.c:1536 -#: ../geanymacro/src/geanymacro.c:1819 ../geanymacro/src/geanymacro.c:2116 +#: ../geanymacro/src/geanymacro.c:1826 ../geanymacro/src/geanymacro.c:2122 msgid "_Ok" msgstr "_Tamam" #: ../geanymacro/src/geanymacro.c:1394 ../geanymacro/src/geanymacro.c:1537 -#: ../geanymacro/src/geanymacro.c:1820 +#: ../geanymacro/src/geanymacro.c:1827 msgid "_Cancel" msgstr "İp_tal" @@ -3297,27 +3327,23 @@ #. create checkbox to check for search options #: ../geanymacro/src/geanymacro.c:1410 -#, fuzzy msgid "Search for contents of clipboard" -msgstr "Pano içeriğinde ara" +msgstr "Panodaki içeriği ara" -#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:92 +#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:101 msgid "Search for:" msgstr "Şunun için ara:" #. create checkbox to check for search options #: ../geanymacro/src/geanymacro.c:1442 -#, fuzzy msgid "Search is case sensitive" -msgstr "Büyük/küçük h_arf duyarlı arama" +msgstr "Büyük/küçük harf duyarlı arama" #: ../geanymacro/src/geanymacro.c:1447 -#, fuzzy msgid "Search for whole word" msgstr "Tüm kelimeyi ara" #: ../geanymacro/src/geanymacro.c:1452 -#, fuzzy msgid "Search for start of word" msgstr "Kelime başlangıcını ara" @@ -3338,58 +3364,58 @@ msgid "Text:" msgstr "Yazı:" -#: ../geanymacro/src/geanymacro.c:1571 ../geanymacro/src/geanymacro.c:1755 +#: ../geanymacro/src/geanymacro.c:1570 ../geanymacro/src/geanymacro.c:1758 #, c-format msgid "Insert/replace with \"%s\"" msgstr "" #. create dialog box -#: ../geanymacro/src/geanymacro.c:1731 +#: ../geanymacro/src/geanymacro.c:1735 #, c-format msgid "Edit: %s" msgstr "Düzenle: %s" #. add column -#: ../geanymacro/src/geanymacro.c:1794 +#: ../geanymacro/src/geanymacro.c:1801 msgid "Event" msgstr "" #. add buttons -#: ../geanymacro/src/geanymacro.c:1809 +#: ../geanymacro/src/geanymacro.c:1816 msgid "Move _Up" msgstr "Y_ukarı Taşı" -#: ../geanymacro/src/geanymacro.c:1811 +#: ../geanymacro/src/geanymacro.c:1818 msgid "Move Do_wn" msgstr "A_şağı Taşı" -#: ../geanymacro/src/geanymacro.c:1813 +#: ../geanymacro/src/geanymacro.c:1820 msgid "New _Above" msgstr "" -#: ../geanymacro/src/geanymacro.c:1814 +#: ../geanymacro/src/geanymacro.c:1821 msgid "New _Below" msgstr "" -#: ../geanymacro/src/geanymacro.c:1817 ../geanymacro/src/geanymacro.c:2114 +#: ../geanymacro/src/geanymacro.c:1824 ../geanymacro/src/geanymacro.c:2120 msgid "_Delete" msgstr "S_il" #. create dialog box -#: ../geanymacro/src/geanymacro.c:2059 +#: ../geanymacro/src/geanymacro.c:2065 msgid "Edit Macros" msgstr "Makroları Düzenle" -#: ../geanymacro/src/geanymacro.c:2089 +#: ../geanymacro/src/geanymacro.c:2095 msgid "Macro Name" msgstr "Makro İsmi" -#: ../geanymacro/src/geanymacro.c:2095 +#: ../geanymacro/src/geanymacro.c:2101 msgid "Key Trigger" msgstr "Tetikleyici Tuş" #. add buttons -#: ../geanymacro/src/geanymacro.c:2110 +#: ../geanymacro/src/geanymacro.c:2116 msgid "_Re-Record" msgstr "Tek_rar Kaydet" @@ -3409,18 +3435,18 @@ msgstr "Makroları Düz_enle" #. *< \brief It's the information message about geany mini script -#: ../geanyminiscript/src/gms_gui.c:130 +#: ../geanyminiscript/src/gms_gui.c:129 msgid "" "GMS : Geany Mini-Script filter Plugin\n" -"This plugin is a tool to apply a script filter on :\n" +"This plugin is a tool to apply a script filter on:\n" " o the text selection,\n" " o the current document,\n" " o all documents of the current session.\n" "\n" -"The filter type can be : \n" -" o Unix shell script, \n" -" o perl script, \n" -" o python script, \n" +"The filter type can be:\n" +" o Unix shell script,\n" +" o perl script,\n" +" o python script,\n" " o sed commands,\n" " o awk script.\n" "\n" @@ -3435,79 +3461,79 @@ "or (at your option) any later version." msgstr "" -#: ../geanyminiscript/src/gms_gui.c:254 +#: ../geanyminiscript/src/gms_gui.c:253 msgid "Load Mini-Script File" msgstr "Mini-Betik Dosyası Yükle" -#: ../geanyminiscript/src/gms_gui.c:311 +#: ../geanyminiscript/src/gms_gui.c:310 msgid "Save Mini-Script File" msgstr "Mini-Betik Dosyasını Kaydet" -#: ../geanyminiscript/src/gms_gui.c:420 +#: ../geanyminiscript/src/gms_gui.c:419 msgid "Mini-Script Filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:448 +#: ../geanyminiscript/src/gms_gui.c:445 msgid "Clear the mini-script window" msgstr "Mini-betik penceresini temizle" -#: ../geanyminiscript/src/gms_gui.c:453 +#: ../geanyminiscript/src/gms_gui.c:450 msgid "Load a mini-script into this window" msgstr "Bu pencereye bir mini-betik yükle" -#: ../geanyminiscript/src/gms_gui.c:458 +#: ../geanyminiscript/src/gms_gui.c:455 msgid "Save the mini-script into a file" msgstr "Mini-betiği bir dosyaya kaydet" -#: ../geanyminiscript/src/gms_gui.c:463 +#: ../geanyminiscript/src/gms_gui.c:460 msgid "Display a information about the mini-script plugin" msgstr "Mini Betik eklentisi ile ilgili bilgi göster" -#: ../geanyminiscript/src/gms_gui.c:471 +#: ../geanyminiscript/src/gms_gui.c:468 msgid "select the mini-script type" msgstr "mini-betik türünü seçiniz" #. Hbox : Radio bouttons for choosing the input: #. * selection/current document/all documents of the current session -#: ../geanyminiscript/src/gms_gui.c:502 +#: ../geanyminiscript/src/gms_gui.c:499 msgid "filter input" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:504 +#: ../geanyminiscript/src/gms_gui.c:501 msgid "select the input of mini-script filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:510 +#: ../geanyminiscript/src/gms_gui.c:507 msgid "selection" msgstr "seçim" -#: ../geanyminiscript/src/gms_gui.c:511 +#: ../geanyminiscript/src/gms_gui.c:508 msgid "document" msgstr "belge" -#: ../geanyminiscript/src/gms_gui.c:512 +#: ../geanyminiscript/src/gms_gui.c:509 msgid "session" msgstr "oturum" #. Hbox : Radio bouttons for choosing the output: #. * current document/ or new document -#: ../geanyminiscript/src/gms_gui.c:521 +#: ../geanyminiscript/src/gms_gui.c:518 msgid "filter output" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:523 +#: ../geanyminiscript/src/gms_gui.c:520 msgid "select the output of mini-script filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:529 +#: ../geanyminiscript/src/gms_gui.c:526 msgid "Current Doc." msgstr "Geçerli Belge" -#: ../geanyminiscript/src/gms_gui.c:530 +#: ../geanyminiscript/src/gms_gui.c:527 msgid "New Doc." msgstr "Yeni Belge" -#: ../geanyminiscript/src/gms_gui.c:751 +#: ../geanyminiscript/src/gms_gui.c:748 msgid "script configuration" msgstr "betik yapılandırması" @@ -3692,36 +3718,36 @@ msgstr "İmzalayıcı seçin" #. shouldn't get here -#: ../geanypg/src/pinentry.c:107 +#: ../geanypg/src/pinentry.c:111 msgid "Could not use pinentry." msgstr "Pinentry kullanılamadı." -#: ../geanypg/src/pinentry.c:119 +#: ../geanypg/src/pinentry.c:123 msgid "Unexpected output from pinentry." msgstr "Pinentry'den beklenmeyen çıktı." #. read the rest of the first line after OK -#: ../geanypg/src/pinentry.c:127 +#: ../geanypg/src/pinentry.c:131 msgid "Passphrase entry" msgstr "Şifre girişi" -#: ../geanypg/src/pinentry.c:131 +#: ../geanypg/src/pinentry.c:135 msgid "Passphrase" msgstr "Şifre" -#: ../geanypg/src/pinentry.c:136 +#: ../geanypg/src/pinentry.c:140 msgid "Enter passphrase for" msgstr "" -#: ../geanypg/src/pinentry.c:167 +#: ../geanypg/src/pinentry.c:171 msgid "pinentry gave error" msgstr "pinentry hata verdi" -#: ../geanypg/src/pinentry.c:170 +#: ../geanypg/src/pinentry.c:174 msgid "Unexpected error from pinentry." msgstr "Pinentry'den beklenmeyen hata." -#: ../geanypg/src/pinentry.c:195 +#: ../geanypg/src/pinentry.c:199 msgid "" "Error, Passphrase input without using gpg-agent is not supported on Windows " "yet." @@ -3731,8 +3757,8 @@ msgid "a key with fingerprint" msgstr "" -#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:522 -#: ../spellcheck/src/gui.c:533 +#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:527 +#: ../spellcheck/src/gui.c:538 msgid "unknown" msgstr "bilinmeyen" @@ -3888,7 +3914,7 @@ msgstr "Bir imza dosyası aç" #: ../geanyprj/src/geanyprj.c:38 ../geanyprj/src/sidebar.c:456 -#: ../gproject/src/gproject-sidebar.c:822 +#: ../gproject/src/gproject-sidebar.c:870 msgid "Project" msgstr "Proje" @@ -3917,7 +3943,7 @@ msgid "C_reate" msgstr "Oluştu_r" -#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:116 +#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:114 msgid "Name:" msgstr "İsim:" @@ -3993,7 +4019,7 @@ msgid "Remove File" msgstr "Dosyayı Kaldır" -#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:803 +#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:849 msgid "H_ide Sidebar" msgstr "Yan Panel_i Gizle" @@ -4002,6 +4028,48 @@ msgid "Project \"%s\" opened." msgstr "\"%s\" projesi açıldı." +#: ../geanypy/src/geanypy-plugin.c:34 +msgid "GeanyPy" +msgstr "GeanyPy" + +#: ../geanypy/src/geanypy-plugin.c:35 +msgid "Python plugins support" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:77 +#, c-format +msgid "Unable to pre-load Python library: %s." +msgstr "Python kütüphanesinin yüklenmesi başarısız: %s." + +#: ../geanypy/src/geanypy-plugin.c:157 +msgid "Failed to import manager module" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:166 +msgid "Failed to retrieve PluginManager from manager module" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:182 +msgid "System plugin directory not found." +msgstr "Sistem eklenti dizini bulunamadı." + +#: ../geanypy/src/geanypy-plugin.c:211 +msgid "Unable to instantiate new PluginManager" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:227 +msgid "Unable to get show_all() method on plugin manager" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:255 +#, fuzzy, c-format +msgid "Unable to create Python plugins directory: %s: %s" +msgstr "'%s' adresinde ayar dizini oluşturulamadı" + +#: ../geanypy/src/geanypy-plugin.c:266 +msgid "Python Plugin Manager" +msgstr "" + #: ../geanysendmail/src/geanysendmail.c:43 msgid "GeanySendMail" msgstr "GeanyEPostaGönder" @@ -4022,42 +4090,42 @@ msgid "Enter the recipient's e-mail address:" msgstr "Alıcının e-posta adresini girin:" -#: ../geanysendmail/src/geanysendmail.c:136 +#: ../geanysendmail/src/geanysendmail.c:138 msgid "Filename placeholder not found. The executed command might have failed." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:142 +#: ../geanysendmail/src/geanysendmail.c:144 msgid "" "Recipient address placeholder not found. The executed command might have " "failed." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:157 +#: ../geanysendmail/src/geanysendmail.c:159 msgid "Could not execute mailer. Please check your configuration." msgstr "" -#: ../geanysendmail/src/geanysendmail.c:166 +#: ../geanysendmail/src/geanysendmail.c:168 msgid "Please define a mail client first." msgstr "Lütfen önce bir e-posta istemcisi tanımlayın." -#: ../geanysendmail/src/geanysendmail.c:171 +#: ../geanysendmail/src/geanysendmail.c:173 msgid "File has to be saved before sending." msgstr "Dosya gönderilmeden önce kaydedilmeli." -#: ../geanysendmail/src/geanysendmail.c:187 +#: ../geanysendmail/src/geanysendmail.c:191 msgid "Mail" msgstr "E-posta" -#: ../geanysendmail/src/geanysendmail.c:218 +#: ../geanysendmail/src/geanysendmail.c:222 msgid "Send by mail" msgstr "E-posta olarak gönder" #. add a label and a text entry to the dialog -#: ../geanysendmail/src/geanysendmail.c:308 +#: ../geanysendmail/src/geanysendmail.c:312 msgid "Path and options for the mail client:" msgstr "E-posta istemcisi için yol ve seçenekler:" -#: ../geanysendmail/src/geanysendmail.c:316 +#: ../geanysendmail/src/geanysendmail.c:320 #, fuzzy msgid "" "Note: \n" @@ -4076,28 +4144,28 @@ "\tsylpheed --attach \"\\%f\" --compose \"\\%r\"\n" "\tmutt -s \"'\\%b'\" gönderiliyor -a \"\\%f\" \"\\%r\"" -#: ../geanysendmail/src/geanysendmail.c:326 +#: ../geanysendmail/src/geanysendmail.c:330 msgid "Show toolbar icon" msgstr "Araç çubuğu simgesini göster" -#: ../geanysendmail/src/geanysendmail.c:328 +#: ../geanysendmail/src/geanysendmail.c:332 msgid "Shows a icon in the toolbar to send file more easy." msgstr "Dosyaları daha kolay göndermek için araç çubuğunda bir simge gösterir." -#: ../geanysendmail/src/geanysendmail.c:334 +#: ../geanysendmail/src/geanysendmail.c:338 msgid "Use dialog for entering email address of recipients" msgstr "Alıcıların e-posta adreslerini girmek için dialog kullan" -#: ../geanysendmail/src/geanysendmail.c:356 +#: ../geanysendmail/src/geanysendmail.c:360 msgid "Send file by mail" msgstr "Dosyayı e-posta olarak gönder" #. Build up menu entry -#: ../geanysendmail/src/geanysendmail.c:379 +#: ../geanysendmail/src/geanysendmail.c:383 msgid "_Mail document" msgstr "Dökü_manı e-postala" -#: ../geanysendmail/src/geanysendmail.c:382 +#: ../geanysendmail/src/geanysendmail.c:386 msgid "" "Sends the opened file as unzipped attachment by any mailer from your $PATH" msgstr "" @@ -4115,78 +4183,97 @@ msgid "geanyvc: s_spawn_sync error: %s" msgstr "geanyvc: s_spawn_sync hatası: %s" -#: ../geanyvc/src/geanyvc.c:609 ../geanyvc/src/geanyvc.c:620 +#: ../geanyvc/src/geanyvc.c:561 +#, c-format +msgid "File %s: action %s executed via %s." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:614 ../geanyvc/src/geanyvc.c:625 #, c-format msgid "geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'" msgstr "" "geanyvc: vcdiff_file_activated: '%s' değerini '%s' olarak yeniden " "adlandırırken hata" -#: ../geanyvc/src/geanyvc.c:646 ../geanyvc/src/geanyvc.c:696 +#: ../geanyvc/src/geanyvc.c:651 ../geanyvc/src/geanyvc.c:701 msgid "No changes were made." msgstr "Hiç değişiklik yapılmadı." -#: ../geanyvc/src/geanyvc.c:723 +#: ../geanyvc/src/geanyvc.c:728 msgid "No history available" msgstr "Geçmiş yok" -#: ../geanyvc/src/geanyvc.c:916 ../geanyvc/src/geanyvc.c:924 +#: ../geanyvc/src/geanyvc.c:921 ../geanyvc/src/geanyvc.c:929 #, c-format msgid "Do you really want to revert: %s?" msgstr "Gerçekten geri almak istiyor musunuz: %s?" -#: ../geanyvc/src/geanyvc.c:932 +#: ../geanyvc/src/geanyvc.c:937 #, c-format msgid "Do you really want to add: %s?" msgstr "Gerçekten eklemek istiyor musunuz: %s ?" -#: ../geanyvc/src/geanyvc.c:939 +#: ../geanyvc/src/geanyvc.c:944 #, c-format msgid "Do you really want to remove: %s?" msgstr "Gerçekten kaldırmak istiyor musunuz: %s ?" -#: ../geanyvc/src/geanyvc.c:962 +#: ../geanyvc/src/geanyvc.c:967 msgid "Do you really want to update?" msgstr "Gerçekten güncellemek istiyor musunuz?" -#: ../geanyvc/src/geanyvc.c:1225 +#: ../geanyvc/src/geanyvc.c:1094 +msgid "" +"The resulting differences cannot be displayed because the changes are too " +"big to display here and would slow down the UI significantly.\n" +"\n" +"To view the differences, cancel this dialog and open the differences in " +"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:1243 msgid "Commit Y/N" msgstr "Teslim et Y/N" -#: ../geanyvc/src/geanyvc.c:1235 +#: ../geanyvc/src/geanyvc.c:1253 msgid "Status" msgstr "Durum" -#: ../geanyvc/src/geanyvc.c:1242 +#: ../geanyvc/src/geanyvc.c:1260 msgid "Path" msgstr "Yol" -#: ../geanyvc/src/geanyvc.c:1330 +#: ../geanyvc/src/geanyvc.c:1324 +#, c-format +msgid "Line: %d Column: %d" +msgstr "" + +#: ../geanyvc/src/geanyvc.c:1370 msgid "Commit" msgstr "Teslim et" -#: ../geanyvc/src/geanyvc.c:1372 +#: ../geanyvc/src/geanyvc.c:1412 msgid "_De-/select all files" msgstr "" -#: ../geanyvc/src/geanyvc.c:1413 +#: ../geanyvc/src/geanyvc.c:1456 msgid "Commit message:" msgstr "Teslim mesajı:" -#: ../geanyvc/src/geanyvc.c:1426 +#: ../geanyvc/src/geanyvc.c:1475 msgid "C_ommit" msgstr "G_önder" -#: ../geanyvc/src/geanyvc.c:1500 +#: ../geanyvc/src/geanyvc.c:1556 msgid "Nothing to commit." msgstr "Teslim edilecek bir şey yok." -#: ../geanyvc/src/geanyvc.c:1546 +#: ../geanyvc/src/geanyvc.c:1602 #, c-format msgid "Error initializing spell checking: %s" msgstr "İmla denetimi yapılırken hata: %s" -#: ../geanyvc/src/geanyvc.c:1558 +#: ../geanyvc/src/geanyvc.c:1614 #, c-format msgid "" "Error while setting up language for spellchecking. Please check " @@ -4195,263 +4282,263 @@ "İmla denetimi için dil ayarlanmasında hata. Lütfen yapılandırmayı kontrol " "edin. Hata mesajı: %s" -#: ../geanyvc/src/geanyvc.c:1834 +#: ../geanyvc/src/geanyvc.c:1890 msgid "Set Changed-flag for document tabs created by the plugin" msgstr "" -#: ../geanyvc/src/geanyvc.c:1837 +#: ../geanyvc/src/geanyvc.c:1893 msgid "" "If this option is activated, every new by the VC-plugin created document tab " "will be marked as changed. Even this option is useful in some cases, it " "could cause a big number of annoying \"Do you want to save\"-dialogs." msgstr "" -#: ../geanyvc/src/geanyvc.c:1845 +#: ../geanyvc/src/geanyvc.c:1901 msgid "Confirm adding new files to a VCS" msgstr "" -#: ../geanyvc/src/geanyvc.c:1848 +#: ../geanyvc/src/geanyvc.c:1904 msgid "Shows a confirmation dialog on adding a new (created) file to VCS." msgstr "" -#: ../geanyvc/src/geanyvc.c:1854 +#: ../geanyvc/src/geanyvc.c:1910 msgid "Maximize commit dialog" msgstr "Teslim diyaloğunu büyüt" -#: ../geanyvc/src/geanyvc.c:1855 +#: ../geanyvc/src/geanyvc.c:1911 msgid "Show commit dialog maximize." msgstr "Teslim diyaloğunu geniş göster." -#: ../geanyvc/src/geanyvc.c:1861 +#: ../geanyvc/src/geanyvc.c:1917 msgid "Use external diff viewer" msgstr "Harici diff görüntüleyici kullan" -#: ../geanyvc/src/geanyvc.c:1863 +#: ../geanyvc/src/geanyvc.c:1919 msgid "Use external diff viewer for file diff." msgstr "Dosya değişiklikleri için harici bir diff izleyici kullan." -#: ../geanyvc/src/geanyvc.c:1869 +#: ../geanyvc/src/geanyvc.c:1925 msgid "Show VC entries at editor menu" msgstr "" -#: ../geanyvc/src/geanyvc.c:1871 +#: ../geanyvc/src/geanyvc.c:1927 msgid "Show entries for VC functions inside editor menu" msgstr "" -#: ../geanyvc/src/geanyvc.c:1876 +#: ../geanyvc/src/geanyvc.c:1932 msgid "Attach menu to menubar" msgstr "" -#: ../geanyvc/src/geanyvc.c:1878 +#: ../geanyvc/src/geanyvc.c:1934 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " "directly inside Geany's menubar.Will take in account after next start of " "GeanyVC" msgstr "" -#: ../geanyvc/src/geanyvc.c:1886 +#: ../geanyvc/src/geanyvc.c:1942 msgid "Enable CVS" msgstr "CVS'i etkinleştir" -#: ../geanyvc/src/geanyvc.c:1891 +#: ../geanyvc/src/geanyvc.c:1947 msgid "Enable GIT" msgstr "GIT'i etkinleştir" -#: ../geanyvc/src/geanyvc.c:1896 +#: ../geanyvc/src/geanyvc.c:1952 msgid "Enable SVN" msgstr "SVN'i etkinleştir" -#: ../geanyvc/src/geanyvc.c:1901 +#: ../geanyvc/src/geanyvc.c:1957 msgid "Enable SVK" msgstr "SVK'yı etkinleştir" -#: ../geanyvc/src/geanyvc.c:1906 +#: ../geanyvc/src/geanyvc.c:1962 msgid "Enable Bazaar" msgstr "Bazaar'ı Etkinleştir" -#: ../geanyvc/src/geanyvc.c:1911 +#: ../geanyvc/src/geanyvc.c:1967 msgid "Enable Mercurial" msgstr "Mercurial'i Etkinleştir" -#: ../geanyvc/src/geanyvc.c:1917 +#: ../geanyvc/src/geanyvc.c:1973 msgid "Spellcheck language" msgstr "İmla denetimi dili" -#: ../geanyvc/src/geanyvc.c:2008 +#: ../geanyvc/src/geanyvc.c:2064 msgid "_VC file Actions" msgstr "" #. Diff of current file #. Diff of the current dir #. Complete diff of base directory -#: ../geanyvc/src/geanyvc.c:2014 ../geanyvc/src/geanyvc.c:2091 -#: ../geanyvc/src/geanyvc.c:2131 +#: ../geanyvc/src/geanyvc.c:2070 ../geanyvc/src/geanyvc.c:2147 +#: ../geanyvc/src/geanyvc.c:2187 msgid "_Diff" msgstr "_Diff" -#: ../geanyvc/src/geanyvc.c:2017 +#: ../geanyvc/src/geanyvc.c:2073 msgid "Make a diff from the current active file" msgstr "Şimdiki aktif dosyadan bir diff dosyası oluştur" #. Revert current file #. Revert current dir #. Revert everything -#: ../geanyvc/src/geanyvc.c:2022 ../geanyvc/src/geanyvc.c:2100 -#: ../geanyvc/src/geanyvc.c:2139 +#: ../geanyvc/src/geanyvc.c:2078 ../geanyvc/src/geanyvc.c:2156 +#: ../geanyvc/src/geanyvc.c:2195 msgid "_Revert" msgstr "_Eskiye dön" -#: ../geanyvc/src/geanyvc.c:2025 +#: ../geanyvc/src/geanyvc.c:2081 msgid "Restore pristine working copy file (undo local edits)." msgstr "" #. Blame for current file -#: ../geanyvc/src/geanyvc.c:2034 +#: ../geanyvc/src/geanyvc.c:2090 msgid "_Blame" msgstr "" -#: ../geanyvc/src/geanyvc.c:2037 +#: ../geanyvc/src/geanyvc.c:2093 msgid "Shows the changes made at one file per revision and author." msgstr "" #. History/log of current file #. History/log of the current dir #. Complete History/Log of base directory -#: ../geanyvc/src/geanyvc.c:2044 ../geanyvc/src/geanyvc.c:2110 -#: ../geanyvc/src/geanyvc.c:2151 +#: ../geanyvc/src/geanyvc.c:2100 ../geanyvc/src/geanyvc.c:2166 +#: ../geanyvc/src/geanyvc.c:2207 msgid "_History (log)" msgstr "_Geçmiş (kayıt)" -#: ../geanyvc/src/geanyvc.c:2047 +#: ../geanyvc/src/geanyvc.c:2103 msgid "Shows the log of the current file" msgstr "Mevcut dosyanın kayıtlarını gösterir" #. base version of the current file -#: ../geanyvc/src/geanyvc.c:2052 +#: ../geanyvc/src/geanyvc.c:2108 msgid "_Original" msgstr "_Orijinal" -#: ../geanyvc/src/geanyvc.c:2055 +#: ../geanyvc/src/geanyvc.c:2111 msgid "Shows the original of the current file" msgstr "Mevcut dosyanın orijinalini gösterir" #. add current file -#: ../geanyvc/src/geanyvc.c:2063 +#: ../geanyvc/src/geanyvc.c:2119 msgid "_Add to Version Control" msgstr "S_ürüm Kontrolüne Ekle" -#: ../geanyvc/src/geanyvc.c:2065 +#: ../geanyvc/src/geanyvc.c:2121 msgid "Add file to repository." msgstr "Dosyayı depoya ekle." #. remove current file -#: ../geanyvc/src/geanyvc.c:2071 +#: ../geanyvc/src/geanyvc.c:2127 msgid "_Remove from Version Control" msgstr "Sürüm Kont_rolünden Çıkart" -#: ../geanyvc/src/geanyvc.c:2073 +#: ../geanyvc/src/geanyvc.c:2129 msgid "Remove file from repository." msgstr "Dosyayı depodan kaldır." -#: ../geanyvc/src/geanyvc.c:2088 +#: ../geanyvc/src/geanyvc.c:2144 msgid "_Directory" msgstr "_Dizin" -#: ../geanyvc/src/geanyvc.c:2094 +#: ../geanyvc/src/geanyvc.c:2150 msgid "Make a diff from the directory of the current active file" msgstr "Şimdiki aktif dosyanın dizininden bir diff dosyası oluştur" -#: ../geanyvc/src/geanyvc.c:2103 +#: ../geanyvc/src/geanyvc.c:2159 msgid "Restore original files in the current folder (undo local edits)." msgstr "" -#: ../geanyvc/src/geanyvc.c:2113 +#: ../geanyvc/src/geanyvc.c:2169 msgid "Shows the log of the current directory" msgstr "Mevcut klasörün kayıtlarını gösterir." -#: ../geanyvc/src/geanyvc.c:2127 +#: ../geanyvc/src/geanyvc.c:2183 msgid "_Base Directory" msgstr "_Temel Dizin" -#: ../geanyvc/src/geanyvc.c:2133 +#: ../geanyvc/src/geanyvc.c:2189 msgid "Make a diff from the top VC directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2141 +#: ../geanyvc/src/geanyvc.c:2197 msgid "Revert any local edits." msgstr "Tüm yerel değişiklikleri geri al" -#: ../geanyvc/src/geanyvc.c:2154 +#: ../geanyvc/src/geanyvc.c:2210 msgid "Shows the log of the top VC directory" msgstr "" -#: ../geanyvc/src/geanyvc.c:2180 +#: ../geanyvc/src/geanyvc.c:2236 msgid "VC _Commit" msgstr "" -#: ../geanyvc/src/geanyvc.c:2215 +#: ../geanyvc/src/geanyvc.c:2271 msgid "Show diff of file" msgstr "Dosyanın farkını göster" -#: ../geanyvc/src/geanyvc.c:2217 +#: ../geanyvc/src/geanyvc.c:2273 msgid "Show diff of directory" msgstr "Dizinin farkını göster" -#: ../geanyvc/src/geanyvc.c:2219 +#: ../geanyvc/src/geanyvc.c:2275 msgid "Show diff of basedir" msgstr "" -#: ../geanyvc/src/geanyvc.c:2222 +#: ../geanyvc/src/geanyvc.c:2278 msgid "Commit changes" msgstr "Değişiklikleri uygula" -#: ../geanyvc/src/geanyvc.c:2224 +#: ../geanyvc/src/geanyvc.c:2280 msgid "Show status" msgstr "Durumu göster" -#: ../geanyvc/src/geanyvc.c:2226 +#: ../geanyvc/src/geanyvc.c:2282 msgid "Revert single file" msgstr "Tek dosyayı eski haline getir" -#: ../geanyvc/src/geanyvc.c:2228 +#: ../geanyvc/src/geanyvc.c:2284 msgid "Revert directory" msgstr "Dizini eski haline getir" -#: ../geanyvc/src/geanyvc.c:2230 +#: ../geanyvc/src/geanyvc.c:2286 msgid "Revert base directory" msgstr "Temel dizini eski haline getir" -#: ../geanyvc/src/geanyvc.c:2232 +#: ../geanyvc/src/geanyvc.c:2288 msgid "Update file" msgstr "Dosyayı güncelle" -#: ../geanyvc/src/geanyvc.c:2260 +#: ../geanyvc/src/geanyvc.c:2316 msgid "_VC" msgstr "" -#: ../geanyvc/src/geanyvc.c:2266 +#: ../geanyvc/src/geanyvc.c:2322 msgid "_Version Control" msgstr "S_ürüm Kontrolü" #. Status of basedir -#: ../geanyvc/src/geanyvc.c:2288 +#: ../geanyvc/src/geanyvc.c:2344 msgid "_Status" msgstr "_Durum" -#: ../geanyvc/src/geanyvc.c:2290 +#: ../geanyvc/src/geanyvc.c:2346 msgid "Show status." msgstr "Durumu göster." -#: ../geanyvc/src/geanyvc.c:2297 +#: ../geanyvc/src/geanyvc.c:2353 msgid "Update from remote repository." msgstr "Uzak depodan güncelle." #. Commit all changes -#: ../geanyvc/src/geanyvc.c:2302 +#: ../geanyvc/src/geanyvc.c:2358 msgid "_Commit" msgstr "_Teslim Et" -#: ../geanyvc/src/geanyvc.c:2304 +#: ../geanyvc/src/geanyvc.c:2360 msgid "Commit changes." msgstr "Değişiklikleri uygula." @@ -4593,80 +4680,79 @@ "tab." msgstr "" -#: ../gproject/src/gproject-sidebar.c:81 -#: ../gproject/src/gproject-sidebar.c:792 +#: ../gproject/src/gproject-sidebar.c:90 +#: ../gproject/src/gproject-sidebar.c:838 msgid "Find File" msgstr "Dosya Ara" -#: ../gproject/src/gproject-sidebar.c:108 +#: ../gproject/src/gproject-sidebar.c:117 msgid "Search inside:" msgstr "Şurada ara:" -#: ../gproject/src/gproject-sidebar.c:120 +#: ../gproject/src/gproject-sidebar.c:129 msgid "C_ase sensitive" msgstr "Büyük/küçük h_arf duyarlı" -#: ../gproject/src/gproject-sidebar.c:123 +#: ../gproject/src/gproject-sidebar.c:132 msgid "Search in full path" msgstr "" -#: ../gproject/src/gproject-sidebar.c:702 +#: ../gproject/src/gproject-sidebar.c:745 msgid "Reload all" msgstr "Hepsini yeniden yükle" -#: ../gproject/src/gproject-sidebar.c:711 -#: ../treebrowser/src/treebrowser.c:1282 +#: ../gproject/src/gproject-sidebar.c:754 +#: ../treebrowser/src/treebrowser.c:1283 msgid "Expand all" msgstr "Hepsini aç" -#: ../gproject/src/gproject-sidebar.c:717 -#: ../treebrowser/src/treebrowser.c:1286 +#: ../gproject/src/gproject-sidebar.c:761 +#: ../treebrowser/src/treebrowser.c:1287 msgid "Collapse all" msgstr "Tümünü Kapat" -#: ../gproject/src/gproject-sidebar.c:726 +#: ../gproject/src/gproject-sidebar.c:771 msgid "Follow active editor" msgstr "" -#: ../gproject/src/gproject-sidebar.c:774 +#: ../gproject/src/gproject-sidebar.c:820 msgid "Expand All" msgstr "Hepsini aç" -#: ../gproject/src/gproject-sidebar.c:783 -#: ../treebrowser/src/treebrowser.c:1234 +#: ../gproject/src/gproject-sidebar.c:829 msgid "Find in Files" msgstr "Dosyalarda Ara" #. POSITION OF VIEW -#: ../markdown/src/conf.c:572 +#: ../markdown/src/conf.c:567 msgid "Position:" msgstr "Pozisyon:" -#: ../markdown/src/conf.c:578 +#: ../markdown/src/conf.c:573 msgid "Sidebar" msgstr "Yan panel" -#: ../markdown/src/conf.c:586 +#: ../markdown/src/conf.c:581 msgid "Message Window" msgstr "Mesaj Penceresi" -#: ../markdown/src/conf.c:600 +#: ../markdown/src/conf.c:595 msgid "Font:" msgstr "Yazı Tipi:" -#: ../markdown/src/conf.c:618 +#: ../markdown/src/conf.c:612 msgid "Code Font:" msgstr "Kod Yazı Tipi:" -#: ../markdown/src/conf.c:636 +#: ../markdown/src/conf.c:629 msgid "BG Color:" msgstr "Arkaplan Rengi:" -#: ../markdown/src/conf.c:653 +#: ../markdown/src/conf.c:645 msgid "FG Color:" msgstr "Önplan Rengi:" -#: ../markdown/src/conf.c:672 +#: ../markdown/src/conf.c:663 msgid "Select Template File" msgstr "Şablon Dosyası seçin" @@ -4682,6 +4768,161 @@ msgid "The current document does not have a Markdown filetype." msgstr "" +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:35 +msgid "Pair Tag Highlighter" +msgstr "" + +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:36 +msgid "Finds and highlights matching opening/closing HTML tag" +msgstr "" + +#: ../pohelper/data/menus.ui.h:1 +msgid "_Translation Helper" +msgstr "" + +#: ../pohelper/data/menus.ui.h:2 +msgid "_Previous String" +msgstr "" + +#: ../pohelper/data/menus.ui.h:3 ../pohelper/src/gph-plugin.c:1034 +msgid "Go to previous string" +msgstr "Önceki metne git" + +#: ../pohelper/data/menus.ui.h:4 +msgid "_Next String" +msgstr "" + +#: ../pohelper/data/menus.ui.h:5 ../pohelper/src/gph-plugin.c:1037 +msgid "Go to next string" +msgstr "Sonraki metne git" + +#: ../pohelper/data/menus.ui.h:6 +msgid "Pre_vious Untranslated" +msgstr "" + +#: ../pohelper/data/menus.ui.h:7 ../pohelper/src/gph-plugin.c:1040 +msgid "Go to previous untranslated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:8 +msgid "Next _Untranslated" +msgstr "" + +#: ../pohelper/data/menus.ui.h:9 ../pohelper/src/gph-plugin.c:1043 +msgid "Go to next untranslated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:10 +msgid "Previous Fu_zzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:11 ../pohelper/src/gph-plugin.c:1046 +msgid "Go to previous fuzzily translated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:12 +msgid "Next _Fuzzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:13 ../pohelper/src/gph-plugin.c:1049 +msgid "Go to next fuzzily translated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:14 +msgid "Previous Untranslated or Fuzz_y" +msgstr "" + +#: ../pohelper/data/menus.ui.h:15 ../pohelper/src/gph-plugin.c:1052 +msgid "Go to previous untranslated or fuzzy string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:16 +msgid "Next Untranslated _or Fuzzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:17 ../pohelper/src/gph-plugin.c:1056 +msgid "Go to next untranslated or fuzzy string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:18 ../pohelper/src/gph-plugin.c:1067 +#, fuzzy +msgid "Toggle current translation fuzziness" +msgstr "Belgelendirme sekmesini aç/kapat" + +#: ../pohelper/data/menus.ui.h:19 +msgid "_Toggle Fuzziness" +msgstr "" + +#: ../pohelper/data/menus.ui.h:20 +msgid "Paste _Message as Translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:21 +msgid "Paste the original untranslated string to the translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:22 ../pohelper/src/gph-plugin.c:1064 +#, fuzzy +msgid "Reflow the current translation string" +msgstr "Yürütülen fonksiyonu tamamla." + +#: ../pohelper/data/menus.ui.h:23 +msgid "_Reflow Translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:24 +msgid "" +"Whether to update the translation headers (author, revision date, ...) upon " +"file save" +msgstr "" + +#: ../pohelper/data/menus.ui.h:25 +msgid "Update _Headers Upon Save" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:41 +msgid "Translation Helper" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:42 +msgid "Improves support for GetText translation files." +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1060 +msgid "Paste original untranslated string to translation" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1102 +#, fuzzy, c-format +msgid "Failed to load configuration file: %s" +msgstr "Seçenekler yüklenemedi: %s" + +#: ../pohelper/src/gph-plugin.c:1127 +#, fuzzy, c-format +msgid "Failed to create configuration directory \"%s\": %s" +msgstr "\"%s\" dosya türü için yapılandırma dosyası bulunamadı: %s" + +#: ../pohelper/src/gph-plugin.c:1130 +#, fuzzy, c-format +msgid "Failed to save configuration file: %s" +msgstr "Seçenekler kaydedilemedi: %s" + +#: ../pohelper/src/gph-plugin.c:1185 +#, fuzzy, c-format +msgid "" +"Failed to load UI definition, please check your installation. The error was: " +"%s" +msgstr "" +"%s eklentisi düzgün yüklenemedi.\n" +"Lütfen kurulumu kontrol edin." + +#: ../pohelper/src/gph-plugin.c:1225 +#, c-format +msgid "" +"Cannot find widget \"%s\" in the UI definition, please check your " +"installation." +msgstr "" + #: ../pretty-printer/src/PluginEntry.c:37 msgid "XML PrettyPrinter" msgstr "" @@ -4894,9 +5135,8 @@ msgstr "" #: ../scope/data/scope.glade.h:32 -#, fuzzy msgid "_Columns" -msgstr "S_ütun Modu" +msgstr "S_ütunlar" #: ../scope/data/scope.glade.h:33 msgid "Show _Group" @@ -5021,259 +5261,331 @@ msgstr "_İkili" #: ../scope/data/scope.glade.h:64 -msgid "_Evaluate/Modify" +msgid "_Raw" msgstr "" #: ../scope/data/scope.glade.h:65 -msgid "_Watch Expression" +msgid "_Evaluate/Modify" msgstr "" #: ../scope/data/scope.glade.h:66 -msgid "_Inspect Variable" -msgstr "Değ_işkeni İncele" +msgid "_Watch Expression" +msgstr "" #: ../scope/data/scope.glade.h:67 -msgid "Program Terminal" -msgstr "" +msgid "_Inspect Variable" +msgstr "Değ_işkeni İncele" #: ../scope/data/scope.glade.h:68 msgid "Threads" msgstr "" -#: ../scope/data/scope.glade.h:70 +#: ../scope/data/scope.glade.h:69 #, fuzzy msgid "Stack" msgstr "Takip yığını" -#: ../scope/data/scope.glade.h:71 +#: ../scope/data/scope.glade.h:70 msgid "Locals" msgstr "" -#: ../scope/data/scope.glade.h:72 +#: ../scope/data/scope.glade.h:71 msgid "Watches" msgstr "" -#: ../scope/data/scope.glade.h:73 +#: ../scope/data/scope.glade.h:72 msgid "Memory" msgstr "Hafıza" -#: ../scope/data/scope.glade.h:74 -msgid "Debug Console" -msgstr "Hata Ayıklama Konsolu" - -#: ../scope/data/scope.glade.h:75 +#: ../scope/data/scope.glade.h:73 msgid "Enter gdb command:" msgstr "GDB komutu girin:" -#: ../scope/data/scope.glade.h:76 +#: ../scope/data/scope.glade.h:74 #, fuzzy msgid "Convert _UTF-8 to locale" msgstr "Tabloya _çevir" -#: ../scope/data/scope.glade.h:77 +#: ../scope/data/scope.glade.h:75 msgid "_Thread" msgstr "" -#: ../scope/data/scope.glade.h:78 +#: ../scope/data/scope.glade.h:76 msgid "_Group" msgstr "" -#: ../scope/data/scope.glade.h:79 +#: ../scope/data/scope.glade.h:77 msgid "_Frame" msgstr "_Çerçeve" -#: ../scope/data/scope.glade.h:80 +#: ../scope/data/scope.glade.h:78 #, fuzzy msgid "Setup Program" msgstr "program yok" -#: ../scope/data/scope.glade.h:81 +#: ../scope/data/scope.glade.h:79 msgid "_Executable:" msgstr "" -#: ../scope/data/scope.glade.h:82 +#: ../scope/data/scope.glade.h:80 msgid "_Arguments:" msgstr "" -#: ../scope/data/scope.glade.h:83 +#: ../scope/data/scope.glade.h:81 msgid "En_vironment:" msgstr "Çevre:" -#: ../scope/data/scope.glade.h:84 +#: ../scope/data/scope.glade.h:82 msgid "_Working dir:" msgstr "" -#: ../scope/data/scope.glade.h:85 +#: ../scope/data/scope.glade.h:83 msgid "_Load script:" msgstr "Betik Yük_le:" -#: ../scope/data/scope.glade.h:86 +#: ../scope/data/scope.glade.h:84 msgid "Auto _run program/exit gdb" msgstr "" -#: ../scope/data/scope.glade.h:87 +#: ../scope/data/scope.glade.h:85 msgid "_Non-stop mode" msgstr "" -#: ../scope/data/scope.glade.h:88 -msgid "_Temporary breakpoint at:" +#: ../scope/data/scope.glade.h:86 +msgid "_Temporary breakpoint on load at:" msgstr "" -#: ../scope/data/scope.glade.h:89 -msgid "_Delete all breakpoints, watches and inspects" +#: ../scope/data/scope.glade.h:87 +msgid "_Delete all breakpoints, watches, inspects and registers" msgstr "" -#: ../scope/data/scope.glade.h:90 ../scope/src/prefs.c:337 +#: ../scope/data/scope.glade.h:88 ../scope/src/scope.c:522 msgid "Program" msgstr "" -#: ../scope/data/scope.glade.h:91 +#: ../scope/data/scope.glade.h:89 msgid "Open on" msgstr "" -#: ../scope/data/scope.glade.h:92 +#: ../scope/data/scope.glade.h:90 msgid "g_db load" msgstr "" -#: ../scope/data/scope.glade.h:93 +#: ../scope/data/scope.glade.h:91 msgid "p_rogram start" msgstr "" -#: ../scope/data/scope.glade.h:94 -#, fuzzy +#: ../scope/data/scope.glade.h:92 msgid "Update all _views" -msgstr "Görev lListesini Güncelle" +msgstr "T_üm görünümleri güncelle" -#: ../scope/data/scope.glade.h:95 +#: ../scope/data/scope.glade.h:93 msgid "Panel" msgstr "Panel" -#: ../scope/data/scope.glade.h:96 +#: ../scope/data/scope.glade.h:94 msgid "Default 8-bit text mode:" msgstr "" -#: ../scope/data/scope.glade.h:97 +#: ../scope/data/scope.glade.h:95 msgid "_7-bit \\nnn" msgstr "_7-bit \\nnn" -#: ../scope/data/scope.glade.h:98 +#: ../scope/data/scope.glade.h:96 msgid "Display" msgstr "" -#: ../scope/data/scope.glade.h:99 +#: ../scope/data/scope.glade.h:97 msgid "_member" msgstr "_üye" -#: ../scope/data/scope.glade.h:100 +#: ../scope/data/scope.glade.h:98 msgid "and" msgstr "ve" -#: ../scope/data/scope.glade.h:101 +#: ../scope/data/scope.glade.h:99 msgid "_argument" msgstr "" -#: ../scope/data/scope.glade.h:102 +#: ../scope/data/scope.glade.h:100 msgid "names" msgstr "isimler" -#: ../scope/data/scope.glade.h:103 +#: ../scope/data/scope.glade.h:101 msgid "Values" msgstr "Değerler" -#: ../scope/data/scope.glade.h:104 +#: ../scope/data/scope.glade.h:102 msgid "E_xpand on apply" msgstr "" -#: ../scope/data/scope.glade.h:105 +#: ../scope/data/scope.glade.h:103 msgid "S_how" msgstr "G_öster" -#: ../scope/data/scope.glade.h:106 +#: ../scope/data/scope.glade.h:104 msgid "children" msgstr "" -#: ../scope/data/scope.glade.h:107 +#: ../scope/data/scope.glade.h:105 msgid "Inspect" msgstr "İncele" -#: ../scope/data/scope.glade.h:108 +#: ../scope/data/scope.glade.h:106 msgid "Show =li_brary messages" msgstr "" -#: ../scope/data/scope.glade.h:109 +#: ../scope/data/scope.glade.h:107 #, fuzzy msgid "Show _tooltips" msgstr "İpuçlarını göster." -#: ../scope/data/scope.glade.h:110 +#: ../scope/data/scope.glade.h:108 msgid "Others" msgstr "Diğerleri" -#: ../scope/data/scope.glade.h:111 +#: ../scope/data/scope.glade.h:109 msgid "Options" msgstr "Seçenekler" -#: ../scope/data/scope.glade.h:112 +#: ../scope/data/scope.glade.h:110 msgid "_Import" msgstr "İ_çe aktar" -#: ../scope/data/scope.glade.h:113 +#: ../scope/data/scope.glade.h:111 msgid "Enter assignment expression:" msgstr "" -#: ../scope/data/scope.glade.h:114 +#: ../scope/data/scope.glade.h:112 msgid "Inspect" msgstr "İncele" -#: ../scope/data/scope.glade.h:115 +#: ../scope/data/scope.glade.h:113 msgid "Object:" msgstr "Nesne:" -#: ../scope/data/scope.glade.h:117 +#: ../scope/data/scope.glade.h:115 msgid "-" msgstr "-" -#: ../scope/data/scope.glade.h:118 +#: ../scope/data/scope.glade.h:116 msgid "Frame:" msgstr "Çerçeve:" -#: ../scope/data/scope.glade.h:119 +#: ../scope/data/scope.glade.h:117 msgid "@" msgstr "@" -#: ../scope/data/scope.glade.h:120 +#: ../scope/data/scope.glade.h:118 msgid "_Apply on run" msgstr "Ç_alıştırıldığında uygula" -#: ../scope/data/scope.glade.h:121 +#: ../scope/data/scope.glade.h:119 msgid "Expand" msgstr "Genişlet" -#: ../scope/data/scope.glade.h:122 +#: ../scope/data/scope.glade.h:120 msgid "Start:" msgstr "Başlangıç:" -#: ../scope/data/scope.glade.h:123 +#: ../scope/data/scope.glade.h:121 msgid "Count:" msgstr "" -#: ../scope/data/scope.glade.h:124 +#: ../scope/data/scope.glade.h:122 #, fuzzy msgid "_Expand on apply" msgstr "Hepsini aç" -#: ../scope/src/break.c:947 +#: ../scope/data/scope.glade.h:123 ../scope/src/scope.c:522 +msgid "Program Terminal" +msgstr "" + +#: ../scope/data/scope.glade.h:125 +msgid "Registers" +msgstr "" + +#: ../scope/src/break.c:97 +#, fuzzy +msgid "breakpoint" +msgstr "Aralıklar" + +#: ../scope/src/break.c:98 +#, fuzzy +msgid "hardware breakpoint" +msgstr "Kesme noktasını düzenle" + +#: ../scope/src/break.c:99 +#, fuzzy +msgid "tracepoint" +msgstr "Aralıklar" + +#: ../scope/src/break.c:100 +#, fuzzy +msgid "fast tracepoint" +msgstr "İzleme noktasını düzenle" + +#: ../scope/src/break.c:101 +#, fuzzy +msgid "write watchpoint" +msgstr "İzleme noktasını düzenle" + +#: ../scope/src/break.c:104 +#, fuzzy +msgid "access watchpoint" +msgstr "İzleme noktasını düzenle" + +#: ../scope/src/break.c:106 +#, fuzzy +msgid "read watchpoint" +msgstr "İzleme noktasını düzenle" + +#: ../scope/src/break.c:108 +#, fuzzy +msgid "catchpoint" +msgstr "İzleme noktası ekle" + +#: ../scope/src/break.c:135 ../scope/src/break.c:139 +msgid "CLI" +msgstr "" + +#: ../scope/src/break.c:136 +msgid "unsupported MI" +msgstr "" + +#: ../scope/src/break.c:141 +#, fuzzy +msgid "on load" +msgstr "yüklendi" + +#: ../scope/src/break.c:142 +#, fuzzy +msgid "Run to Cursor" +msgstr "Konuma git" + +#: ../scope/src/break.c:1013 #, c-format msgid "" "There are two or more breakpoints at %s:%d.\n" +"\n" "Use the breakpoint list to remove the exact one." msgstr "" -#: ../scope/src/break.c:1200 +#: ../scope/src/break.c:1252 +#, c-format +msgid ", %s" +msgstr "" + +#: ../scope/src/break.c:1278 +#, c-format +msgid "func %s" +msgstr "" + +#: ../scope/src/break.c:1309 msgid "Add Breakpoint" msgstr "Kesme noktası ekle" -#: ../scope/src/break.c:1215 +#: ../scope/src/break.c:1324 msgid "Add Watchpoint" msgstr "İzleme noktası ekle" @@ -5285,7 +5597,8 @@ msgid "Enter char # (0..255):" msgstr "" -#: ../scope/src/conterm.c:466 ../scope/src/scope.c:502 +#: ../scope/src/conterm.c:509 ../scope/src/scope.c:550 +#: ../scope/src/scope.c:551 #, c-format msgid "Scope: %s." msgstr "Kapsam: %s" @@ -5304,60 +5617,61 @@ msgid "Program terminated." msgstr "Program sonlandırıldı." -#: ../scope/src/debug.c:468 +#: ../scope/src/debug.c:469 msgid "No breakpoints. Hanging." msgstr "" -#: ../scope/src/debug.c:596 ../scope/src/thread.c:97 +#: ../scope/src/debug.c:598 ../scope/src/thread.c:92 #, c-format msgid "%s." msgstr "%s." -#: ../scope/src/inspect.c:77 +#: ../scope/src/inspect.c:66 msgid "..." msgstr "..." -#: ../scope/src/inspect.c:324 +#: ../scope/src/inspect.c:339 msgid "invalid data" msgstr "geçersiz veri" -#: ../scope/src/inspect.c:356 +#: ../scope/src/inspect.c:371 msgid "no children in range" msgstr "" -#: ../scope/src/inspect.c:440 +#: ../scope/src/inspect.c:454 msgid "out of scope" msgstr "kapsam dışında" -#: ../scope/src/inspect.c:587 +#: ../scope/src/inspect.c:627 msgid "Duplicate inspect variable name." msgstr "" -#: ../scope/src/memory.c:299 +#: ../scope/src/memory.c:292 msgid "Read Memory" msgstr "" -#: ../scope/src/memory.c:408 -msgid "Scope: pointer size > 8, Data disabled." +#: ../scope/src/memory.c:396 +#, c-format +msgid "Scope: pointer size > %d, Data disabled." msgstr "" -#: ../scope/src/menu.c:380 +#: ../scope/src/menu.c:375 msgid "Modify" msgstr "Düzenle" -#: ../scope/src/menu.c:490 +#: ../scope/src/menu.c:481 msgid "Evaluate/modify" msgstr "" -#: ../scope/src/menu.c:491 +#: ../scope/src/menu.c:482 msgid "Watch expression" msgstr "" -#: ../scope/src/menu.c:492 +#: ../scope/src/menu.c:483 msgid "Inspect variable" msgstr "Değişkeni incele" -#: ../scope/src/parse.c:416 +#: ../scope/src/parse.c:437 msgid "Undefined GDB error." msgstr "" @@ -5369,34 +5683,26 @@ msgid "Select File" msgstr "Dosya Seç" -#: ../scope/src/prefs.c:338 -msgid "Breaks" -msgstr "" - -#: ../scope/src/prefs.c:339 -msgid "Console" -msgstr "Konsol" - -#: ../scope/src/prefs.c:347 ../scope/src/utils.c:570 +#: ../scope/src/prefs.c:294 ../scope/src/utils.c:438 #, c-format msgid "Scope: %s: %s." msgstr "Kapsam: %s: %s." -#: ../scope/src/prefs.c:352 +#: ../scope/src/prefs.c:299 msgid "Scope: created configuration file." msgstr "Kapsam: yapılandırma dosyası yaratıldı." -#: ../scope/src/program.c:231 +#: ../scope/src/program.c:251 #, c-format msgid "Loaded debug settings for %s." msgstr "" -#: ../scope/src/program.c:239 +#: ../scope/src/program.c:259 #, fuzzy, c-format msgid "Could not load debug settings file %s: %s." msgstr "\"%s\" dosyası yüklenirken hata: %s" -#: ../scope/src/program.c:359 +#: ../scope/src/program.c:379 #, c-format msgid "" "%s: %s.\n" @@ -5407,15 +5713,15 @@ "\n" "Devam edilsin mi?" -#: ../scope/src/program.c:394 -msgid "Delete all breakpoints, watches and inspects?" +#: ../scope/src/program.c:415 +msgid "Delete all breakpoints, watches et cetera?" msgstr "" -#: ../scope/src/program.c:501 +#: ../scope/src/program.c:523 msgid "as _Name=value" msgstr "" -#: ../scope/src/program.c:502 +#: ../scope/src/program.c:524 msgid "as _Name = value" msgstr "" @@ -5424,160 +5730,172 @@ msgstr "Kapsam Hata Ayıklayıcı" #: ../scope/src/scope.c:35 -msgid "Simple GDB front-end." +msgid "Relatively simple GDB front-end." msgstr "" -#: ../scope/src/scope.c:63 +#: ../scope/src/scope.c:62 #, fuzzy msgid "Setup program" msgstr "program yok" -#: ../scope/src/scope.c:64 +#: ../scope/src/scope.c:63 msgid "Run/continue" msgstr "Çalıştır/devam et" -#: ../scope/src/scope.c:66 +#: ../scope/src/scope.c:65 #, fuzzy msgid "Run to source" msgstr "Konuma git" -#: ../scope/src/scope.c:70 +#: ../scope/src/scope.c:69 msgid "Terminate" msgstr "Sonlandır" -#: ../scope/src/scope.c:71 +#: ../scope/src/scope.c:70 #, fuzzy msgid "Toggle breakpoint" msgstr "kesme noktası" -#: ../scope/src/scope.c:73 ../scope/src/scope.c:76 +#: ../scope/src/scope.c:72 ../scope/src/scope.c:75 msgid "GDB command" msgstr "GDB Komutu" -#: ../scope/src/scope.c:74 +#: ../scope/src/scope.c:73 msgid "Show terminal" msgstr "Terminaldi göster" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Busy" msgstr "Meşgul" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Ready" msgstr "Hazır" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Hang" msgstr "Askıda" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Assem" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Load" msgstr "Yükle" -#: ../scope/src/scope.c:394 +#: ../scope/src/scope.c:421 msgid "Build action activated. Terminate debugging?" msgstr "İnşa eylemi aktifleştirildi. Hata ayıklamayı sonlandır?" -#: ../scope/src/thread.c:58 +#: ../scope/src/scope.c:524 +msgid "Breaks" +msgstr "" + +#: ../scope/src/scope.c:526 +msgid "Console" +msgstr "Konsol" + +#: ../scope/src/scope.c:526 +msgid "Debug Console" +msgstr "Hata Ayıklama Konsolu" + +#: ../scope/src/thread.c:48 #, c-format msgid "Thread group %s started." msgstr "" -#: ../scope/src/thread.c:76 +#: ../scope/src/thread.c:63 msgid "Thread group " msgstr "" -#: ../scope/src/thread.c:88 +#: ../scope/src/thread.c:83 msgid " exited" msgstr " çıktı" -#: ../scope/src/thread.c:91 +#: ../scope/src/thread.c:86 #, c-format msgid " with exit code %s" msgstr " çıkış kodu %s ile" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 msgid "Send Signal" msgstr "Sİnyal gönder" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 msgid "Enter signal #:" msgstr "Sinyali girin #:" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Terminate Process" msgstr "İşlemi Sonlandır" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Enter exit code:" msgstr "Çıkış kodunu girin:" -#: ../scope/src/thread.c:937 +#: ../scope/src/thread.c:891 msgid "Running" msgstr "Çalışıyor" -#: ../scope/src/thread.c:938 +#: ../scope/src/thread.c:892 msgid "Stopped" msgstr "Durduruldu" -#: ../scope/src/utils.c:44 +#: ../scope/src/utils.c:45 #, c-format -msgid "%s: error %lu." -msgstr "" +msgid "%s: %s" +msgstr "%s: %s" -#: ../scope/src/utils.c:358 +#: ../scope/src/utils.c:225 #, c-format msgid "Scope: error reading [%s]." msgstr "Kapsam: [%s] okurken hata." -#: ../scope/src/views.c:505 +#: ../scope/src/views.c:526 msgid "…" msgstr "…" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Send" msgstr "_Gönder" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Busy" msgstr "Me_şgul" -#: ../scope/src/views.c:535 +#: ../scope/src/views.c:558 msgid "GDB Command" msgstr "GDB Komutu" -#: ../spellcheck/src/speller.c:94 +#: ../spellcheck/src/speller.c:180 msgid "Try: " msgstr "Dene:" -#: ../spellcheck/src/speller.c:173 +#: ../spellcheck/src/speller.c:252 msgid "Checking" msgstr "Kontrol Ediliyor" -#: ../spellcheck/src/speller.c:186 +#: ../spellcheck/src/speller.c:265 #, c-format msgid "Checking file \"%s\" (lines %d to %d using %s):" msgstr "\"%s\" dosyası kontrol ediliyor (%d - %d satırları, %s kullanılıyor):" -#: ../spellcheck/src/speller.c:196 +#: ../spellcheck/src/speller.c:275 #, c-format msgid "Checking file \"%s\" (using %s):" msgstr "\"%s\" dosyası kontrol ediliyor (%s kullanılarak):" -#: ../spellcheck/src/speller.c:223 +#: ../spellcheck/src/speller.c:302 msgid "The checked text is spelled correctly." msgstr "Kontrol edilen yazı düzgün yazılmış." -#: ../spellcheck/src/speller.c:233 +#: ../spellcheck/src/speller.c:312 #, c-format msgid "The Enchant library couldn't be initialized (%s)." msgstr "Enchant kütüphanesi yüklenemedi (%s)." -#: ../spellcheck/src/speller.c:234 +#: ../spellcheck/src/speller.c:313 msgid "unknown error (maybe the chosen language is not available)" msgstr "bilinmeyen hata (belki seçilen dil erişilebilir değil)" @@ -5667,17 +5985,17 @@ msgid "Ignore All" msgstr "Tümünü Yoksay" -#: ../spellcheck/src/gui.c:521 +#: ../spellcheck/src/gui.c:526 #, c-format msgid "Default (%s)" msgstr "Varsayılan (%s)" -#: ../spellcheck/src/gui.c:532 +#: ../spellcheck/src/gui.c:537 #, c-format msgid "Toggle spell check while typing (current language: %s)" msgstr "Yazarken imla denetimini uygula (şu anda ayarlı dil: %s)" -#: ../spellcheck/src/gui.c:587 +#: ../spellcheck/src/gui.c:592 msgid "Spelling Suggestions" msgstr "İmla Denetimi Önerileri" @@ -5708,28 +6026,28 @@ #. OK. Something went not as expected. #. * We did have a selection but cannot parse it into rows. #. * Aborting -#: ../tableconvert/src/tableconvert.c:236 +#: ../tableconvert/src/tableconvert.c:237 msgid "Something went wrong on parsing selection. Aborting" msgstr "Seçim işlenirken birşeyler yolunda gitmedi. İptal ediliyor." -#: ../tableconvert/src/tableconvert.c:268 +#: ../tableconvert/src/tableconvert.c:269 msgid "Convert selection to table" msgstr "Seçimi tabloya dönüştür" #. Build up menu entry -#: ../tableconvert/src/tableconvert.c:281 +#: ../tableconvert/src/tableconvert.c:282 msgid "_Convert to table" msgstr "Tabloya _çevir" -#: ../tableconvert/src/tableconvert.c:284 +#: ../tableconvert/src/tableconvert.c:285 msgid "Converts current marked list to a table." msgstr "İşaretlenmiş listeyi tabloya çevirir." -#: ../treebrowser/src/treebrowser.c:122 +#: ../treebrowser/src/treebrowser.c:124 msgid "TreeBrowser" msgstr "AğaçGezgini" -#: ../treebrowser/src/treebrowser.c:123 +#: ../treebrowser/src/treebrowser.c:125 msgid "" "This plugin adds a tree browser to Geany, allowing the user to browse files " "using a tree view of the directory being browsed." @@ -5737,30 +6055,30 @@ "Bu eklenti Geany'e ağaç tarayıcı ekler. Bu sayede dosya sisteminde gezer " "gibi dosyaları açabilirsiniz." -#: ../treebrowser/src/treebrowser.c:432 +#: ../treebrowser/src/treebrowser.c:434 #, c-format msgid "%s: no such directory." msgstr "%s: dosya veya dizin bulunamadı." -#: ../treebrowser/src/treebrowser.c:535 ../treebrowser/src/treebrowser.c:570 -#: ../treebrowser/src/treebrowser.c:672 +#: ../treebrowser/src/treebrowser.c:537 ../treebrowser/src/treebrowser.c:572 +#: ../treebrowser/src/treebrowser.c:670 msgid "(Empty)" msgstr "(Boş)" -#: ../treebrowser/src/treebrowser.c:974 +#: ../treebrowser/src/treebrowser.c:973 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Ayarlanmış harici komut çalıştırılamadı '%s' (%s)." -#: ../treebrowser/src/treebrowser.c:1045 +#: ../treebrowser/src/treebrowser.c:1044 msgid "NewDirectory" msgstr "YeniDizin" -#: ../treebrowser/src/treebrowser.c:1047 +#: ../treebrowser/src/treebrowser.c:1046 msgid "NewFile" msgstr "YeniDosya" -#: ../treebrowser/src/treebrowser.c:1052 +#: ../treebrowser/src/treebrowser.c:1051 #, c-format msgid "" "Target file '%s' exists\n" @@ -5769,114 +6087,118 @@ "Hedef dosya '%s' var\n" ", onu gerçekten boş bir dosya ile değiştirmek mi istiyorsunuz?" -#: ../treebrowser/src/treebrowser.c:1096 +#: ../treebrowser/src/treebrowser.c:1097 #, c-format msgid "Do you really want to delete '%s' ?" msgstr "Gerçekten silmek istiyor musunuz: '%s' ?" -#: ../treebrowser/src/treebrowser.c:1208 ../treebrowser/src/treebrowser.c:1695 +#: ../treebrowser/src/treebrowser.c:1209 ../treebrowser/src/treebrowser.c:1740 msgid "Go up" msgstr "Yukarı git" -#: ../treebrowser/src/treebrowser.c:1212 ../treebrowser/src/treebrowser.c:1710 +#: ../treebrowser/src/treebrowser.c:1213 ../treebrowser/src/treebrowser.c:1755 msgid "Set path from document" msgstr "Yolu belgeden ayarla" -#: ../treebrowser/src/treebrowser.c:1216 -msgid "Open externally" -msgstr "Harici olarak aç" +#: ../treebrowser/src/treebrowser.c:1217 +msgid "_Open externally" +msgstr "Harici _olarak aç" -#: ../treebrowser/src/treebrowser.c:1221 +#: ../treebrowser/src/treebrowser.c:1222 msgid "Open Terminal" msgstr "Terminali Aç" -#: ../treebrowser/src/treebrowser.c:1225 +#: ../treebrowser/src/treebrowser.c:1226 msgid "Set as root" msgstr "Kök olarak ata" -#: ../treebrowser/src/treebrowser.c:1230 ../treebrowser/src/treebrowser.c:1700 -#: ../treebrowser/src/treebrowser.c:2063 +#: ../treebrowser/src/treebrowser.c:1231 ../treebrowser/src/treebrowser.c:1745 +#: ../treebrowser/src/treebrowser.c:2125 msgid "Refresh" msgstr "Yenile" -#: ../treebrowser/src/treebrowser.c:1242 +#: ../treebrowser/src/treebrowser.c:1235 +msgid "_Find in Files" +msgstr "Dosy_alarda Ara" + +#: ../treebrowser/src/treebrowser.c:1243 msgid "Create new directory" msgstr "Yeni dizin oluştur" -#: ../treebrowser/src/treebrowser.c:1246 +#: ../treebrowser/src/treebrowser.c:1247 msgid "Create new file" msgstr "Yeni dosya oluştur" -#: ../treebrowser/src/treebrowser.c:1250 +#: ../treebrowser/src/treebrowser.c:1251 msgid "Rename" msgstr "Yeniden adlandır" -#: ../treebrowser/src/treebrowser.c:1255 +#: ../treebrowser/src/treebrowser.c:1256 msgid "Delete" msgstr "Sil" -#: ../treebrowser/src/treebrowser.c:1263 +#: ../treebrowser/src/treebrowser.c:1264 #, c-format msgid "Close: %s" msgstr "Kapat: %s" -#: ../treebrowser/src/treebrowser.c:1268 +#: ../treebrowser/src/treebrowser.c:1269 #, c-format msgid "Close Child Documents " msgstr "Alt Dosyaları Kapat" -#: ../treebrowser/src/treebrowser.c:1273 -msgid "Copy full path to clipboard" -msgstr "Tam yolu panoya kopyala" +#: ../treebrowser/src/treebrowser.c:1274 +msgid "_Copy full path to clipboard" +msgstr "Tam yolu panoya _kopyala" -#: ../treebrowser/src/treebrowser.c:1293 ../treebrowser/src/treebrowser.c:1977 +#: ../treebrowser/src/treebrowser.c:1294 ../treebrowser/src/treebrowser.c:2034 msgid "Show bookmarks" msgstr "Yer imlerini göster" -#: ../treebrowser/src/treebrowser.c:1298 ../treebrowser/src/treebrowser.c:1931 +#: ../treebrowser/src/treebrowser.c:1299 ../treebrowser/src/treebrowser.c:1983 msgid "Show hidden files" msgstr "Gizli dosyaları göster" -#: ../treebrowser/src/treebrowser.c:1303 +#: ../treebrowser/src/treebrowser.c:1304 msgid "Show toolbars" msgstr "Araç çubuklarını göster" -#: ../treebrowser/src/treebrowser.c:1578 +#: ../treebrowser/src/treebrowser.c:1623 #, c-format msgid "Target file '%s' exists, do you really want to replace it?" msgstr "Hedef dosya '%s' zaten var, üzerine yazmak istiyor musunuz?" -#: ../treebrowser/src/treebrowser.c:1705 +#: ../treebrowser/src/treebrowser.c:1750 msgid "Home" msgstr "Ev" -#: ../treebrowser/src/treebrowser.c:1715 +#: ../treebrowser/src/treebrowser.c:1760 msgid "Track path" msgstr "" -#: ../treebrowser/src/treebrowser.c:1720 +#: ../treebrowser/src/treebrowser.c:1765 msgid "Hide bars" msgstr "Çubukları gizle" -#: ../treebrowser/src/treebrowser.c:1730 +#: ../treebrowser/src/treebrowser.c:1775 msgid "" "Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' " "reverse try for example this '!;*.c;*.h;*.cpp'" msgstr "" -#: ../treebrowser/src/treebrowser.c:1738 +#: ../treebrowser/src/treebrowser.c:1783 msgid "Addressbar for example '/projects/my-project'" msgstr "Adres satırı, örneğin '/projeler/benim-projem'" -#: ../treebrowser/src/treebrowser.c:1763 +#: ../treebrowser/src/treebrowser.c:1808 msgid "Tree Browser" msgstr "Ağaç Gezgini" -#: ../treebrowser/src/treebrowser.c:1895 +#: ../treebrowser/src/treebrowser.c:1947 msgid "External open command" msgstr "Harici açma komutu" -#: ../treebrowser/src/treebrowser.c:1900 +#: ../treebrowser/src/treebrowser.c:1952 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -5886,53 +6208,53 @@ "filename" msgstr "" -#: ../treebrowser/src/treebrowser.c:1908 +#: ../treebrowser/src/treebrowser.c:1960 msgid "Toolbar" msgstr "Araç Çubuğu" -#: ../treebrowser/src/treebrowser.c:1910 +#: ../treebrowser/src/treebrowser.c:1962 msgid "Hidden" msgstr "Gizli" -#: ../treebrowser/src/treebrowser.c:1911 +#: ../treebrowser/src/treebrowser.c:1963 msgid "Top" msgstr "Üstte" -#: ../treebrowser/src/treebrowser.c:1912 +#: ../treebrowser/src/treebrowser.c:1964 msgid "Bottom" msgstr "Sonda" -#: ../treebrowser/src/treebrowser.c:1917 +#: ../treebrowser/src/treebrowser.c:1969 msgid "If position is changed, the option require plugin restart." msgstr "Eğer pozisyon değişirse eklentinin tekrar başlatılması gerekmektedir." -#: ../treebrowser/src/treebrowser.c:1921 +#: ../treebrowser/src/treebrowser.c:1973 msgid "Show icons" msgstr "Simgeleri göster" -#: ../treebrowser/src/treebrowser.c:1923 +#: ../treebrowser/src/treebrowser.c:1975 msgid "None" msgstr "Hiçbiri" -#: ../treebrowser/src/treebrowser.c:1924 +#: ../treebrowser/src/treebrowser.c:1976 msgid "Base" msgstr "Temel" -#: ../treebrowser/src/treebrowser.c:1925 +#: ../treebrowser/src/treebrowser.c:1977 msgid "Content-type" msgstr "İçerik-türü" -#: ../treebrowser/src/treebrowser.c:1936 +#: ../treebrowser/src/treebrowser.c:1988 msgid "On Windows, this just hide files that are prefixed with '.' (dot)" msgstr "" "Windows'da bu sadece '.' (nokta) ile başlayan dosyaların görünmemesini " "sağlar." -#: ../treebrowser/src/treebrowser.c:1938 +#: ../treebrowser/src/treebrowser.c:1990 msgid "Hide object files" msgstr "Nesne dosyalarını gizle" -#: ../treebrowser/src/treebrowser.c:1943 +#: ../treebrowser/src/treebrowser.c:1995 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -5940,47 +6262,55 @@ "Dahili oluşturulmuş dosyaları dosya tarayıcıda göstermez, bu *.o, *.obj. *." "so, *.dll, *.a, *.lib dosyalarını içerir." -#: ../treebrowser/src/treebrowser.c:1945 +#: ../treebrowser/src/treebrowser.c:1997 msgid "Reverse filter" msgstr "" -#: ../treebrowser/src/treebrowser.c:1950 +#: ../treebrowser/src/treebrowser.c:2002 msgid "Follow current document" msgstr "" -#: ../treebrowser/src/treebrowser.c:1955 +#: ../treebrowser/src/treebrowser.c:2007 msgid "Single click, open document and focus it" msgstr "" -#: ../treebrowser/src/treebrowser.c:1960 +#: ../treebrowser/src/treebrowser.c:2012 msgid "Double click open directory" msgstr "Dizini açmak için çift tık" -#: ../treebrowser/src/treebrowser.c:1965 +#: ../treebrowser/src/treebrowser.c:2017 msgid "On delete file, close it if is opened" msgstr "Silme tuşu, eğer açık ise kapat" -#: ../treebrowser/src/treebrowser.c:1970 +#: ../treebrowser/src/treebrowser.c:2022 +msgid "Focus editor on file open" +msgstr "" + +#: ../treebrowser/src/treebrowser.c:2027 msgid "Show tree lines" msgstr "" -#: ../treebrowser/src/treebrowser.c:2053 +#: ../treebrowser/src/treebrowser.c:2039 +msgid "Open new files" +msgstr "Yeni dosya aç" + +#: ../treebrowser/src/treebrowser.c:2115 msgid "Focus File List" msgstr "Dosya Listesini Odakla" -#: ../treebrowser/src/treebrowser.c:2055 +#: ../treebrowser/src/treebrowser.c:2117 msgid "Focus Path Entry" msgstr "Yol Yazımını Odakla" -#: ../treebrowser/src/treebrowser.c:2057 +#: ../treebrowser/src/treebrowser.c:2119 msgid "Rename Object" msgstr "Nesneyi Yeniden adlandır" -#: ../treebrowser/src/treebrowser.c:2059 +#: ../treebrowser/src/treebrowser.c:2121 msgid "Create New File" msgstr "Yeni Dosya Oluştur" -#: ../treebrowser/src/treebrowser.c:2061 +#: ../treebrowser/src/treebrowser.c:2123 msgid "Create New Directory" msgstr "Yeni Dizin Oluştur" @@ -6045,44 +6375,44 @@ msgid "utility" msgstr "araç" -#: ../webhelper/src/gwh-settings.c:775 +#: ../webhelper/src/gwh-settings.c:782 #, c-format msgid "%s:" msgstr "%s:" -#: ../webhelper/src/gwh-browser.c:528 +#: ../webhelper/src/gwh-browser.c:534 msgid "_Zoom" msgstr "_Yakınlaştırma" -#: ../webhelper/src/gwh-browser.c:550 +#: ../webhelper/src/gwh-browser.c:556 msgid "Full-_content zoom" msgstr "" -#: ../webhelper/src/gwh-browser.c:561 +#: ../webhelper/src/gwh-browser.c:567 msgid "Flip panes orientation" msgstr "" -#: ../webhelper/src/gwh-browser.c:808 +#: ../webhelper/src/gwh-browser.c:814 msgid "Back" msgstr "Geri" -#: ../webhelper/src/gwh-browser.c:812 +#: ../webhelper/src/gwh-browser.c:818 msgid "Forward" msgstr "İleri" -#: ../webhelper/src/gwh-browser.c:816 +#: ../webhelper/src/gwh-browser.c:822 msgid "Cancel loading" msgstr "Yüklemeyi iptal et" -#: ../webhelper/src/gwh-browser.c:820 +#: ../webhelper/src/gwh-browser.c:826 msgid "Reload current page" msgstr "Geçerli sayfayı yenile" -#: ../webhelper/src/gwh-browser.c:833 ../webhelper/src/gwh-browser.c:879 +#: ../webhelper/src/gwh-browser.c:839 ../webhelper/src/gwh-browser.c:885 msgid "Web inspector" msgstr "" -#: ../webhelper/src/gwh-browser.c:834 +#: ../webhelper/src/gwh-browser.c:840 msgid "Toggle web inspector" msgstr "" @@ -6270,9 +6600,6 @@ #~ msgid "tty temporary directory not specified!\n" #~ msgstr "tty geçici dizini belirtilmedi!\n" -#~ msgid "tty temporary directory not found!\n" -#~ msgstr "tty geçici dizini bulunamadı!\n" - #~ msgid "tty helper program not specified!\n" #~ msgstr "tty yardımcı program belirtilmedi!\n" @@ -6345,12 +6672,6 @@ #~ msgid "Delete selected breakpoint?" #~ msgstr "Seçilen kesme noktasını sil?" -#~ msgid "Edit watchpoint" -#~ msgstr "İzleme noktasını düzenle" - -#~ msgid "Edit breakpoint" -#~ msgstr "Kesme noktasını düzenle" - #~ msgid "Enabled" #~ msgstr "Etkinleştirildi" @@ -6455,9 +6776,6 @@ #~ msgid "(no program)" #~ msgstr "(program yok)" -#~ msgid "loaded" -#~ msgstr "yüklendi" - #~ msgid "starting" #~ msgstr "başlatılıyor" @@ -6551,10 +6869,6 @@ #~ msgid "Couldn't create tempfile" #~ msgstr "Yeni dosya oluştur" -#, fuzzy -#~ msgid "GeanyPG" -#~ msgstr "GeanyGDB" - #~ msgid "Yura Siamshka " #~ msgstr "Yura Siamshka " diff -Nru geany-plugins-1.23+dfsg/po/zh_CN.po geany-plugins-1.24+dfsg/po/zh_CN.po --- geany-plugins-1.23+dfsg/po/zh_CN.po 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/po/zh_CN.po 2014-04-12 14:28:39.000000000 +0000 @@ -5,9 +5,9 @@ # Xhacker Liu , 2009. msgid "" msgstr "" -"Project-Id-Version: Geany-plugins 1.23\n" +"Project-Id-Version: Geany-plugins 1.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-23 14:32+0100\n" +"POT-Creation-Date: 2014-03-30 19:33+0200\n" "PO-Revision-Date: 2009-10-30 08:44+0800\n" "Last-Translator: Xhacker Liu \n" "Language-Team: zh_CN <>\n" @@ -36,12 +36,12 @@ msgid "Contents" msgstr "内容" -#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:615 +#: ../addons/src/ao_bookmarklist.c:374 ../treebrowser/src/treebrowser.c:625 msgid "Bookmarks" msgstr "书签" #. complete update -#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2295 +#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2351 msgid "_Update" msgstr "更新(_U)" @@ -81,15 +81,15 @@ msgid "Context:" msgstr "内容" -#: ../addons/src/ao_xmltagging.c:56 +#: ../addons/src/ao_xmltagging.c:54 msgid "XML tagging" msgstr "" -#: ../addons/src/ao_xmltagging.c:67 +#: ../addons/src/ao_xmltagging.c:65 msgid "Tag name to be inserted:" msgstr "" -#: ../addons/src/ao_xmltagging.c:71 +#: ../addons/src/ao_xmltagging.c:69 #, c-format msgid "" "%s will be replaced with your current selection. Please keep care on your " @@ -161,11 +161,12 @@ msgid "Run XML tagging" msgstr "" -#: ../addons/src/addons.c:417 ../geanylatex/src/geanylatex.c:241 -#: ../geanyprj/src/geanyprj.c:174 ../geanysendmail/src/geanysendmail.c:121 -#: ../geanysendmail/src/geanysendmail.c:287 ../geanyvc/src/geanyvc.c:1798 +#: ../addons/src/addons.c:417 ../autoclose/src/autoclose.c:871 +#: ../geanylatex/src/geanylatex.c:241 ../geanyprj/src/geanyprj.c:174 +#: ../geanysendmail/src/geanysendmail.c:123 +#: ../geanysendmail/src/geanysendmail.c:291 ../geanyvc/src/geanyvc.c:1854 #: ../geniuspaste/src/geniuspaste.c:140 ../spellcheck/src/scplugin.c:146 -#: ../treebrowser/src/treebrowser.c:1880 +#: ../treebrowser/src/treebrowser.c:1933 #: ../updatechecker/src/updatechecker.c:253 msgid "Plugin configuration directory could not be created." msgstr "无法创建插件配置文件目录。" @@ -256,6 +257,14 @@ msgid "Enclose selection automatically (without having to press a keybinding)" msgstr "" +#: ../autoclose/src/autoclose.c:50 +msgid "Auto-close" +msgstr "" + +#: ../autoclose/src/autoclose.c:51 +msgid "Auto-close braces and brackets with lot of features" +msgstr "" + #: ../codenav/src/codenavigation.c:52 msgid "Code navigation" msgstr "代码导航" @@ -325,8 +334,8 @@ msgid "Various debuggers integration." msgstr "" -#: ../debugger/src/plugin.c:131 ../debugger/src/keys.c:76 -#: ../scope/data/scope.glade.h:125 ../scope/src/scope.c:225 +#: ../debugger/src/plugin.c:133 ../debugger/src/keys.c:76 +#: ../scope/data/scope.glade.h:124 ../scope/src/scope.c:226 #, fuzzy msgid "Debug" msgstr "调试器" @@ -471,7 +480,7 @@ msgid "Target" msgstr "Pages" -#: ../debugger/src/tabs.c:135 ../scope/data/scope.glade.h:69 +#: ../debugger/src/tabs.c:135 ../scope/src/scope.c:524 msgid "Breakpoints" msgstr "断点" @@ -514,24 +523,24 @@ msgstr "正在启动" #: ../debugger/src/keys.c:52 ../debugger/src/btnpanel.c:113 -#: ../scope/src/scope.c:67 +#: ../scope/src/scope.c:66 #, fuzzy msgid "Step into" msgstr "单步进入(_I)" #: ../debugger/src/keys.c:53 ../debugger/src/btnpanel.c:110 -#: ../scope/src/scope.c:68 +#: ../scope/src/scope.c:67 msgid "Step over" msgstr "" #: ../debugger/src/keys.c:54 ../debugger/src/btnpanel.c:122 -#: ../scope/src/scope.c:69 +#: ../scope/src/scope.c:68 #, fuzzy msgid "Step out" msgstr "单步进入(_I)" #: ../debugger/src/keys.c:55 ../debugger/src/btnpanel.c:125 -#: ../scope/src/scope.c:65 +#: ../scope/src/scope.c:64 #, fuzzy msgid "Run to cursor" msgstr "运行到位置" @@ -543,7 +552,7 @@ #: ../debugger/src/keys.c:57 #, fuzzy -msgid "Jump to the currect instruction" +msgid "Jump to the current instruction" msgstr "完成当前执行的函数。" #: ../debugger/src/watch_model.c:220 @@ -577,6 +586,14 @@ msgid "Save debug session data to a project" msgstr "" +#: ../defineformat/src/defineformat.c:56 +msgid "Define formatter" +msgstr "" + +#: ../defineformat/src/defineformat.c:57 +msgid "Automatically align backslash in multi-line defines" +msgstr "" + #. never search for more than this many chars #: ../devhelp/src/dhp.h:38 #, fuzzy @@ -690,7 +707,7 @@ msgstr "书籍" #. i18n: a documentation book -#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1760 +#: ../devhelp/devhelp/dh-link.c:255 ../geanylatex/src/geanylatex.c:1759 msgid "Book" msgstr "书籍" @@ -820,12 +837,12 @@ msgid "A developers' help browser for GNOME" msgstr "" -#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2010 +#: ../devhelp/devhelp/dh-window.c:759 ../geanyvc/src/geanyvc.c:2066 msgid "_File" msgstr "文件(_F)" -#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1815 -#: ../geanymacro/src/geanymacro.c:2112 +#: ../devhelp/devhelp/dh-window.c:760 ../geanymacro/src/geanymacro.c:1822 +#: ../geanymacro/src/geanymacro.c:2118 #, fuzzy msgid "_Edit" msgstr "Editor" @@ -1015,59 +1032,68 @@ msgid "Column mode, select to line / brace / anchor." msgstr "" -#: ../geanyextrasel/src/extrasel.c:482 +#: ../geanyextrasel/src/extrasel.c:502 msgid "E_xtra Selection" msgstr "" -#: ../geanyextrasel/src/extrasel.c:489 +#: ../geanyextrasel/src/extrasel.c:509 msgid "_Column Mode" msgstr "" -#: ../geanyextrasel/src/extrasel.c:494 +#: ../geanyextrasel/src/extrasel.c:514 msgid "Column mode" msgstr "" -#: ../geanyextrasel/src/extrasel.c:496 +#: ../geanyextrasel/src/extrasel.c:516 #, fuzzy msgid "Select to _Line" msgstr "选择字体" -#: ../geanyextrasel/src/extrasel.c:500 +#: ../geanyextrasel/src/extrasel.c:520 #, fuzzy msgid "Select to line" msgstr "选择字体" -#: ../geanyextrasel/src/extrasel.c:502 +#: ../geanyextrasel/src/extrasel.c:522 msgid "Select to Matching _Brace" msgstr "" -#: ../geanyextrasel/src/extrasel.c:506 +#: ../geanyextrasel/src/extrasel.c:526 msgid "Select to matching brace" msgstr "" -#: ../geanyextrasel/src/extrasel.c:510 +#: ../geanyextrasel/src/extrasel.c:528 +msgid "_Toggle Stream/Rectangular" +msgstr "" + +#: ../geanyextrasel/src/extrasel.c:532 +#, fuzzy +msgid "Convert selection" +msgstr "将选中部分左对齐" + +#: ../geanyextrasel/src/extrasel.c:537 msgid "_Set Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:514 +#: ../geanyextrasel/src/extrasel.c:541 msgid "Set anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:516 +#: ../geanyextrasel/src/extrasel.c:543 #, fuzzy msgid "Select to _Anchor" msgstr "选择字体" -#: ../geanyextrasel/src/extrasel.c:520 +#: ../geanyextrasel/src/extrasel.c:547 #, fuzzy msgid "Select to anchor" msgstr "选择字体" -#: ../geanyextrasel/src/extrasel.c:522 +#: ../geanyextrasel/src/extrasel.c:549 msgid "_Rectangle Select to Anchor" msgstr "" -#: ../geanyextrasel/src/extrasel.c:527 +#: ../geanyextrasel/src/extrasel.c:554 msgid "Rectangle select to anchor" msgstr "" @@ -1471,84 +1497,84 @@ msgid "Default documentation type for languages that does not have one set" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:37 ../geanyinsertnum/src/insertnum.c:329 -#: ../geanyinsertnum/src/insertnum.c:461 +#: ../geanyinsertnum/src/insertnum.c:44 ../geanyinsertnum/src/insertnum.c:337 +#: ../geanyinsertnum/src/insertnum.c:484 #, fuzzy msgid "Insert Numbers" msgstr "插入标签" -#: ../geanyinsertnum/src/insertnum.c:37 +#: ../geanyinsertnum/src/insertnum.c:44 msgid "Insert/Fill columns with numbers." msgstr "" -#: ../geanyinsertnum/src/insertnum.c:140 +#: ../geanyinsertnum/src/insertnum.c:146 #, fuzzy msgid "Counting..." msgstr "继续(_C)" -#: ../geanyinsertnum/src/insertnum.c:188 +#: ../geanyinsertnum/src/insertnum.c:194 msgid "Preparing..." msgstr "" -#: ../geanyinsertnum/src/insertnum.c:194 +#: ../geanyinsertnum/src/insertnum.c:200 #, fuzzy msgid "Inserting..." msgstr "正在启动" -#: ../geanyinsertnum/src/insertnum.c:318 +#: ../geanyinsertnum/src/insertnum.c:333 msgid "For base 11 and above" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:341 +#: ../geanyinsertnum/src/insertnum.c:353 #, fuzzy msgid "_Start:" msgstr "状态(_S)" -#: ../geanyinsertnum/src/insertnum.c:346 +#: ../geanyinsertnum/src/insertnum.c:358 #, fuzzy msgid "S_tep:" msgstr "单步(_S)" -#: ../geanyinsertnum/src/insertnum.c:352 +#: ../geanyinsertnum/src/insertnum.c:364 #, fuzzy msgid "_Base:" msgstr "暂停(_P)" -#: ../geanyinsertnum/src/insertnum.c:363 +#: ../geanyinsertnum/src/insertnum.c:380 #, fuzzy msgid "Letters:" msgstr "书信" -#: ../geanyinsertnum/src/insertnum.c:366 +#: ../geanyinsertnum/src/insertnum.c:383 #, fuzzy msgid "_Upper" msgstr "更新(_U)" -#: ../geanyinsertnum/src/insertnum.c:371 +#: ../geanyinsertnum/src/insertnum.c:388 msgid "_Lower" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:376 +#: ../geanyinsertnum/src/insertnum.c:393 msgid "Base _prefix" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:378 +#: ../geanyinsertnum/src/insertnum.c:395 msgid "0 for octal, 0x for hex, + for positive decimal" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:380 +#: ../geanyinsertnum/src/insertnum.c:397 msgid "Padding:" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:382 +#: ../geanyinsertnum/src/insertnum.c:399 msgid "Sp_ace" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:385 +#: ../geanyinsertnum/src/insertnum.c:402 msgid "_Zero" msgstr "" -#: ../geanyinsertnum/src/insertnum.c:454 +#: ../geanyinsertnum/src/insertnum.c:477 #, fuzzy msgid "Insert _Numbers" msgstr "插入标签(_L)" @@ -1990,20 +2016,20 @@ msgid "BibTeX reference name:" msgstr "引用名称" -#: ../geanylatex/src/geanylatex.c:1680 +#: ../geanylatex/src/geanylatex.c:1679 msgid "Dear Sir or Madame" msgstr "亲爱的先生或女士" -#: ../geanylatex/src/geanylatex.c:1681 +#: ../geanylatex/src/geanylatex.c:1680 msgid "With kind regards" msgstr "亲切的问候" -#: ../geanylatex/src/geanylatex.c:1689 +#: ../geanylatex/src/geanylatex.c:1688 msgid "No template assigned. Aborting" msgstr "" #. Building the wizard-dialog and showing it -#: ../geanylatex/src/geanylatex.c:1716 +#: ../geanylatex/src/geanylatex.c:1715 msgid "LaTeX-Wizard" msgstr "LaTeX 向导" @@ -2011,80 +2037,80 @@ #. * Adds custom templates if there are any. If there are none just #. * adds default one #. TEMPLATE FILE -#: ../geanylatex/src/geanylatex.c:1731 ../markdown/src/conf.c:666 +#: ../geanylatex/src/geanylatex.c:1730 ../markdown/src/conf.c:659 msgid "Template:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1735 +#: ../geanylatex/src/geanylatex.c:1734 msgid "Set the template which should be used for creating the new document" msgstr "" -#: ../geanylatex/src/geanylatex.c:1744 +#: ../geanylatex/src/geanylatex.c:1743 #, fuzzy msgid "Default" msgstr "默认（%s）" #. Documentclass -#: ../geanylatex/src/geanylatex.c:1755 +#: ../geanylatex/src/geanylatex.c:1754 msgid "Documentclass:" msgstr "文档类型：" -#: ../geanylatex/src/geanylatex.c:1758 +#: ../geanylatex/src/geanylatex.c:1757 msgid "Choose the kind of document you want to write" msgstr "选择您想要写哪种文档" -#: ../geanylatex/src/geanylatex.c:1762 +#: ../geanylatex/src/geanylatex.c:1761 msgid "Article" msgstr "文章" -#: ../geanylatex/src/geanylatex.c:1764 +#: ../geanylatex/src/geanylatex.c:1763 msgid "Report" msgstr "报告" -#: ../geanylatex/src/geanylatex.c:1766 +#: ../geanylatex/src/geanylatex.c:1765 msgid "Letter" msgstr "书信" -#: ../geanylatex/src/geanylatex.c:1768 +#: ../geanylatex/src/geanylatex.c:1767 msgid "Presentation" msgstr "简报" #. Encoding -#: ../geanylatex/src/geanylatex.c:1778 +#: ../geanylatex/src/geanylatex.c:1777 msgid "Encoding:" msgstr "编码：" -#: ../geanylatex/src/geanylatex.c:1782 +#: ../geanylatex/src/geanylatex.c:1781 msgid "Set the encoding for your new document" msgstr "为您的新文档设置编码" #. fontsize -#: ../geanylatex/src/geanylatex.c:1798 +#: ../geanylatex/src/geanylatex.c:1797 #, fuzzy msgid "Font size" msgstr "文字大小：" -#: ../geanylatex/src/geanylatex.c:1804 +#: ../geanylatex/src/geanylatex.c:1803 msgid "Set the default font size of your new document" msgstr "为您的新文档设置默认的文字大小" #. Author -#: ../geanylatex/src/geanylatex.c:1816 +#: ../geanylatex/src/geanylatex.c:1815 msgid "Author:" msgstr "作者：" -#: ../geanylatex/src/geanylatex.c:1819 +#: ../geanylatex/src/geanylatex.c:1818 msgid "" "Sets the value of the \\author command. In most cases this should be your " "name" msgstr "设置 \\author 命令的值。大多数情况下这应该是您的姓名。" #. Date -#: ../geanylatex/src/geanylatex.c:1833 +#: ../geanylatex/src/geanylatex.c:1832 msgid "Date:" msgstr "日期：" -#: ../geanylatex/src/geanylatex.c:1836 +#: ../geanylatex/src/geanylatex.c:1835 #, fuzzy msgid "" "Sets the value of the \\date command inside header of your new created LaTeX-" @@ -2095,39 +2121,39 @@ "名。如果您不需要固定的日期，设置为 \\today 是一个很好的决定。" #. Title of the new document -#: ../geanylatex/src/geanylatex.c:1848 +#: ../geanylatex/src/geanylatex.c:1847 msgid "Title:" msgstr "标题：" -#: ../geanylatex/src/geanylatex.c:1851 +#: ../geanylatex/src/geanylatex.c:1850 msgid "Sets the title of your new document." msgstr "设置您的新文档的标题。" #. Papersize -#: ../geanylatex/src/geanylatex.c:1860 +#: ../geanylatex/src/geanylatex.c:1859 msgid "Paper size:" msgstr "纸张尺寸：" -#: ../geanylatex/src/geanylatex.c:1863 +#: ../geanylatex/src/geanylatex.c:1862 msgid "Choose the paper format for the newly created document" msgstr "为新建文档选择纸张格式" #. Paper direction -#: ../geanylatex/src/geanylatex.c:1876 +#: ../geanylatex/src/geanylatex.c:1875 #, fuzzy msgid "Paper Orientation:" msgstr "简报" -#: ../geanylatex/src/geanylatex.c:1879 +#: ../geanylatex/src/geanylatex.c:1878 #, fuzzy msgid "Choose the paper orientation for the newly created document" msgstr "为新建文档选择纸张格式" -#: ../geanylatex/src/geanylatex.c:1900 +#: ../geanylatex/src/geanylatex.c:1899 msgid "Use KOMA-script classes if possible" msgstr "如果可能，使用 KOMA 脚本类" -#: ../geanylatex/src/geanylatex.c:1902 +#: ../geanylatex/src/geanylatex.c:1901 #, fuzzy msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" @@ -2137,112 +2163,112 @@ "使用 Markus Kohm 的 KOMA 脚本类。\n" "注意：编译您的文档前需要安装这些类。" -#: ../geanylatex/src/geanylatex.c:1909 +#: ../geanylatex/src/geanylatex.c:1908 msgid "Use draft mode" msgstr "使用草稿模式" -#: ../geanylatex/src/geanylatex.c:1911 +#: ../geanylatex/src/geanylatex.c:1910 msgid "" "Set the draft flag inside new created documents to get documents with a " "number of debugging helpers" msgstr "在新建的文档中设置草稿标志使他人可以帮助调试。" -#: ../geanylatex/src/geanylatex.c:1928 +#: ../geanylatex/src/geanylatex.c:1927 msgid "Run LaTeX-Wizard" msgstr "运行 LaTeX 向导" -#: ../geanylatex/src/geanylatex.c:1930 +#: ../geanylatex/src/geanylatex.c:1929 msgid "Insert \\label" msgstr "插入 \\label" -#: ../geanylatex/src/geanylatex.c:1932 +#: ../geanylatex/src/geanylatex.c:1931 msgid "Insert \\ref" msgstr "插入 \\ref" -#: ../geanylatex/src/geanylatex.c:1934 +#: ../geanylatex/src/geanylatex.c:1933 msgid "Insert linebreak \\\\ " msgstr "插入断行 \\\\ " -#: ../geanylatex/src/geanylatex.c:1937 +#: ../geanylatex/src/geanylatex.c:1936 #, fuzzy msgid "Insert command" msgstr "插入环境" -#: ../geanylatex/src/geanylatex.c:1939 +#: ../geanylatex/src/geanylatex.c:1938 msgid "Turn input replacement on/off" msgstr "开/关输入替换" -#: ../geanylatex/src/geanylatex.c:1943 +#: ../geanylatex/src/geanylatex.c:1942 msgid "Replace special characters" msgstr "替换特殊字符" -#: ../geanylatex/src/geanylatex.c:1946 +#: ../geanylatex/src/geanylatex.c:1945 msgid "Run insert environment dialog" msgstr "运行插入环境对话框" -#: ../geanylatex/src/geanylatex.c:1948 +#: ../geanylatex/src/geanylatex.c:1947 msgid "Insert \\item" msgstr "插入 \\item" -#: ../geanylatex/src/geanylatex.c:1950 +#: ../geanylatex/src/geanylatex.c:1949 msgid "Format selection in bold font face" msgstr "将选中部分变为粗体" -#: ../geanylatex/src/geanylatex.c:1952 +#: ../geanylatex/src/geanylatex.c:1951 msgid "Format selection in italic font face" msgstr "将选中部分变为斜体" -#: ../geanylatex/src/geanylatex.c:1954 +#: ../geanylatex/src/geanylatex.c:1953 msgid "Format selection in typewriter font face" msgstr "将选中部分变为打字机字体" -#: ../geanylatex/src/geanylatex.c:1956 +#: ../geanylatex/src/geanylatex.c:1955 msgid "Format selection centered" msgstr "将选中部分居中" -#: ../geanylatex/src/geanylatex.c:1958 +#: ../geanylatex/src/geanylatex.c:1957 msgid "Format selection left-aligned" msgstr "将选中部分左对齐" -#: ../geanylatex/src/geanylatex.c:1960 +#: ../geanylatex/src/geanylatex.c:1959 #, fuzzy msgid "Format selection right-aligned" msgstr "将选中部分右对齐" -#: ../geanylatex/src/geanylatex.c:1963 +#: ../geanylatex/src/geanylatex.c:1962 msgid "Insert description list" msgstr "" -#: ../geanylatex/src/geanylatex.c:1966 +#: ../geanylatex/src/geanylatex.c:1965 #, fuzzy msgid "Insert itemize list" msgstr "插入 \\item" -#: ../geanylatex/src/geanylatex.c:1969 +#: ../geanylatex/src/geanylatex.c:1968 #, fuzzy msgid "Insert enumerate list" msgstr "插入 Lipsum 文本" -#: ../geanylatex/src/geanylatex.c:1972 +#: ../geanylatex/src/geanylatex.c:1971 msgid "Set selection one level up" msgstr "" -#: ../geanylatex/src/geanylatex.c:1975 +#: ../geanylatex/src/geanylatex.c:1974 #, fuzzy msgid "Set selection one level down" msgstr "将选中部分居中" -#: ../geanylatex/src/geanylatex.c:1978 +#: ../geanylatex/src/geanylatex.c:1977 #, fuzzy msgid "Insert \\usepackage{}" msgstr "插入 \\label" -#: ../geanylatex/src/geanylatex.c:1981 +#: ../geanylatex/src/geanylatex.c:1980 #, fuzzy msgid "Insert BibTeX reference dialog" msgstr "插入引用" -#: ../geanylatex/src/geanylatex.c:1988 +#: ../geanylatex/src/geanylatex.c:1987 msgid "" "GeanyLaTeX is a plugin to improve support for LaTeX in Geany.\n" "\n" @@ -2252,129 +2278,129 @@ "\n" "请将所有 bug 或 功能请求 报告给作者。" -#: ../geanylatex/src/geanylatex.c:2026 +#: ../geanylatex/src/geanylatex.c:2025 msgid "" "glatex_set_autocompletion_contextsize has been initialized with an invalid " "value. Default value taken. Please check your configuration file" msgstr "" -#: ../geanylatex/src/geanylatex.c:2048 ../geanylatex/src/geanylatex.c:2055 +#: ../geanylatex/src/geanylatex.c:2047 ../geanylatex/src/geanylatex.c:2054 msgid "page \\pageref{{{reference}}}" msgstr "" -#: ../geanylatex/src/geanylatex.c:2052 ../geanylatex/src/geanylatex.c:2059 +#: ../geanylatex/src/geanylatex.c:2051 ../geanylatex/src/geanylatex.c:2058 msgid "\\ref{{{reference}}}, page \\pageref{{{reference}}}" msgstr "" #. Build up menu for menubar -#: ../geanylatex/src/geanylatex.c:2107 +#: ../geanylatex/src/geanylatex.c:2106 msgid "_LaTeX" msgstr "_LaTeX" #. Filling up menubar menus #. LaTeX menu -#: ../geanylatex/src/geanylatex.c:2116 ../geanylatex/src/geanylatex.c:2328 +#: ../geanylatex/src/geanylatex.c:2115 ../geanylatex/src/geanylatex.c:2327 msgid "LaTeX-_Wizard" msgstr "LaTeX 向导(_W)" -#: ../geanylatex/src/geanylatex.c:2119 ../geanylatex/src/geanylatex.c:2331 +#: ../geanylatex/src/geanylatex.c:2118 ../geanylatex/src/geanylatex.c:2330 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "启动一个向导轻松创建 LaTeX 文档" -#: ../geanylatex/src/geanylatex.c:2124 +#: ../geanylatex/src/geanylatex.c:2123 #, fuzzy msgid "I_nsert Special Character" msgstr "插入特殊字符(_S)" -#: ../geanylatex/src/geanylatex.c:2126 +#: ../geanylatex/src/geanylatex.c:2125 msgid "Helps to use some not very common letters and signs" msgstr "帮助您使用一些不常用的字符" -#: ../geanylatex/src/geanylatex.c:2136 +#: ../geanylatex/src/geanylatex.c:2135 msgid "Insert _Reference" msgstr "插入引用(_R)" -#: ../geanylatex/src/geanylatex.c:2138 +#: ../geanylatex/src/geanylatex.c:2137 msgid "Inserting references to the document" msgstr "向文档中插入引用" -#: ../geanylatex/src/geanylatex.c:2143 +#: ../geanylatex/src/geanylatex.c:2142 msgid "Insert _Label" msgstr "插入标签(_L)" -#: ../geanylatex/src/geanylatex.c:2145 +#: ../geanylatex/src/geanylatex.c:2144 msgid "Helps at inserting labels to a document" msgstr "帮助您向文档中插入标签" -#: ../geanylatex/src/geanylatex.c:2151 +#: ../geanylatex/src/geanylatex.c:2150 msgid "Insert _Environment" msgstr "插入环境(_E)" -#: ../geanylatex/src/geanylatex.c:2153 +#: ../geanylatex/src/geanylatex.c:2152 msgid "Helps at inserting an environment a document" msgstr "帮助您向文档中插入环境" -#: ../geanylatex/src/geanylatex.c:2159 +#: ../geanylatex/src/geanylatex.c:2158 #, fuzzy msgid "Insert P_ackage" msgstr "插入标签(_L)" -#: ../geanylatex/src/geanylatex.c:2161 +#: ../geanylatex/src/geanylatex.c:2160 msgid "A small dialog to insert \\usepackage{} into header of current file" msgstr "" -#: ../geanylatex/src/geanylatex.c:2166 ../scope/data/scope.glade.h:58 +#: ../geanylatex/src/geanylatex.c:2165 ../scope/data/scope.glade.h:58 msgid "_Format" msgstr "格式(_F)" #. Add font size menu -#: ../geanylatex/src/geanylatex.c:2183 +#: ../geanylatex/src/geanylatex.c:2182 #, fuzzy msgid "F_ont size" msgstr "文字大小：" -#: ../geanylatex/src/geanylatex.c:2201 +#: ../geanylatex/src/geanylatex.c:2200 msgid "_Special Character Replacement" msgstr "特殊字符替换(_S)" -#: ../geanylatex/src/geanylatex.c:2209 +#: ../geanylatex/src/geanylatex.c:2208 msgid "Bulk _Replace Special Characters" msgstr "批量替换特殊字符(_R)" -#: ../geanylatex/src/geanylatex.c:2211 +#: ../geanylatex/src/geanylatex.c:2210 #, fuzzy msgid "_Replace selected special characters with TeX substitutes" msgstr "用 TeX 格式替换选中的特殊字符(_R)" -#: ../geanylatex/src/geanylatex.c:2219 +#: ../geanylatex/src/geanylatex.c:2218 msgid "Toggle _Special Character Replacement" msgstr "开关特殊字符替换(_S)" -#: ../geanylatex/src/geanylatex.c:2230 +#: ../geanylatex/src/geanylatex.c:2229 #, fuzzy msgid "Insert _Command" msgstr "插入环境(_E)" -#: ../geanylatex/src/geanylatex.c:2232 +#: ../geanylatex/src/geanylatex.c:2231 #, fuzzy msgid "Inserting costumized command to document" msgstr "向文档中插入引用" -#: ../geanylatex/src/geanylatex.c:2257 +#: ../geanylatex/src/geanylatex.c:2256 #, fuzzy msgid "_BibTeX" msgstr "_BibTeX" -#: ../geanylatex/src/geanylatex.c:2265 +#: ../geanylatex/src/geanylatex.c:2264 #, fuzzy msgid "Insert B_ibTeX reference" msgstr "插入引用(_R)" -#: ../geanylatex/src/geanylatex.c:2267 +#: ../geanylatex/src/geanylatex.c:2266 msgid "Helps to insert a reference out of BibTeX files" msgstr "" -#: ../geanylatex/src/geanylatex.c:2272 +#: ../geanylatex/src/geanylatex.c:2271 #, fuzzy msgid "_BibTeX entries" msgstr "_BibTeX" @@ -2538,16 +2564,16 @@ msgid "Creating dummy text with Geany" msgstr "用 Geany 创建空虚的文字" -#: ../geanylipsum/src/geanylipsum.c:86 +#: ../geanylipsum/src/geanylipsum.c:89 msgid "Lipsum-Generator" msgstr "Lipsum 生成器" -#: ../geanylipsum/src/geanylipsum.c:87 +#: ../geanylipsum/src/geanylipsum.c:90 msgid "Enter the length of Lipsum text here" msgstr "输入 Lipsum 文本的长度" #. Building menu entry -#: ../geanylipsum/src/geanylipsum.c:163 +#: ../geanylipsum/src/geanylipsum.c:164 msgid "_Lipsum" msgstr "_Lipsum" @@ -2685,19 +2711,19 @@ msgid "Browse..." msgstr "浏览..." -#: ../geanylua/gsdlg.c:175 +#: ../geanylua/gsdlg.c:176 msgid "Select Color" msgstr "选择颜色" -#: ../geanylua/gsdlg.c:205 +#: ../geanylua/gsdlg.c:207 msgid "Choose..." msgstr "选择..." -#: ../geanylua/gsdlg.c:226 +#: ../geanylua/gsdlg.c:228 msgid "Select Font" msgstr "选择字体" -#: ../geanylua/gsdlg.c:253 +#: ../geanylua/gsdlg.c:255 msgid "Select..." msgstr "选取..." @@ -2728,7 +2754,7 @@ "在模块“%s”的函数 %s() 中出现错误：\n" "没有给命令“%s”传递足够的参数。\n" -#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:398 +#: ../geanylua/glspi_sci.c:652 ../geanylua/glspi_app.c:396 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2768,7 +2794,7 @@ msgid "Save file" msgstr "保存文件" -#: ../geanylua/glspi_dlg.c:436 +#: ../geanylua/glspi_dlg.c:438 #, c-format msgid "" "Error in module \"%s\" at function pickfile():\n" @@ -2777,7 +2803,7 @@ "在模块“%s”的函数 pickfile() 中出现错误：\n" "参数 #3 分析过滤器字符串失败。\n" -#: ../geanylua/glspi_dlg.c:486 +#: ../geanylua/glspi_dlg.c:489 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2820,7 +2846,7 @@ "%s 插件未能正确加载。\n" "请检查您的安装。" -#: ../geanylua/glspi_app.c:19 +#: ../geanylua/glspi_app.c:21 #, fuzzy, c-format msgid "" "%s %s: %s\n" @@ -2829,7 +2855,7 @@ "%s %s: %s\n" "Copyright (c) 2007-2008 " -#: ../geanylua/glspi_app.c:149 +#: ../geanylua/glspi_app.c:151 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2838,7 +2864,7 @@ "在模块“%s”的函数 %s() 中出现错误：\n" " 参数 #1 未找到小工具“%s”。\n" -#: ../geanylua/glspi_app.c:158 +#: ../geanylua/glspi_app.c:160 #, c-format msgid "" "Error in module \"%s\" at function %s() argument #2:\n" @@ -3213,6 +3239,21 @@ "duplicate line" msgstr "" +#: ../geanymacro/src/geanymacro.c:150 +#, fuzzy +msgid "Search for next \"\"" +msgstr "插入环境" + +#: ../geanymacro/src/geanymacro.c:151 +#, fuzzy +msgid "Search for previous \"\"" +msgstr "插入环境" + +#: ../geanymacro/src/geanymacro.c:152 +#, fuzzy +msgid "Set start of search to beginning of selection" +msgstr "选择字体" + #: ../geanymacro/src/geanymacro.c:181 #, fuzzy msgid "Macros" @@ -3417,12 +3458,12 @@ #. create buttons #: ../geanymacro/src/geanymacro.c:1393 ../geanymacro/src/geanymacro.c:1536 -#: ../geanymacro/src/geanymacro.c:1819 ../geanymacro/src/geanymacro.c:2116 +#: ../geanymacro/src/geanymacro.c:1826 ../geanymacro/src/geanymacro.c:2122 msgid "_Ok" msgstr "" #: ../geanymacro/src/geanymacro.c:1394 ../geanymacro/src/geanymacro.c:1537 -#: ../geanymacro/src/geanymacro.c:1820 +#: ../geanymacro/src/geanymacro.c:1827 #, fuzzy msgid "_Cancel" msgstr "编码：" @@ -3440,7 +3481,7 @@ msgid "Search for contents of clipboard" msgstr "" -#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:92 +#: ../geanymacro/src/geanymacro.c:1424 ../gproject/src/gproject-sidebar.c:101 msgid "Search for:" msgstr "" @@ -3476,61 +3517,61 @@ msgid "Text:" msgstr "内容" -#: ../geanymacro/src/geanymacro.c:1571 ../geanymacro/src/geanymacro.c:1755 +#: ../geanymacro/src/geanymacro.c:1570 ../geanymacro/src/geanymacro.c:1758 #, c-format msgid "Insert/replace with \"%s\"" msgstr "" #. create dialog box -#: ../geanymacro/src/geanymacro.c:1731 +#: ../geanymacro/src/geanymacro.c:1735 #, fuzzy, c-format msgid "Edit: %s" msgstr "编辑观察点" #. add column -#: ../geanymacro/src/geanymacro.c:1794 +#: ../geanymacro/src/geanymacro.c:1801 msgid "Event" msgstr "" #. add buttons -#: ../geanymacro/src/geanymacro.c:1809 +#: ../geanymacro/src/geanymacro.c:1816 msgid "Move _Up" msgstr "" -#: ../geanymacro/src/geanymacro.c:1811 +#: ../geanymacro/src/geanymacro.c:1818 msgid "Move Do_wn" msgstr "" -#: ../geanymacro/src/geanymacro.c:1813 +#: ../geanymacro/src/geanymacro.c:1820 msgid "New _Above" msgstr "" -#: ../geanymacro/src/geanymacro.c:1814 +#: ../geanymacro/src/geanymacro.c:1821 msgid "New _Below" msgstr "" -#: ../geanymacro/src/geanymacro.c:1817 ../geanymacro/src/geanymacro.c:2114 +#: ../geanymacro/src/geanymacro.c:1824 ../geanymacro/src/geanymacro.c:2120 #, fuzzy msgid "_Delete" msgstr "删除项目" #. create dialog box -#: ../geanymacro/src/geanymacro.c:2059 +#: ../geanymacro/src/geanymacro.c:2065 #, fuzzy msgid "Edit Macros" msgstr "编辑观察点" -#: ../geanymacro/src/geanymacro.c:2089 +#: ../geanymacro/src/geanymacro.c:2095 msgid "Macro Name" msgstr "" -#: ../geanymacro/src/geanymacro.c:2095 +#: ../geanymacro/src/geanymacro.c:2101 #, fuzzy msgid "Key Trigger" msgstr "访问触发器" #. add buttons -#: ../geanymacro/src/geanymacro.c:2110 +#: ../geanymacro/src/geanymacro.c:2116 msgid "_Re-Record" msgstr "" @@ -3549,6 +3590,33 @@ msgid "_Edit Macros" msgstr "" +#. *< \brief It's the information message about geany mini script +#: ../geanyminiscript/src/gms_gui.c:129 +msgid "" +"GMS : Geany Mini-Script filter Plugin\n" +"This plugin is a tool to apply a script filter on:\n" +" o the text selection,\n" +" o the current document,\n" +" o all documents of the current session.\n" +"\n" +"The filter type can be:\n" +" o Unix shell script,\n" +" o perl script,\n" +" o python script,\n" +" o sed commands,\n" +" o awk script.\n" +"\n" +"AUTHOR\n" +" Written by Pascal BURLOT (December,2008)\n" +"\n" +"LICENSE:\n" +"This program is free software; you can redistribute\n" +"it and/or modify it under the terms of the GNU \n" +"General Public License as published by the Free\n" +"Software Foundation; either version 2 of the License,\n" +"or (at your option) any later version." +msgstr "" + #: ../geanyminiscript/src/gms_gui.c:253 msgid "Load Mini-Script File" msgstr "" @@ -3557,114 +3625,113 @@ msgid "Save Mini-Script File" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:418 +#: ../geanyminiscript/src/gms_gui.c:419 msgid "Mini-Script Filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:446 +#: ../geanyminiscript/src/gms_gui.c:445 msgid "Clear the mini-script window" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:451 +#: ../geanyminiscript/src/gms_gui.c:450 msgid "Load a mini-script into this window" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:456 +#: ../geanyminiscript/src/gms_gui.c:455 msgid "Save the mini-script into a file" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:461 +#: ../geanyminiscript/src/gms_gui.c:460 #, fuzzy msgid "Display a information about the mini-script plugin" msgstr "显示选定项的更多信息。" -#: ../geanyminiscript/src/gms_gui.c:469 +#: ../geanyminiscript/src/gms_gui.c:468 msgid "select the mini-script type" msgstr "" #. Hbox : Radio bouttons for choosing the input: #. * selection/current document/all documents of the current session -#: ../geanyminiscript/src/gms_gui.c:500 +#: ../geanyminiscript/src/gms_gui.c:499 msgid "filter input" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:502 +#: ../geanyminiscript/src/gms_gui.c:501 msgid "select the input of mini-script filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:508 +#: ../geanyminiscript/src/gms_gui.c:507 #, fuzzy msgid "selection" msgstr "选择字体" -#: ../geanyminiscript/src/gms_gui.c:509 +#: ../geanyminiscript/src/gms_gui.c:508 #, fuzzy msgid "document" msgstr "将文档作为邮件发送" -#: ../geanyminiscript/src/gms_gui.c:510 +#: ../geanyminiscript/src/gms_gui.c:509 msgid "session" msgstr "" #. Hbox : Radio bouttons for choosing the output: #. * current document/ or new document -#: ../geanyminiscript/src/gms_gui.c:519 +#: ../geanyminiscript/src/gms_gui.c:518 msgid "filter output" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:521 +#: ../geanyminiscript/src/gms_gui.c:520 msgid "select the output of mini-script filter" msgstr "" -#: ../geanyminiscript/src/gms_gui.c:527 +#: ../geanyminiscript/src/gms_gui.c:526 msgid "Current Doc." msgstr "" -#: ../geanyminiscript/src/gms_gui.c:528 +#: ../geanyminiscript/src/gms_gui.c:527 #, fuzzy msgid "New Doc." msgstr "新项目" -#: ../geanyminiscript/src/gms_gui.c:749 +#: ../geanyminiscript/src/gms_gui.c:748 msgid "script configuration" msgstr "" -#. All plugins must set name, description, version and author. #: ../geanyminiscript/src/gms.c:58 #, fuzzy msgid "Mini Script" msgstr "Lua 脚本" -#: ../geanyminiscript/src/gms.c:58 +#: ../geanyminiscript/src/gms.c:59 msgid "" "A tool to apply a script filter on a text selection or current document(s)" msgstr "" -#: ../geanyminiscript/src/gms.c:59 +#: ../geanyminiscript/src/gms.c:60 msgid "Pascal BURLOT, a Geany user" msgstr "" #. Add an item to the Tools menu -#: ../geanyminiscript/src/gms.c:278 +#: ../geanyminiscript/src/gms.c:249 msgid "_Mini-Script" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:58 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:61 msgid "Numbered Bookmarks for Geany" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:923 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:927 #, c-format msgid "Unable to apply all markers to '%s' as all being used." msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:925 -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:969 -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1392 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:929 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:973 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1396 msgid "_Okay" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:967 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:971 #, c-format msgid "" "'%s' has been edited since it was last saved by geany. Marker positions may " @@ -3672,55 +3739,55 @@ "Press Ignore to try an load markers anyway." msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:970 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:974 #, fuzzy msgid "_Ignore" msgstr "忽略全部" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1215 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1219 msgid "remember fold state" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1221 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1225 msgid "Center view when goto bookmark" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1228 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1232 #, fuzzy msgid "Move to start of line" msgstr "将选中部分左对齐" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1229 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1233 msgid "Move to remembered position in line" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1230 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1234 msgid "Move to position in current line" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1231 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1235 #, fuzzy msgid "Move to End of line" msgstr "将选中部分左对齐" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1237 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1241 msgid "Save file settings with program settings" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1238 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1242 msgid "Save file settings to filename with suffix" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1243 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1247 msgid "remember normal Bookmarks" msgstr "" #. create dialog box -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1263 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1267 msgid "Numbered Bookmarks help" msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1270 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1274 msgid "" "This Plugin implements Numbered Bookmarks in Geany, as well as remembering " "the state of folds, and positions of standard non-numbered bookmarks when a " @@ -3736,7 +3803,7 @@ "previously set bookmark, press Ctrl+a number from 0 to 9." msgstr "" -#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1391 +#: ../geanynumberedbookmarks/src/geanynumberedbookmarks.c:1395 msgid "Unable to apply markers as all being used." msgstr "" @@ -3820,36 +3887,36 @@ msgstr "选择文件" #. shouldn't get here -#: ../geanypg/src/pinentry.c:107 +#: ../geanypg/src/pinentry.c:111 msgid "Could not use pinentry." msgstr "" -#: ../geanypg/src/pinentry.c:119 +#: ../geanypg/src/pinentry.c:123 msgid "Unexpected output from pinentry." msgstr "" #. read the rest of the first line after OK -#: ../geanypg/src/pinentry.c:127 +#: ../geanypg/src/pinentry.c:131 msgid "Passphrase entry" msgstr "" -#: ../geanypg/src/pinentry.c:131 +#: ../geanypg/src/pinentry.c:135 msgid "Passphrase" msgstr "" -#: ../geanypg/src/pinentry.c:136 +#: ../geanypg/src/pinentry.c:140 msgid "Enter passphrase for" msgstr "" -#: ../geanypg/src/pinentry.c:167 +#: ../geanypg/src/pinentry.c:171 msgid "pinentry gave error" msgstr "" -#: ../geanypg/src/pinentry.c:170 +#: ../geanypg/src/pinentry.c:174 msgid "Unexpected error from pinentry." msgstr "" -#: ../geanypg/src/pinentry.c:195 +#: ../geanypg/src/pinentry.c:199 msgid "" "Error, Passphrase input without using gpg-agent is not supported on Windows " "yet." @@ -3859,8 +3926,8 @@ msgid "a key with fingerprint" msgstr "" -#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:522 -#: ../spellcheck/src/gui.c:533 +#: ../geanypg/src/verify_aux.c:66 ../spellcheck/src/gui.c:527 +#: ../spellcheck/src/gui.c:538 msgid "unknown" msgstr "未知" @@ -4021,7 +4088,7 @@ msgstr "打开文件" #: ../geanyprj/src/geanyprj.c:38 ../geanyprj/src/sidebar.c:456 -#: ../gproject/src/gproject-sidebar.c:822 +#: ../gproject/src/gproject-sidebar.c:870 msgid "Project" msgstr "项目" @@ -4050,7 +4117,7 @@ msgid "C_reate" msgstr "创建(_R)" -#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:116 +#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:114 msgid "Name:" msgstr "名称：" @@ -4126,7 +4193,7 @@ msgid "Remove File" msgstr "移除文件" -#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:803 +#: ../geanyprj/src/sidebar.c:240 ../gproject/src/gproject-sidebar.c:849 msgid "H_ide Sidebar" msgstr "隐藏侧栏(_I)" @@ -4135,6 +4202,49 @@ msgid "Project \"%s\" opened." msgstr "项目“%s”已打开。" +#: ../geanypy/src/geanypy-plugin.c:34 +msgid "GeanyPy" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:35 +msgid "Python plugins support" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:77 +#, c-format +msgid "Unable to pre-load Python library: %s." +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:157 +msgid "Failed to import manager module" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:166 +msgid "Failed to retrieve PluginManager from manager module" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:182 +#, fuzzy +msgid "System plugin directory not found." +msgstr "未找到 tty 临时目录！\n" + +#: ../geanypy/src/geanypy-plugin.c:211 +msgid "Unable to instantiate new PluginManager" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:227 +msgid "Unable to get show_all() method on plugin manager" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:255 +#, c-format +msgid "Unable to create Python plugins directory: %s: %s" +msgstr "" + +#: ../geanypy/src/geanypy-plugin.c:266 +msgid "Python Plugin Manager" +msgstr "" + #: ../geanysendmail/src/geanysendmail.c:43 msgid "GeanySendMail" msgstr "GeanySendMail" @@ -4154,42 +4264,42 @@ msgid "Enter the recipient's e-mail address:" msgstr "输入收件人的电子邮件地址：" -#: ../geanysendmail/src/geanysendmail.c:136 +#: ../geanysendmail/src/geanysendmail.c:138 msgid "Filename placeholder not found. The executed command might have failed." msgstr "没有找到文件名的占位符。执行的命令可能会失败。" -#: ../geanysendmail/src/geanysendmail.c:142 +#: ../geanysendmail/src/geanysendmail.c:144 msgid "" "Recipient address placeholder not found. The executed command might have " "failed." msgstr "没有找到收件人地址的占位符。执行的命令可能会失败。" -#: ../geanysendmail/src/geanysendmail.c:157 +#: ../geanysendmail/src/geanysendmail.c:159 msgid "Could not execute mailer. Please check your configuration." msgstr "无法执行邮件程序。请检查您的设置。" -#: ../geanysendmail/src/geanysendmail.c:166 +#: ../geanysendmail/src/geanysendmail.c:168 msgid "Please define a mail client first." msgstr "请先指定一个邮件客户端。" -#: ../geanysendmail/src/geanysendmail.c:171 +#: ../geanysendmail/src/geanysendmail.c:173 msgid "File has to be saved before sending." msgstr "文件在发送前必须保存。" -#: ../geanysendmail/src/geanysendmail.c:187 +#: ../geanysendmail/src/geanysendmail.c:191 msgid "Mail" msgstr "邮件" -#: ../geanysendmail/src/geanysendmail.c:218 +#: ../geanysendmail/src/geanysendmail.c:222 msgid "Send by mail" msgstr "用邮件发送" #. add a label and a text entry to the dialog -#: ../geanysendmail/src/geanysendmail.c:308 +#: ../geanysendmail/src/geanysendmail.c:312 msgid "Path and options for the mail client:" msgstr "邮件客户端路径和选项：" -#: ../geanysendmail/src/geanysendmail.c:316 +#: ../geanysendmail/src/geanysendmail.c:320 #, fuzzy msgid "" "Note: \n" @@ -4208,31 +4318,31 @@ "\tsylpheed --attach \"\\%f\" --compose \"\\%r\"\n" "\tmutt -s \"Sending '\\%b'\" -a \"\\%f\" \"\\%r\"" -#: ../geanysendmail/src/geanysendmail.c:326 +#: ../geanysendmail/src/geanysendmail.c:330 #, fuzzy msgid "Show toolbar icon" msgstr "显示工具提示。" -#: ../geanysendmail/src/geanysendmail.c:328 +#: ../geanysendmail/src/geanysendmail.c:332 msgid "Shows a icon in the toolbar to send file more easy." msgstr "在工具栏上显示一个图标，可以更轻松地发送文件。" -#: ../geanysendmail/src/geanysendmail.c:334 +#: ../geanysendmail/src/geanysendmail.c:338 #, fuzzy msgid "Use dialog for entering email address of recipients" msgstr "使用对话框输入收件人电子邮件地址" -#: ../geanysendmail/src/geanysendmail.c:356 +#: ../geanysendmail/src/geanysendmail.c:360 msgid "Send file by mail" msgstr "用邮件发送文件" #. Build up menu entry -#: ../geanysendmail/src/geanysendmail.c:379 +#: ../geanysendmail/src/geanysendmail.c:383 #, fuzzy msgid "_Mail document" msgstr "将文档作为邮件发送" -#: ../geanysendmail/src/geanysendmail.c:382 +#: ../geanysendmail/src/geanysendmail.c:386 msgid "" "Sends the opened file as unzipped attachment by any mailer from your $PATH" msgstr "将打开的文件作为未压缩的附件通过您 $PATH 中的邮件程序发送" @@ -4250,89 +4360,108 @@ msgid "geanyvc: s_spawn_sync error: %s" msgstr "geanyvc：s_spawn_sync 错误：%s" -#: ../geanyvc/src/geanyvc.c:609 ../geanyvc/src/geanyvc.c:620 +#: ../geanyvc/src/geanyvc.c:561 +#, c-format +msgid "File %s: action %s executed via %s." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:614 ../geanyvc/src/geanyvc.c:625 #, c-format msgid "geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'" msgstr "geanyvc：vcdiff_file_activated：无法重命名“%s”为“%s”" -#: ../geanyvc/src/geanyvc.c:646 ../geanyvc/src/geanyvc.c:696 +#: ../geanyvc/src/geanyvc.c:651 ../geanyvc/src/geanyvc.c:701 msgid "No changes were made." msgstr "没有作出任何修改。" -#: ../geanyvc/src/geanyvc.c:723 +#: ../geanyvc/src/geanyvc.c:728 #, fuzzy msgid "No history available" msgstr "没有可用的历史" -#: ../geanyvc/src/geanyvc.c:916 ../geanyvc/src/geanyvc.c:924 +#: ../geanyvc/src/geanyvc.c:921 ../geanyvc/src/geanyvc.c:929 #, c-format msgid "Do you really want to revert: %s?" msgstr "您真的想恢复：%s？" -#: ../geanyvc/src/geanyvc.c:932 +#: ../geanyvc/src/geanyvc.c:937 #, c-format msgid "Do you really want to add: %s?" msgstr "您真的想添加：%s？" -#: ../geanyvc/src/geanyvc.c:939 +#: ../geanyvc/src/geanyvc.c:944 #, c-format msgid "Do you really want to remove: %s?" msgstr "您真的想移除：%s？" -#: ../geanyvc/src/geanyvc.c:962 +#: ../geanyvc/src/geanyvc.c:967 msgid "Do you really want to update?" msgstr "您真的想更新吗？" -#: ../geanyvc/src/geanyvc.c:1225 +#: ../geanyvc/src/geanyvc.c:1094 +msgid "" +"The resulting differences cannot be displayed because the changes are too " +"big to display here and would slow down the UI significantly.\n" +"\n" +"To view the differences, cancel this dialog and open the differences in " +"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)." +msgstr "" + +#: ../geanyvc/src/geanyvc.c:1243 msgid "Commit Y/N" msgstr "提交 Y/N" -#: ../geanyvc/src/geanyvc.c:1235 +#: ../geanyvc/src/geanyvc.c:1253 msgid "Status" msgstr "状态" -#: ../geanyvc/src/geanyvc.c:1242 +#: ../geanyvc/src/geanyvc.c:1260 msgid "Path" msgstr "路径" -#: ../geanyvc/src/geanyvc.c:1330 +#: ../geanyvc/src/geanyvc.c:1324 +#, c-format +msgid "Line: %d Column: %d" +msgstr "" + +#: ../geanyvc/src/geanyvc.c:1370 msgid "Commit" msgstr "提交" -#: ../geanyvc/src/geanyvc.c:1372 +#: ../geanyvc/src/geanyvc.c:1412 msgid "_De-/select all files" msgstr "全不选/全选所有文件(_D)" -#: ../geanyvc/src/geanyvc.c:1413 +#: ../geanyvc/src/geanyvc.c:1456 msgid "Commit message:" msgstr "提交信息：" -#: ../geanyvc/src/geanyvc.c:1426 +#: ../geanyvc/src/geanyvc.c:1475 #, fuzzy msgid "C_ommit" msgstr "提交" -#: ../geanyvc/src/geanyvc.c:1500 +#: ../geanyvc/src/geanyvc.c:1556 msgid "Nothing to commit." msgstr "没有可以提交的。" -#: ../geanyvc/src/geanyvc.c:1546 +#: ../geanyvc/src/geanyvc.c:1602 #, c-format msgid "Error initializing spell checking: %s" msgstr "初始化拼写检查时出现错误：%s" -#: ../geanyvc/src/geanyvc.c:1558 +#: ../geanyvc/src/geanyvc.c:1614 #, c-format msgid "" "Error while setting up language for spellchecking. Please check " "configuration. Error message was: %s" msgstr "为拼写检查设置语言时出现错误。请检查设置。错误信息：%s" -#: ../geanyvc/src/geanyvc.c:1834 +#: ../geanyvc/src/geanyvc.c:1890 msgid "Set Changed-flag for document tabs created by the plugin" msgstr "为插件创建的文档页设置已更改标记" -#: ../geanyvc/src/geanyvc.c:1837 +#: ../geanyvc/src/geanyvc.c:1893 msgid "" "If this option is activated, every new by the VC-plugin created document tab " "will be marked as changed. Even this option is useful in some cases, it " @@ -4341,255 +4470,255 @@ "如果开启这个选项，每个 VC 插件创建的文档页将被标记为已更改。某些情况下这个选" "项有用，但它也许也会带来许多烦人的“您要保存吗”对话框。" -#: ../geanyvc/src/geanyvc.c:1845 +#: ../geanyvc/src/geanyvc.c:1901 msgid "Confirm adding new files to a VCS" msgstr "确认添加新文件到VCS" -#: ../geanyvc/src/geanyvc.c:1848 +#: ../geanyvc/src/geanyvc.c:1904 msgid "Shows a confirmation dialog on adding a new (created) file to VCS." msgstr "添加新文件到VCS时显示一个确认对话框。" -#: ../geanyvc/src/geanyvc.c:1854 +#: ../geanyvc/src/geanyvc.c:1910 msgid "Maximize commit dialog" msgstr "最大化提交对话框" -#: ../geanyvc/src/geanyvc.c:1855 +#: ../geanyvc/src/geanyvc.c:1911 msgid "Show commit dialog maximize." msgstr "最大化显示提交对话框。" -#: ../geanyvc/src/geanyvc.c:1861 +#: ../geanyvc/src/geanyvc.c:1917 msgid "Use external diff viewer" msgstr "使用外部差异查看器" -#: ../geanyvc/src/geanyvc.c:1863 +#: ../geanyvc/src/geanyvc.c:1919 msgid "Use external diff viewer for file diff." msgstr "使用外部差异查看器查看文件差异。" -#: ../geanyvc/src/geanyvc.c:1869 +#: ../geanyvc/src/geanyvc.c:1925 msgid "Show VC entries at editor menu" msgstr "在编辑器菜单中显示VC条目" -#: ../geanyvc/src/geanyvc.c:1871 +#: ../geanyvc/src/geanyvc.c:1927 msgid "Show entries for VC functions inside editor menu" msgstr "在编辑器菜单中显示VC条目。" -#: ../geanyvc/src/geanyvc.c:1876 +#: ../geanyvc/src/geanyvc.c:1932 msgid "Attach menu to menubar" msgstr "" -#: ../geanyvc/src/geanyvc.c:1878 +#: ../geanyvc/src/geanyvc.c:1934 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " "directly inside Geany's menubar.Will take in account after next start of " "GeanyVC" msgstr "" -#: ../geanyvc/src/geanyvc.c:1886 +#: ../geanyvc/src/geanyvc.c:1942 msgid "Enable CVS" msgstr "启用 CVS" -#: ../geanyvc/src/geanyvc.c:1891 +#: ../geanyvc/src/geanyvc.c:1947 msgid "Enable GIT" msgstr "启用 GIT" -#: ../geanyvc/src/geanyvc.c:1896 +#: ../geanyvc/src/geanyvc.c:1952 msgid "Enable SVN" msgstr "启用 SVN" -#: ../geanyvc/src/geanyvc.c:1901 +#: ../geanyvc/src/geanyvc.c:1957 msgid "Enable SVK" msgstr "启用 SVK" -#: ../geanyvc/src/geanyvc.c:1906 +#: ../geanyvc/src/geanyvc.c:1962 msgid "Enable Bazaar" msgstr "启用 Bazaar" -#: ../geanyvc/src/geanyvc.c:1911 +#: ../geanyvc/src/geanyvc.c:1967 msgid "Enable Mercurial" msgstr "启用 Mercurial" -#: ../geanyvc/src/geanyvc.c:1917 +#: ../geanyvc/src/geanyvc.c:1973 msgid "Spellcheck language" msgstr "拼写检查语言" -#: ../geanyvc/src/geanyvc.c:2008 +#: ../geanyvc/src/geanyvc.c:2064 msgid "_VC file Actions" msgstr "_VC 文件操作" #. Diff of current file #. Diff of the current dir #. Complete diff of base directory -#: ../geanyvc/src/geanyvc.c:2014 ../geanyvc/src/geanyvc.c:2091 -#: ../geanyvc/src/geanyvc.c:2131 +#: ../geanyvc/src/geanyvc.c:2070 ../geanyvc/src/geanyvc.c:2147 +#: ../geanyvc/src/geanyvc.c:2187 msgid "_Diff" msgstr "差异(_D)" -#: ../geanyvc/src/geanyvc.c:2017 +#: ../geanyvc/src/geanyvc.c:2073 msgid "Make a diff from the current active file" msgstr "从当前活动的文件生成差异" #. Revert current file #. Revert current dir #. Revert everything -#: ../geanyvc/src/geanyvc.c:2022 ../geanyvc/src/geanyvc.c:2100 -#: ../geanyvc/src/geanyvc.c:2139 +#: ../geanyvc/src/geanyvc.c:2078 ../geanyvc/src/geanyvc.c:2156 +#: ../geanyvc/src/geanyvc.c:2195 msgid "_Revert" msgstr "恢复(_R)" -#: ../geanyvc/src/geanyvc.c:2025 +#: ../geanyvc/src/geanyvc.c:2081 msgid "Restore pristine working copy file (undo local edits)." msgstr "还原原始的工作复制文件（撤销本地编辑）。" #. Blame for current file -#: ../geanyvc/src/geanyvc.c:2034 +#: ../geanyvc/src/geanyvc.c:2090 msgid "_Blame" msgstr "" -#: ../geanyvc/src/geanyvc.c:2037 +#: ../geanyvc/src/geanyvc.c:2093 msgid "Shows the changes made at one file per revision and author." msgstr "显示文件每个作者和每次修订的更改。" #. History/log of current file #. History/log of the current dir #. Complete History/Log of base directory -#: ../geanyvc/src/geanyvc.c:2044 ../geanyvc/src/geanyvc.c:2110 -#: ../geanyvc/src/geanyvc.c:2151 +#: ../geanyvc/src/geanyvc.c:2100 ../geanyvc/src/geanyvc.c:2166 +#: ../geanyvc/src/geanyvc.c:2207 msgid "_History (log)" msgstr "历史（日志）(_H)" -#: ../geanyvc/src/geanyvc.c:2047 +#: ../geanyvc/src/geanyvc.c:2103 msgid "Shows the log of the current file" msgstr "显示当前文件日志" #. base version of the current file -#: ../geanyvc/src/geanyvc.c:2052 +#: ../geanyvc/src/geanyvc.c:2108 msgid "_Original" msgstr "原始(_O)" -#: ../geanyvc/src/geanyvc.c:2055 +#: ../geanyvc/src/geanyvc.c:2111 #, fuzzy msgid "Shows the original of the current file" msgstr "显示当前文件的最初版本" #. add current file -#: ../geanyvc/src/geanyvc.c:2063 +#: ../geanyvc/src/geanyvc.c:2119 msgid "_Add to Version Control" msgstr "添加到版本控制(_A)" -#: ../geanyvc/src/geanyvc.c:2065 +#: ../geanyvc/src/geanyvc.c:2121 msgid "Add file to repository." msgstr "添加文件到库。" #. remove current file -#: ../geanyvc/src/geanyvc.c:2071 +#: ../geanyvc/src/geanyvc.c:2127 msgid "_Remove from Version Control" msgstr "从版本控制中移除(_R)" -#: ../geanyvc/src/geanyvc.c:2073 +#: ../geanyvc/src/geanyvc.c:2129 msgid "Remove file from repository." msgstr "从库中移除文件。" -#: ../geanyvc/src/geanyvc.c:2088 +#: ../geanyvc/src/geanyvc.c:2144 msgid "_Directory" msgstr "目录(_D)" -#: ../geanyvc/src/geanyvc.c:2094 +#: ../geanyvc/src/geanyvc.c:2150 msgid "Make a diff from the directory of the current active file" msgstr "从文件夹生成与当前活动文件之间的差异" -#: ../geanyvc/src/geanyvc.c:2103 +#: ../geanyvc/src/geanyvc.c:2159 msgid "Restore original files in the current folder (undo local edits)." msgstr "还原当前文件夹中的原始文件（撤销本地编辑）。" -#: ../geanyvc/src/geanyvc.c:2113 +#: ../geanyvc/src/geanyvc.c:2169 msgid "Shows the log of the current directory" msgstr "显示当前目录日志" -#: ../geanyvc/src/geanyvc.c:2127 +#: ../geanyvc/src/geanyvc.c:2183 msgid "_Base Directory" msgstr "根目录(_B)" -#: ../geanyvc/src/geanyvc.c:2133 +#: ../geanyvc/src/geanyvc.c:2189 msgid "Make a diff from the top VC directory" msgstr "从顶层VC目录生成差异" -#: ../geanyvc/src/geanyvc.c:2141 +#: ../geanyvc/src/geanyvc.c:2197 msgid "Revert any local edits." msgstr "恢复所有本地编辑。" -#: ../geanyvc/src/geanyvc.c:2154 +#: ../geanyvc/src/geanyvc.c:2210 msgid "Shows the log of the top VC directory" msgstr "显示顶层VC目录差异" -#: ../geanyvc/src/geanyvc.c:2180 +#: ../geanyvc/src/geanyvc.c:2236 msgid "VC _Commit" msgstr "VC 提交(_C)" -#: ../geanyvc/src/geanyvc.c:2215 +#: ../geanyvc/src/geanyvc.c:2271 msgid "Show diff of file" msgstr "显示文件差异" -#: ../geanyvc/src/geanyvc.c:2217 +#: ../geanyvc/src/geanyvc.c:2273 msgid "Show diff of directory" msgstr "显示目录差异" -#: ../geanyvc/src/geanyvc.c:2219 +#: ../geanyvc/src/geanyvc.c:2275 msgid "Show diff of basedir" msgstr "显示根目录差异" -#: ../geanyvc/src/geanyvc.c:2222 +#: ../geanyvc/src/geanyvc.c:2278 msgid "Commit changes" msgstr "提交更改" -#: ../geanyvc/src/geanyvc.c:2224 +#: ../geanyvc/src/geanyvc.c:2280 msgid "Show status" msgstr "显示状态" -#: ../geanyvc/src/geanyvc.c:2226 +#: ../geanyvc/src/geanyvc.c:2282 msgid "Revert single file" msgstr "恢复单个文件" -#: ../geanyvc/src/geanyvc.c:2228 +#: ../geanyvc/src/geanyvc.c:2284 msgid "Revert directory" msgstr "恢复目录" -#: ../geanyvc/src/geanyvc.c:2230 +#: ../geanyvc/src/geanyvc.c:2286 msgid "Revert base directory" msgstr "恢复根目录" -#: ../geanyvc/src/geanyvc.c:2232 +#: ../geanyvc/src/geanyvc.c:2288 msgid "Update file" msgstr "更新文件" -#: ../geanyvc/src/geanyvc.c:2260 +#: ../geanyvc/src/geanyvc.c:2316 msgid "_VC" msgstr "_VC" -#: ../geanyvc/src/geanyvc.c:2266 +#: ../geanyvc/src/geanyvc.c:2322 #, fuzzy msgid "_Version Control" msgstr "添加到版本控制(_A)" #. Status of basedir -#: ../geanyvc/src/geanyvc.c:2288 +#: ../geanyvc/src/geanyvc.c:2344 msgid "_Status" msgstr "状态(_S)" -#: ../geanyvc/src/geanyvc.c:2290 +#: ../geanyvc/src/geanyvc.c:2346 msgid "Show status." msgstr "显示状态。" -#: ../geanyvc/src/geanyvc.c:2297 +#: ../geanyvc/src/geanyvc.c:2353 #, fuzzy msgid "Update from remote repository." msgstr "从远程库更新。" #. Commit all changes -#: ../geanyvc/src/geanyvc.c:2302 +#: ../geanyvc/src/geanyvc.c:2358 msgid "_Commit" msgstr "提交(_C)" -#: ../geanyvc/src/geanyvc.c:2304 +#: ../geanyvc/src/geanyvc.c:2360 msgid "Commit changes." msgstr "提交更改。" @@ -4737,101 +4866,256 @@ "tab." msgstr "" -#: ../gproject/src/gproject-sidebar.c:81 -#: ../gproject/src/gproject-sidebar.c:792 +#: ../gproject/src/gproject-sidebar.c:90 +#: ../gproject/src/gproject-sidebar.c:838 #, fuzzy msgid "Find File" msgstr "添加文件" -#: ../gproject/src/gproject-sidebar.c:108 +#: ../gproject/src/gproject-sidebar.c:117 msgid "Search inside:" msgstr "" -#: ../gproject/src/gproject-sidebar.c:120 +#: ../gproject/src/gproject-sidebar.c:129 msgid "C_ase sensitive" msgstr "" -#: ../gproject/src/gproject-sidebar.c:123 +#: ../gproject/src/gproject-sidebar.c:132 msgid "Search in full path" msgstr "" -#: ../gproject/src/gproject-sidebar.c:702 +#: ../gproject/src/gproject-sidebar.c:745 msgid "Reload all" msgstr "" -#: ../gproject/src/gproject-sidebar.c:711 -#: ../treebrowser/src/treebrowser.c:1282 +#: ../gproject/src/gproject-sidebar.c:754 +#: ../treebrowser/src/treebrowser.c:1281 msgid "Expand all" msgstr "" -#: ../gproject/src/gproject-sidebar.c:717 -#: ../treebrowser/src/treebrowser.c:1286 +#: ../gproject/src/gproject-sidebar.c:761 +#: ../treebrowser/src/treebrowser.c:1285 #, fuzzy msgid "Collapse all" msgstr "关闭全部(_L)" -#: ../gproject/src/gproject-sidebar.c:726 +#: ../gproject/src/gproject-sidebar.c:771 msgid "Follow active editor" msgstr "" -#: ../gproject/src/gproject-sidebar.c:774 +#: ../gproject/src/gproject-sidebar.c:820 msgid "Expand All" msgstr "" -#: ../gproject/src/gproject-sidebar.c:783 -#: ../treebrowser/src/treebrowser.c:1234 +#: ../gproject/src/gproject-sidebar.c:829 #, fuzzy msgid "Find in Files" msgstr "在项目中查找" #. POSITION OF VIEW -#: ../markdown/src/conf.c:570 +#: ../markdown/src/conf.c:567 #, fuzzy msgid "Position:" msgstr "Edition" -#: ../markdown/src/conf.c:576 +#: ../markdown/src/conf.c:573 #, fuzzy msgid "Sidebar" msgstr "隐藏侧栏(_I)" -#: ../markdown/src/conf.c:584 +#: ../markdown/src/conf.c:581 msgid "Message Window" msgstr "" -#: ../markdown/src/conf.c:598 +#: ../markdown/src/conf.c:595 msgid "Font:" msgstr "" -#: ../markdown/src/conf.c:616 +#: ../markdown/src/conf.c:612 msgid "Code Font:" msgstr "" -#: ../markdown/src/conf.c:634 +#: ../markdown/src/conf.c:629 msgid "BG Color:" msgstr "" -#: ../markdown/src/conf.c:651 +#: ../markdown/src/conf.c:645 msgid "FG Color:" msgstr "" -#: ../markdown/src/conf.c:670 +#: ../markdown/src/conf.c:663 #, fuzzy msgid "Select Template File" msgstr "选择字体" -#: ../markdown/src/plugin.c:33 +#: ../markdown/src/plugin.c:35 msgid "Real-time Markdown preview" msgstr "" -#: ../markdown/src/plugin.c:49 +#: ../markdown/src/plugin.c:51 msgid "Markdown Preview" msgstr "" -#: ../markdown/src/plugin.c:160 +#: ../markdown/src/plugin.c:162 msgid "The current document does not have a Markdown filetype." msgstr "" +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:35 +msgid "Pair Tag Highlighter" +msgstr "" + +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:36 +msgid "Finds and highlights matching opening/closing HTML tag" +msgstr "" + +#: ../pohelper/data/menus.ui.h:1 +msgid "_Translation Helper" +msgstr "" + +#: ../pohelper/data/menus.ui.h:2 +msgid "_Previous String" +msgstr "" + +#: ../pohelper/data/menus.ui.h:3 ../pohelper/src/gph-plugin.c:1031 +#, fuzzy +msgid "Go to previous string" +msgstr "返回上一个对话框。" + +#: ../pohelper/data/menus.ui.h:4 +msgid "_Next String" +msgstr "" + +#: ../pohelper/data/menus.ui.h:5 ../pohelper/src/gph-plugin.c:1034 +#, fuzzy +msgid "Go to next string" +msgstr "单步进入下一行。" + +#: ../pohelper/data/menus.ui.h:6 +msgid "Pre_vious Untranslated" +msgstr "" + +#: ../pohelper/data/menus.ui.h:7 ../pohelper/src/gph-plugin.c:1037 +msgid "Go to previous untranslated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:8 +msgid "Next _Untranslated" +msgstr "" + +#: ../pohelper/data/menus.ui.h:9 ../pohelper/src/gph-plugin.c:1040 +msgid "Go to next untranslated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:10 +msgid "Previous Fu_zzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:11 ../pohelper/src/gph-plugin.c:1043 +msgid "Go to previous fuzzily translated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:12 +msgid "Next _Fuzzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:13 ../pohelper/src/gph-plugin.c:1046 +msgid "Go to next fuzzily translated string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:14 +msgid "Previous Untranslated or Fuzz_y" +msgstr "" + +#: ../pohelper/data/menus.ui.h:15 ../pohelper/src/gph-plugin.c:1049 +msgid "Go to previous untranslated or fuzzy string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:16 +msgid "Next Untranslated _or Fuzzy" +msgstr "" + +#: ../pohelper/data/menus.ui.h:17 ../pohelper/src/gph-plugin.c:1053 +msgid "Go to next untranslated or fuzzy string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:18 ../pohelper/src/gph-plugin.c:1064 +#, fuzzy +msgid "Toggle current translation fuzziness" +msgstr "文件交互" + +#: ../pohelper/data/menus.ui.h:19 +msgid "_Toggle Fuzziness" +msgstr "" + +#: ../pohelper/data/menus.ui.h:20 +msgid "Paste _Message as Translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:21 +msgid "Paste the original untranslated string to the translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:22 ../pohelper/src/gph-plugin.c:1061 +msgid "Reflow the current translation string" +msgstr "" + +#: ../pohelper/data/menus.ui.h:23 +msgid "_Reflow Translation" +msgstr "" + +#: ../pohelper/data/menus.ui.h:24 +msgid "" +"Whether to update the translation headers (author, revision date, ...) upon " +"file save" +msgstr "" + +#: ../pohelper/data/menus.ui.h:25 +msgid "Update _Headers Upon Save" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:41 +msgid "Translation Helper" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:42 +msgid "Improves support for GetText translation files." +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1057 +msgid "Paste original untranslated string to translation" +msgstr "" + +#: ../pohelper/src/gph-plugin.c:1099 +#, fuzzy, c-format +msgid "Failed to load configuration file: %s" +msgstr "显示当前文件日志" + +#: ../pohelper/src/gph-plugin.c:1124 +#, fuzzy, c-format +msgid "Failed to create configuration directory \"%s\": %s" +msgstr "取回 GDB 工作路径设置失败" + +#: ../pohelper/src/gph-plugin.c:1127 +#, fuzzy, c-format +msgid "Failed to save configuration file: %s" +msgstr "显示当前文件日志" + +#: ../pohelper/src/gph-plugin.c:1182 +#, fuzzy, c-format +msgid "" +"Failed to load UI definition, please check your installation. The error was: " +"%s" +msgstr "" +"%s 插件未能正确加载。\n" +"请检查您的安装。" + +#: ../pohelper/src/gph-plugin.c:1222 +#, c-format +msgid "" +"Cannot find widget \"%s\" in the UI definition, please check your " +"installation." +msgstr "" + #: ../pretty-printer/src/PluginEntry.c:37 msgid "XML PrettyPrinter" msgstr "" @@ -5192,279 +5476,351 @@ msgstr "" #: ../scope/data/scope.glade.h:64 -msgid "_Evaluate/Modify" +msgid "_Raw" msgstr "" #: ../scope/data/scope.glade.h:65 -msgid "_Watch Expression" +msgid "_Evaluate/Modify" msgstr "" #: ../scope/data/scope.glade.h:66 -#, fuzzy -msgid "_Inspect Variable" -msgstr "环境" +msgid "_Watch Expression" +msgstr "" #: ../scope/data/scope.glade.h:67 #, fuzzy -msgid "Program Terminal" -msgstr "在终端中运行" +msgid "_Inspect Variable" +msgstr "环境" #: ../scope/data/scope.glade.h:68 msgid "Threads" msgstr "" -#: ../scope/data/scope.glade.h:70 +#: ../scope/data/scope.glade.h:69 #, fuzzy msgid "Stack" msgstr "堆栈(_K)" -#: ../scope/data/scope.glade.h:71 +#: ../scope/data/scope.glade.h:70 msgid "Locals" msgstr "" -#: ../scope/data/scope.glade.h:72 +#: ../scope/data/scope.glade.h:71 #, fuzzy msgid "Watches" msgstr "观察点" -#: ../scope/data/scope.glade.h:73 +#: ../scope/data/scope.glade.h:72 msgid "Memory" msgstr "" -#: ../scope/data/scope.glade.h:74 -#, fuzzy -msgid "Debug Console" -msgstr "控制台：" - -#: ../scope/data/scope.glade.h:75 +#: ../scope/data/scope.glade.h:73 #, fuzzy msgid "Enter gdb command:" msgstr "插入环境" -#: ../scope/data/scope.glade.h:76 +#: ../scope/data/scope.glade.h:74 #, fuzzy msgid "Convert _UTF-8 to locale" msgstr "将选中部分左对齐" -#: ../scope/data/scope.glade.h:77 +#: ../scope/data/scope.glade.h:75 msgid "_Thread" msgstr "" -#: ../scope/data/scope.glade.h:78 +#: ../scope/data/scope.glade.h:76 msgid "_Group" msgstr "" -#: ../scope/data/scope.glade.h:79 +#: ../scope/data/scope.glade.h:77 #, fuzzy msgid "_Frame" msgstr "帧信息" -#: ../scope/data/scope.glade.h:80 +#: ../scope/data/scope.glade.h:78 #, fuzzy msgid "Setup Program" msgstr "无程序" -#: ../scope/data/scope.glade.h:81 +#: ../scope/data/scope.glade.h:79 msgid "_Executable:" msgstr "" -#: ../scope/data/scope.glade.h:82 +#: ../scope/data/scope.glade.h:80 msgid "_Arguments:" msgstr "" -#: ../scope/data/scope.glade.h:83 +#: ../scope/data/scope.glade.h:81 #, fuzzy msgid "En_vironment:" msgstr "环境：" -#: ../scope/data/scope.glade.h:84 +#: ../scope/data/scope.glade.h:82 msgid "_Working dir:" msgstr "" -#: ../scope/data/scope.glade.h:85 +#: ../scope/data/scope.glade.h:83 #, fuzzy msgid "_Load script:" msgstr "_Lua 脚本" -#: ../scope/data/scope.glade.h:86 +#: ../scope/data/scope.glade.h:84 msgid "Auto _run program/exit gdb" msgstr "" -#: ../scope/data/scope.glade.h:87 +#: ../scope/data/scope.glade.h:85 msgid "_Non-stop mode" msgstr "" -#: ../scope/data/scope.glade.h:88 -msgid "_Temporary breakpoint at:" +#: ../scope/data/scope.glade.h:86 +msgid "_Temporary breakpoint on load at:" msgstr "" -#: ../scope/data/scope.glade.h:89 -msgid "_Delete all breakpoints, watches and inspects" +#: ../scope/data/scope.glade.h:87 +msgid "_Delete all breakpoints, watches, inspects and registers" msgstr "" -#: ../scope/data/scope.glade.h:90 ../scope/src/prefs.c:337 +#: ../scope/data/scope.glade.h:88 ../scope/src/scope.c:522 #, fuzzy msgid "Program" msgstr "无程序" -#: ../scope/data/scope.glade.h:91 +#: ../scope/data/scope.glade.h:89 #, fuzzy msgid "Open on" msgstr "打开URI" -#: ../scope/data/scope.glade.h:92 +#: ../scope/data/scope.glade.h:90 #, fuzzy msgid "g_db load" msgstr "卸载(_U)" -#: ../scope/data/scope.glade.h:93 +#: ../scope/data/scope.glade.h:91 msgid "p_rogram start" msgstr "" -#: ../scope/data/scope.glade.h:94 +#: ../scope/data/scope.glade.h:92 #, fuzzy msgid "Update all _views" msgstr "更新文件" -#: ../scope/data/scope.glade.h:95 +#: ../scope/data/scope.glade.h:93 msgid "Panel" msgstr "" -#: ../scope/data/scope.glade.h:96 +#: ../scope/data/scope.glade.h:94 msgid "Default 8-bit text mode:" msgstr "" -#: ../scope/data/scope.glade.h:97 +#: ../scope/data/scope.glade.h:95 msgid "_7-bit \\nnn" msgstr "" -#: ../scope/data/scope.glade.h:98 +#: ../scope/data/scope.glade.h:96 msgid "Display" msgstr "" -#: ../scope/data/scope.glade.h:99 +#: ../scope/data/scope.glade.h:97 #, fuzzy msgid "_member" msgstr "Number" -#: ../scope/data/scope.glade.h:100 +#: ../scope/data/scope.glade.h:98 #, fuzzy msgid "and" msgstr "直斜体" -#: ../scope/data/scope.glade.h:101 +#: ../scope/data/scope.glade.h:99 #, fuzzy msgid "_argument" msgstr "将文档作为邮件发送" -#: ../scope/data/scope.glade.h:102 +#: ../scope/data/scope.glade.h:100 #, fuzzy msgid "names" msgstr "文件名：" -#: ../scope/data/scope.glade.h:103 +#: ../scope/data/scope.glade.h:101 msgid "Values" msgstr "" -#: ../scope/data/scope.glade.h:104 +#: ../scope/data/scope.glade.h:102 msgid "E_xpand on apply" msgstr "" -#: ../scope/data/scope.glade.h:105 +#: ../scope/data/scope.glade.h:103 msgid "S_how" msgstr "" -#: ../scope/data/scope.glade.h:106 +#: ../scope/data/scope.glade.h:104 msgid "children" msgstr "" -#: ../scope/data/scope.glade.h:107 +#: ../scope/data/scope.glade.h:105 msgid "Inspect" msgstr "" -#: ../scope/data/scope.glade.h:108 +#: ../scope/data/scope.glade.h:106 msgid "Show =li_brary messages" msgstr "" -#: ../scope/data/scope.glade.h:109 +#: ../scope/data/scope.glade.h:107 #, fuzzy msgid "Show _tooltips" msgstr "显示工具提示。" -#: ../scope/data/scope.glade.h:110 +#: ../scope/data/scope.glade.h:108 msgid "Others" msgstr "" -#: ../scope/data/scope.glade.h:111 +#: ../scope/data/scope.glade.h:109 #, fuzzy msgid "Options" msgstr "选项(_O)" -#: ../scope/data/scope.glade.h:112 +#: ../scope/data/scope.glade.h:110 #, fuzzy msgid "_Import" msgstr "报告" -#: ../scope/data/scope.glade.h:113 +#: ../scope/data/scope.glade.h:111 msgid "Enter assignment expression:" msgstr "" -#: ../scope/data/scope.glade.h:114 +#: ../scope/data/scope.glade.h:112 msgid "Inspect" msgstr "" -#: ../scope/data/scope.glade.h:115 +#: ../scope/data/scope.glade.h:113 #, fuzzy msgid "Object:" msgstr "目标信息" -#: ../scope/data/scope.glade.h:117 +#: ../scope/data/scope.glade.h:115 msgid "-" msgstr "" -#: ../scope/data/scope.glade.h:118 +#: ../scope/data/scope.glade.h:116 #, fuzzy msgid "Frame:" msgstr "名称：" -#: ../scope/data/scope.glade.h:119 +#: ../scope/data/scope.glade.h:117 msgid "@" msgstr "" -#: ../scope/data/scope.glade.h:120 +#: ../scope/data/scope.glade.h:118 msgid "_Apply on run" msgstr "" -#: ../scope/data/scope.glade.h:121 +#: ../scope/data/scope.glade.h:119 msgid "Expand" msgstr "" -#: ../scope/data/scope.glade.h:122 +#: ../scope/data/scope.glade.h:120 #, fuzzy msgid "Start:" msgstr "状态(_S)" -#: ../scope/data/scope.glade.h:123 +#: ../scope/data/scope.glade.h:121 msgid "Count:" msgstr "" -#: ../scope/data/scope.glade.h:124 +#: ../scope/data/scope.glade.h:122 msgid "_Expand on apply" msgstr "" -#: ../scope/src/break.c:947 +#: ../scope/data/scope.glade.h:123 ../scope/src/scope.c:522 +#, fuzzy +msgid "Program Terminal" +msgstr "在终端中运行" + +#: ../scope/data/scope.glade.h:125 +msgid "Registers" +msgstr "" + +#: ../scope/src/break.c:97 +#, fuzzy +msgid "breakpoint" +msgstr "断点" + +#: ../scope/src/break.c:98 +#, fuzzy +msgid "hardware breakpoint" +msgstr "编辑断点" + +#: ../scope/src/break.c:99 +#, fuzzy +msgid "tracepoint" +msgstr "观察点" + +#: ../scope/src/break.c:100 +#, fuzzy +msgid "fast tracepoint" +msgstr "观察点" + +#: ../scope/src/break.c:101 +#, fuzzy +msgid "write watchpoint" +msgstr "编辑观察点" + +#: ../scope/src/break.c:104 +#, fuzzy +msgid "access watchpoint" +msgstr "观察点" + +#: ../scope/src/break.c:106 +#, fuzzy +msgid "read watchpoint" +msgstr "编辑观察点" + +#: ../scope/src/break.c:108 +#, fuzzy +msgid "catchpoint" +msgstr "观察点" + +#: ../scope/src/break.c:135 ../scope/src/break.c:139 +msgid "CLI" +msgstr "" + +#: ../scope/src/break.c:136 +msgid "unsupported MI" +msgstr "" + +#: ../scope/src/break.c:141 +#, fuzzy +msgid "on load" +msgstr "卸载(_U)" + +#: ../scope/src/break.c:142 +#, fuzzy +msgid "Run to Cursor" +msgstr "运行到位置" + +#: ../scope/src/break.c:1013 #, c-format msgid "" "There are two or more breakpoints at %s:%d.\n" +"\n" "Use the breakpoint list to remove the exact one." msgstr "" -#: ../scope/src/break.c:1200 +#: ../scope/src/break.c:1252 +#, c-format +msgid ", %s" +msgstr "" + +#: ../scope/src/break.c:1278 +#, c-format +msgid "func %s" +msgstr "" + +#: ../scope/src/break.c:1309 #, fuzzy msgid "Add Breakpoint" msgstr "增加断点" -#: ../scope/src/break.c:1215 +#: ../scope/src/break.c:1324 #, fuzzy msgid "Add Watchpoint" msgstr "增加观察点" @@ -5478,7 +5834,8 @@ msgid "Enter char # (0..255):" msgstr "" -#: ../scope/src/conterm.c:466 ../scope/src/scope.c:502 +#: ../scope/src/conterm.c:509 ../scope/src/scope.c:550 +#: ../scope/src/scope.c:551 #, fuzzy, c-format msgid "Scope: %s." msgstr "关闭全部(_L)" @@ -5498,63 +5855,64 @@ msgid "Program terminated." msgstr "已终止" -#: ../scope/src/debug.c:468 +#: ../scope/src/debug.c:469 msgid "No breakpoints. Hanging." msgstr "" -#: ../scope/src/debug.c:596 ../scope/src/thread.c:97 +#: ../scope/src/debug.c:598 ../scope/src/thread.c:92 #, c-format msgid "%s." msgstr "" -#: ../scope/src/inspect.c:77 +#: ../scope/src/inspect.c:66 #, fuzzy msgid "..." msgstr "更多..." -#: ../scope/src/inspect.c:324 +#: ../scope/src/inspect.c:339 msgid "invalid data" msgstr "" -#: ../scope/src/inspect.c:356 +#: ../scope/src/inspect.c:371 msgid "no children in range" msgstr "" -#: ../scope/src/inspect.c:440 +#: ../scope/src/inspect.c:454 #, fuzzy msgid "out of scope" msgstr "观察点 #%s 越界" -#: ../scope/src/inspect.c:587 +#: ../scope/src/inspect.c:627 msgid "Duplicate inspect variable name." msgstr "" -#: ../scope/src/memory.c:299 +#: ../scope/src/memory.c:292 msgid "Read Memory" msgstr "" -#: ../scope/src/memory.c:408 -msgid "Scope: pointer size > 8, Data disabled." +#: ../scope/src/memory.c:396 +#, c-format +msgid "Scope: pointer size > %d, Data disabled." msgstr "" -#: ../scope/src/menu.c:380 +#: ../scope/src/menu.c:375 msgid "Modify" msgstr "" -#: ../scope/src/menu.c:490 +#: ../scope/src/menu.c:481 msgid "Evaluate/modify" msgstr "" -#: ../scope/src/menu.c:491 +#: ../scope/src/menu.c:482 msgid "Watch expression" msgstr "" -#: ../scope/src/menu.c:492 +#: ../scope/src/menu.c:483 #, fuzzy msgid "Inspect variable" msgstr "本地变量" -#: ../scope/src/parse.c:416 +#: ../scope/src/parse.c:437 msgid "Undefined GDB error." msgstr "" @@ -5568,37 +5926,27 @@ msgid "Select File" msgstr "选择文件" -#: ../scope/src/prefs.c:338 -#, fuzzy -msgid "Breaks" -msgstr "断点" - -#: ../scope/src/prefs.c:339 -#, fuzzy -msgid "Console" -msgstr "控制台：" - -#: ../scope/src/prefs.c:347 ../scope/src/utils.c:570 +#: ../scope/src/prefs.c:294 ../scope/src/utils.c:438 #, c-format msgid "Scope: %s: %s." msgstr "" -#: ../scope/src/prefs.c:352 +#: ../scope/src/prefs.c:299 #, fuzzy msgid "Scope: created configuration file." msgstr "显示当前文件日志" -#: ../scope/src/program.c:231 +#: ../scope/src/program.c:251 #, c-format msgid "Loaded debug settings for %s." msgstr "" -#: ../scope/src/program.c:239 +#: ../scope/src/program.c:259 #, c-format msgid "Could not load debug settings file %s: %s." msgstr "" -#: ../scope/src/program.c:359 +#: ../scope/src/program.c:379 #, fuzzy, c-format msgid "" "%s: %s.\n" @@ -5606,15 +5954,15 @@ "Continue?" msgstr "继续(_C)" -#: ../scope/src/program.c:394 -msgid "Delete all breakpoints, watches and inspects?" +#: ../scope/src/program.c:415 +msgid "Delete all breakpoints, watches et cetera?" msgstr "" -#: ../scope/src/program.c:501 +#: ../scope/src/program.c:523 msgid "as _Name=value" msgstr "" -#: ../scope/src/program.c:502 +#: ../scope/src/program.c:524 msgid "as _Name = value" msgstr "" @@ -5624,169 +5972,184 @@ msgstr "调试器" #: ../scope/src/scope.c:35 -msgid "Simple GDB front-end." +msgid "Relatively simple GDB front-end." msgstr "" -#: ../scope/src/scope.c:63 +#: ../scope/src/scope.c:62 #, fuzzy msgid "Setup program" msgstr "无程序" -#: ../scope/src/scope.c:64 +#: ../scope/src/scope.c:63 #, fuzzy msgid "Run/continue" msgstr "继续(_C)" -#: ../scope/src/scope.c:66 +#: ../scope/src/scope.c:65 #, fuzzy msgid "Run to source" msgstr "运行到位置" -#: ../scope/src/scope.c:70 +#: ../scope/src/scope.c:69 #, fuzzy msgid "Terminate" msgstr "已终止" -#: ../scope/src/scope.c:71 +#: ../scope/src/scope.c:70 #, fuzzy msgid "Toggle breakpoint" msgstr "断点" -#: ../scope/src/scope.c:73 ../scope/src/scope.c:76 +#: ../scope/src/scope.c:72 ../scope/src/scope.c:75 #, fuzzy msgid "GDB command" msgstr "插入环境" -#: ../scope/src/scope.c:74 +#: ../scope/src/scope.c:73 #, fuzzy msgid "Show terminal" msgstr "在终端中运行" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Busy" msgstr "" -#: ../scope/src/scope.c:225 +#: ../scope/src/scope.c:226 msgid "Ready" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Hang" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 msgid "Assem" msgstr "" -#: ../scope/src/scope.c:226 +#: ../scope/src/scope.c:227 #, fuzzy msgid "Load" msgstr "加载(_L)" -#: ../scope/src/scope.c:394 +#: ../scope/src/scope.c:421 msgid "Build action activated. Terminate debugging?" msgstr "" -#: ../scope/src/thread.c:58 +#: ../scope/src/scope.c:524 +#, fuzzy +msgid "Breaks" +msgstr "断点" + +#: ../scope/src/scope.c:526 +#, fuzzy +msgid "Console" +msgstr "控制台：" + +#: ../scope/src/scope.c:526 +#, fuzzy +msgid "Debug Console" +msgstr "控制台：" + +#: ../scope/src/thread.c:48 #, c-format msgid "Thread group %s started." msgstr "" -#: ../scope/src/thread.c:76 +#: ../scope/src/thread.c:63 msgid "Thread group " msgstr "" -#: ../scope/src/thread.c:88 +#: ../scope/src/thread.c:83 msgid " exited" msgstr "" -#: ../scope/src/thread.c:91 +#: ../scope/src/thread.c:86 #, c-format msgid " with exit code %s" msgstr "" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 #, fuzzy msgid "Send Signal" msgstr "用邮件发送" -#: ../scope/src/thread.c:788 +#: ../scope/src/thread.c:748 msgid "Enter signal #:" msgstr "" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Terminate Process" msgstr "" -#: ../scope/src/thread.c:829 +#: ../scope/src/thread.c:788 msgid "Enter exit code:" msgstr "" -#: ../scope/src/thread.c:937 +#: ../scope/src/thread.c:891 #, fuzzy msgid "Running" msgstr "运行中" -#: ../scope/src/thread.c:938 +#: ../scope/src/thread.c:892 #, fuzzy msgid "Stopped" msgstr "已停止" -#: ../scope/src/utils.c:44 -#, c-format -msgid "%s: error %lu." -msgstr "" +#: ../scope/src/utils.c:45 +#, fuzzy, c-format +msgid "%s: %s" +msgstr "关闭全部(_L)" -#: ../scope/src/utils.c:358 +#: ../scope/src/utils.c:225 #, c-format msgid "Scope: error reading [%s]." msgstr "" -#: ../scope/src/views.c:505 +#: ../scope/src/views.c:526 msgid "…" msgstr "" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Send" msgstr "" -#: ../scope/src/views.c:528 +#: ../scope/src/views.c:549 msgid "_Busy" msgstr "" -#: ../scope/src/views.c:535 +#: ../scope/src/views.c:558 #, fuzzy msgid "GDB Command" msgstr "命令0：" -#: ../spellcheck/src/speller.c:94 +#: ../spellcheck/src/speller.c:180 msgid "Try: " msgstr "尝试：" -#: ../spellcheck/src/speller.c:173 +#: ../spellcheck/src/speller.c:252 msgid "Checking" msgstr "检查中" -#: ../spellcheck/src/speller.c:186 +#: ../spellcheck/src/speller.c:265 #, c-format msgid "Checking file \"%s\" (lines %d to %d using %s):" msgstr "正在检查文件“%s”（第 %d 行至第 %d 行，使用 %s）" -#: ../spellcheck/src/speller.c:196 +#: ../spellcheck/src/speller.c:275 #, c-format msgid "Checking file \"%s\" (using %s):" msgstr "正在检查文件“%s”（使用 %s）" -#: ../spellcheck/src/speller.c:223 +#: ../spellcheck/src/speller.c:302 msgid "The checked text is spelled correctly." msgstr "已检查的文字拼写正确。" -#: ../spellcheck/src/speller.c:233 +#: ../spellcheck/src/speller.c:312 #, c-format msgid "The Enchant library couldn't be initialized (%s)." msgstr "无法初始化 Enchant 库（%s）。" -#: ../spellcheck/src/speller.c:234 +#: ../spellcheck/src/speller.c:313 msgid "unknown error (maybe the chosen language is not available)" msgstr "未知错误（可能不支持选取的语言）" @@ -5878,17 +6241,17 @@ msgid "Ignore All" msgstr "忽略全部" -#: ../spellcheck/src/gui.c:521 +#: ../spellcheck/src/gui.c:526 #, c-format msgid "Default (%s)" msgstr "默认（%s）" -#: ../spellcheck/src/gui.c:532 +#: ../spellcheck/src/gui.c:537 #, c-format msgid "Toggle spell check while typing (current language: %s)" msgstr "开关输入时的拼写检查（当前语言：%s）" -#: ../spellcheck/src/gui.c:587 +#: ../spellcheck/src/gui.c:592 msgid "Spelling Suggestions" msgstr "拼写建议" @@ -5919,189 +6282,195 @@ #. OK. Something went not as expected. #. * We did have a selection but cannot parse it into rows. #. * Aborting -#: ../tableconvert/src/tableconvert.c:236 +#: ../tableconvert/src/tableconvert.c:237 msgid "Something went wrong on parsing selection. Aborting" msgstr "" -#: ../tableconvert/src/tableconvert.c:268 +#: ../tableconvert/src/tableconvert.c:269 #, fuzzy msgid "Convert selection to table" msgstr "将选中部分左对齐" #. Build up menu entry -#: ../tableconvert/src/tableconvert.c:281 +#: ../tableconvert/src/tableconvert.c:282 msgid "_Convert to table" msgstr "" -#: ../tableconvert/src/tableconvert.c:284 +#: ../tableconvert/src/tableconvert.c:285 msgid "Converts current marked list to a table." msgstr "" -#: ../treebrowser/src/treebrowser.c:120 +#: ../treebrowser/src/treebrowser.c:124 #, fuzzy msgid "TreeBrowser" msgstr "浏览..." -#: ../treebrowser/src/treebrowser.c:121 +#: ../treebrowser/src/treebrowser.c:125 msgid "" "This plugin adds a tree browser to Geany, allowing the user to browse files " "using a tree view of the directory being browsed." msgstr "" -#: ../treebrowser/src/treebrowser.c:430 +#: ../treebrowser/src/treebrowser.c:434 #, c-format msgid "%s: no such directory." msgstr "" -#: ../treebrowser/src/treebrowser.c:526 ../treebrowser/src/treebrowser.c:561 -#: ../treebrowser/src/treebrowser.c:663 +#: ../treebrowser/src/treebrowser.c:537 ../treebrowser/src/treebrowser.c:572 +#: ../treebrowser/src/treebrowser.c:670 #, fuzzy msgid "(Empty)" msgstr "（空行）" -#: ../treebrowser/src/treebrowser.c:966 +#: ../treebrowser/src/treebrowser.c:971 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "" -#: ../treebrowser/src/treebrowser.c:1037 +#: ../treebrowser/src/treebrowser.c:1042 #, fuzzy msgid "NewDirectory" msgstr "目录(_D)" -#: ../treebrowser/src/treebrowser.c:1039 +#: ../treebrowser/src/treebrowser.c:1044 #, fuzzy msgid "NewFile" msgstr "文件(_F)" -#: ../treebrowser/src/treebrowser.c:1044 +#: ../treebrowser/src/treebrowser.c:1049 #, c-format msgid "" "Target file '%s' exists\n" ", do you really want to replace it with empty file?" msgstr "" -#: ../treebrowser/src/treebrowser.c:1089 +#: ../treebrowser/src/treebrowser.c:1095 #, fuzzy, c-format msgid "Do you really want to delete '%s' ?" msgstr "您真的想恢复：%s？" -#: ../treebrowser/src/treebrowser.c:1208 ../treebrowser/src/treebrowser.c:1692 +#: ../treebrowser/src/treebrowser.c:1207 ../treebrowser/src/treebrowser.c:1738 msgid "Go up" msgstr "" -#: ../treebrowser/src/treebrowser.c:1212 ../treebrowser/src/treebrowser.c:1707 +#: ../treebrowser/src/treebrowser.c:1211 ../treebrowser/src/treebrowser.c:1753 #, fuzzy msgid "Set path from document" msgstr "为您的新文档设置编码" -#: ../treebrowser/src/treebrowser.c:1216 -msgid "Open externally" -msgstr "" +#: ../treebrowser/src/treebrowser.c:1215 +#, fuzzy +msgid "_Open externally" +msgstr "在终端中运行" -#: ../treebrowser/src/treebrowser.c:1221 +#: ../treebrowser/src/treebrowser.c:1220 #, fuzzy msgid "Open Terminal" msgstr "在终端中运行" -#: ../treebrowser/src/treebrowser.c:1225 +#: ../treebrowser/src/treebrowser.c:1224 msgid "Set as root" msgstr "" -#: ../treebrowser/src/treebrowser.c:1230 ../treebrowser/src/treebrowser.c:1697 -#: ../treebrowser/src/treebrowser.c:2060 +#: ../treebrowser/src/treebrowser.c:1229 ../treebrowser/src/treebrowser.c:1743 +#: ../treebrowser/src/treebrowser.c:2123 #, fuzzy msgid "Refresh" msgstr "Series" -#: ../treebrowser/src/treebrowser.c:1242 +#: ../treebrowser/src/treebrowser.c:1233 +#, fuzzy +msgid "_Find in Files" +msgstr "在项目中查找" + +#: ../treebrowser/src/treebrowser.c:1241 #, fuzzy msgid "Create new directory" msgstr "恢复根目录" -#: ../treebrowser/src/treebrowser.c:1246 +#: ../treebrowser/src/treebrowser.c:1245 #, fuzzy msgid "Create new file" msgstr "更新文件" -#: ../treebrowser/src/treebrowser.c:1250 +#: ../treebrowser/src/treebrowser.c:1249 #, fuzzy msgid "Rename" msgstr "文件名：" -#: ../treebrowser/src/treebrowser.c:1255 +#: ../treebrowser/src/treebrowser.c:1254 #, fuzzy msgid "Delete" msgstr "删除项目" -#: ../treebrowser/src/treebrowser.c:1263 +#: ../treebrowser/src/treebrowser.c:1262 #, fuzzy, c-format msgid "Close: %s" msgstr "关闭全部(_L)" -#: ../treebrowser/src/treebrowser.c:1268 +#: ../treebrowser/src/treebrowser.c:1267 #, fuzzy, c-format msgid "Close Child Documents " msgstr "关闭其他文件(_H)" -#: ../treebrowser/src/treebrowser.c:1273 -msgid "Copy full path to clipboard" +#: ../treebrowser/src/treebrowser.c:1272 +msgid "_Copy full path to clipboard" msgstr "" -#: ../treebrowser/src/treebrowser.c:1293 ../treebrowser/src/treebrowser.c:1974 +#: ../treebrowser/src/treebrowser.c:1292 ../treebrowser/src/treebrowser.c:2032 #, fuzzy msgid "Show bookmarks" msgstr "书签" -#: ../treebrowser/src/treebrowser.c:1298 ../treebrowser/src/treebrowser.c:1928 +#: ../treebrowser/src/treebrowser.c:1297 ../treebrowser/src/treebrowser.c:1981 #, fuzzy msgid "Show hidden files" msgstr "显示文件差异" -#: ../treebrowser/src/treebrowser.c:1303 +#: ../treebrowser/src/treebrowser.c:1302 #, fuzzy msgid "Show toolbars" msgstr "显示状态" -#: ../treebrowser/src/treebrowser.c:1574 +#: ../treebrowser/src/treebrowser.c:1621 #, c-format msgid "Target file '%s' exists, do you really want to replace it?" msgstr "" -#: ../treebrowser/src/treebrowser.c:1702 +#: ../treebrowser/src/treebrowser.c:1748 #, fuzzy msgid "Home" msgstr "Volume" -#: ../treebrowser/src/treebrowser.c:1712 +#: ../treebrowser/src/treebrowser.c:1758 #, fuzzy msgid "Track path" msgstr "根目录：" -#: ../treebrowser/src/treebrowser.c:1717 +#: ../treebrowser/src/treebrowser.c:1763 #, fuzzy msgid "Hide bars" msgstr "隐藏侧栏(_I)" -#: ../treebrowser/src/treebrowser.c:1727 +#: ../treebrowser/src/treebrowser.c:1773 msgid "" "Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' " "reverse try for example this '!;*.c;*.h;*.cpp'" msgstr "" -#: ../treebrowser/src/treebrowser.c:1735 +#: ../treebrowser/src/treebrowser.c:1781 msgid "Addressbar for example '/projects/my-project'" msgstr "" -#: ../treebrowser/src/treebrowser.c:1760 +#: ../treebrowser/src/treebrowser.c:1806 msgid "Tree Browser" msgstr "" -#: ../treebrowser/src/treebrowser.c:1892 +#: ../treebrowser/src/treebrowser.c:1945 msgid "External open command" msgstr "" -#: ../treebrowser/src/treebrowser.c:1897 +#: ../treebrowser/src/treebrowser.c:1950 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -6111,107 +6480,116 @@ "filename" msgstr "" -#: ../treebrowser/src/treebrowser.c:1905 +#: ../treebrowser/src/treebrowser.c:1958 msgid "Toolbar" msgstr "" -#: ../treebrowser/src/treebrowser.c:1907 +#: ../treebrowser/src/treebrowser.c:1960 msgid "Hidden" msgstr "" -#: ../treebrowser/src/treebrowser.c:1908 +#: ../treebrowser/src/treebrowser.c:1961 msgid "Top" msgstr "" -#: ../treebrowser/src/treebrowser.c:1909 +#: ../treebrowser/src/treebrowser.c:1962 msgid "Bottom" msgstr "" -#: ../treebrowser/src/treebrowser.c:1914 +#: ../treebrowser/src/treebrowser.c:1967 msgid "If position is changed, the option require plugin restart." msgstr "" -#: ../treebrowser/src/treebrowser.c:1918 +#: ../treebrowser/src/treebrowser.c:1971 #, fuzzy msgid "Show icons" msgstr "显示图标。" -#: ../treebrowser/src/treebrowser.c:1920 +#: ../treebrowser/src/treebrowser.c:1973 msgid "None" msgstr "" -#: ../treebrowser/src/treebrowser.c:1921 +#: ../treebrowser/src/treebrowser.c:1974 #, fuzzy msgid "Base" msgstr "暂停(_P)" -#: ../treebrowser/src/treebrowser.c:1922 +#: ../treebrowser/src/treebrowser.c:1975 #, fuzzy msgid "Content-type" msgstr "内容" -#: ../treebrowser/src/treebrowser.c:1933 +#: ../treebrowser/src/treebrowser.c:1986 msgid "On Windows, this just hide files that are prefixed with '.' (dot)" msgstr "" -#: ../treebrowser/src/treebrowser.c:1935 +#: ../treebrowser/src/treebrowser.c:1988 #, fuzzy msgid "Hide object files" msgstr "选择文件" -#: ../treebrowser/src/treebrowser.c:1940 +#: ../treebrowser/src/treebrowser.c:1993 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" msgstr "" -#: ../treebrowser/src/treebrowser.c:1942 +#: ../treebrowser/src/treebrowser.c:1995 #, fuzzy msgid "Reverse filter" msgstr "恢复单个文件" -#: ../treebrowser/src/treebrowser.c:1947 +#: ../treebrowser/src/treebrowser.c:2000 msgid "Follow current document" msgstr "" -#: ../treebrowser/src/treebrowser.c:1952 +#: ../treebrowser/src/treebrowser.c:2005 msgid "Single click, open document and focus it" msgstr "" -#: ../treebrowser/src/treebrowser.c:1957 +#: ../treebrowser/src/treebrowser.c:2010 #, fuzzy msgid "Double click open directory" msgstr "显示目录差异" -#: ../treebrowser/src/treebrowser.c:1962 +#: ../treebrowser/src/treebrowser.c:2015 msgid "On delete file, close it if is opened" msgstr "" -#: ../treebrowser/src/treebrowser.c:1967 +#: ../treebrowser/src/treebrowser.c:2020 +msgid "Focus editor on file open" +msgstr "" + +#: ../treebrowser/src/treebrowser.c:2025 #, fuzzy msgid "Show tree lines" msgstr "显示工具提示。" -#: ../treebrowser/src/treebrowser.c:2050 +#: ../treebrowser/src/treebrowser.c:2037 +#, fuzzy +msgid "Open new files" +msgstr "打开文件" + +#: ../treebrowser/src/treebrowser.c:2113 #, fuzzy msgid "Focus File List" msgstr "焦点书签列表" -#: ../treebrowser/src/treebrowser.c:2052 +#: ../treebrowser/src/treebrowser.c:2115 msgid "Focus Path Entry" msgstr "" -#: ../treebrowser/src/treebrowser.c:2054 +#: ../treebrowser/src/treebrowser.c:2117 #, fuzzy msgid "Rename Object" msgstr "文件名：" -#: ../treebrowser/src/treebrowser.c:2056 +#: ../treebrowser/src/treebrowser.c:2119 #, fuzzy msgid "Create New File" msgstr "更新文件" -#: ../treebrowser/src/treebrowser.c:2058 +#: ../treebrowser/src/treebrowser.c:2121 #, fuzzy msgid "Create New Directory" msgstr "恢复根目录" @@ -6281,46 +6659,46 @@ msgid "utility" msgstr "" -#: ../webhelper/src/gwh-settings.c:775 +#: ../webhelper/src/gwh-settings.c:782 #, c-format msgid "%s:" msgstr "" -#: ../webhelper/src/gwh-browser.c:528 +#: ../webhelper/src/gwh-browser.c:534 msgid "_Zoom" msgstr "" -#: ../webhelper/src/gwh-browser.c:550 +#: ../webhelper/src/gwh-browser.c:556 msgid "Full-_content zoom" msgstr "" -#: ../webhelper/src/gwh-browser.c:561 +#: ../webhelper/src/gwh-browser.c:567 #, fuzzy msgid "Flip panes orientation" msgstr "简报" -#: ../webhelper/src/gwh-browser.c:808 +#: ../webhelper/src/gwh-browser.c:814 msgid "Back" msgstr "" -#: ../webhelper/src/gwh-browser.c:812 +#: ../webhelper/src/gwh-browser.c:818 msgid "Forward" msgstr "" -#: ../webhelper/src/gwh-browser.c:816 +#: ../webhelper/src/gwh-browser.c:822 #, fuzzy msgid "Cancel loading" msgstr "编码：" -#: ../webhelper/src/gwh-browser.c:820 +#: ../webhelper/src/gwh-browser.c:826 msgid "Reload current page" msgstr "" -#: ../webhelper/src/gwh-browser.c:833 ../webhelper/src/gwh-browser.c:879 +#: ../webhelper/src/gwh-browser.c:839 ../webhelper/src/gwh-browser.c:885 msgid "Web inspector" msgstr "" -#: ../webhelper/src/gwh-browser.c:834 +#: ../webhelper/src/gwh-browser.c:840 msgid "Toggle web inspector" msgstr "" @@ -6491,9 +6869,6 @@ #~ msgid "Failed to retrieve executable search path setting from GDB." #~ msgstr "取回 GDB 可执行文件搜索路径设置失败。" -#~ msgid "Failed to retrieve working directory setting from GDB." -#~ msgstr "取回 GDB 工作路径设置失败" - #~ msgid "Field list too long, not all items can be displayed.\n" #~ msgstr "字段列表太长，无法显示所有项。\n" @@ -6527,9 +6902,6 @@ #~ msgid "tty temporary directory not specified!\n" #~ msgstr "未指定 tty 临时目录！\n" -#~ msgid "tty temporary directory not found!\n" -#~ msgstr "未找到 tty 临时目录！\n" - #~ msgid "tty helper program not specified!\n" #~ msgstr "未指定 tty helper program！\n" @@ -6597,21 +6969,12 @@ #~ msgid "No %s selected" #~ msgstr "未选择任何 %s" -#~ msgid "watchpoint" -#~ msgstr "观察点" - #~ msgid "Delete selected watchpoint?" #~ msgstr "删除选定的观察点？" #~ msgid "Delete selected breakpoint?" #~ msgstr "删除选定的断点？" -#~ msgid "Edit watchpoint" -#~ msgstr "编辑观察点" - -#~ msgid "Edit breakpoint" -#~ msgstr "编辑断点" - #~ msgid "Enabled" #~ msgstr "已启用" diff -Nru geany-plugins-1.23+dfsg/pohelper/AUTHORS geany-plugins-1.24+dfsg/pohelper/AUTHORS --- geany-plugins-1.23+dfsg/pohelper/AUTHORS 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pohelper/AUTHORS 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1 @@ +Colomban Wendling diff -Nru geany-plugins-1.23+dfsg/pohelper/COPYING geany-plugins-1.24+dfsg/pohelper/COPYING --- geany-plugins-1.23+dfsg/pohelper/COPYING 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pohelper/COPYING 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff -Nru geany-plugins-1.23+dfsg/pohelper/data/Makefile.am geany-plugins-1.24+dfsg/pohelper/data/Makefile.am --- geany-plugins-1.23+dfsg/pohelper/data/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pohelper/data/Makefile.am 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,4 @@ +include $(top_srcdir)/build/vars.docs.mk +plugin = pohelper + +dist_plugindata_DATA = menus.ui diff -Nru geany-plugins-1.23+dfsg/pohelper/data/Makefile.in geany-plugins-1.24+dfsg/pohelper/data/Makefile.in --- geany-plugins-1.23+dfsg/pohelper/data/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pohelper/data/Makefile.in 2014-04-13 17:12:45.000000000 +0000 @@ -0,0 +1,630 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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 \ + *\\[\ \ ]*) \ + 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; \ + 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@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindata_DATA) +subdir = pohelper/data +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ + $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ + $(top_srcdir)/build/cppcheck.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ + $(top_srcdir)/build/geanydoc.m4 \ + $(top_srcdir)/build/geanyextrasel.m4 \ + $(top_srcdir)/build/geanygendoc.m4 \ + $(top_srcdir)/build/geanyinsertnum.m4 \ + $(top_srcdir)/build/geanylatex.m4 \ + $(top_srcdir)/build/geanylipsum.m4 \ + $(top_srcdir)/build/geanylua.m4 \ + $(top_srcdir)/build/geanymacro.m4 \ + $(top_srcdir)/build/geanyminiscript.m4 \ + $(top_srcdir)/build/geanynumberedbookmarks.m4 \ + $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ + $(top_srcdir)/build/geanysendmail.m4 \ + $(top_srcdir)/build/geanyvc.m4 \ + $(top_srcdir)/build/geniuspaste.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ + $(top_srcdir)/build/pretty-printer.m4 \ + $(top_srcdir)/build/scope.m4 \ + $(top_srcdir)/build/shiftcolumn.m4 \ + $(top_srcdir)/build/spellcheck.m4 \ + $(top_srcdir)/build/status.m4 \ + $(top_srcdir)/build/tableconvert.m4 \ + $(top_srcdir)/build/treebrowser.m4 \ + $(top_srcdir)/build/unittests.m4 \ + $(top_srcdir)/build/updatechecker.m4 \ + $(top_srcdir)/build/webhelper.m4 \ + $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ + $(top_srcdir)/build/cache/glib-gettext.m4 \ + $(top_srcdir)/build/cache/intltool.m4 \ + $(top_srcdir)/build/cache/libtool.m4 \ + $(top_srcdir)/build/cache/ltoptions.m4 \ + $(top_srcdir)/build/cache/ltsugar.m4 \ + $(top_srcdir)/build/cache/ltversion.m4 \ + $(top_srcdir)/build/cache/lt~obsolete.m4 \ + $(top_srcdir)/build/cache/nls.m4 \ + $(top_srcdir)/build/cache/pkg.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +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_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 = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +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__installdirs = "$(DESTDIR)$(plugindatadir)" +DATA = $(dist_plugindata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ +COMMANDER_CFLAGS = @COMMANDER_CFLAGS@ +COMMANDER_LIBS = @COMMANDER_LIBS@ +CPP = @CPP@ +CPPCHECK = @CPPCHECK@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ +DEVHELP_LIBS = @DEVHELP_LIBS@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENCHANT_CFLAGS = @ENCHANT_CFLAGS@ +ENCHANT_LIBS = @ENCHANT_LIBS@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GEANYGENDOC_CFLAGS = @GEANYGENDOC_CFLAGS@ +GEANYGENDOC_LIBS = @GEANYGENDOC_LIBS@ +GEANY_CFLAGS = @GEANY_CFLAGS@ +GEANY_LIBS = @GEANY_LIBS@ +GEANY_VERSION = @GEANY_VERSION@ +GENIUSPASTE_CFLAGS = @GENIUSPASTE_CFLAGS@ +GENIUSPASTE_LIBS = @GENIUSPASTE_LIBS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GPGME_CFLAGS = @GPGME_CFLAGS@ +GPGME_CONFIG = @GPGME_CONFIG@ +GPGME_LIBS = @GPGME_LIBS@ +GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ +GREP = @GREP@ +GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ +GTKSPELL_LIBS = @GTKSPELL_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBMARKDOWN_CFLAGS = @LIBMARKDOWN_CFLAGS@ +LIBMARKDOWN_LIBS = @LIBMARKDOWN_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCALEDIR = @LOCALEDIR@ +LTLIBOBJS = @LTLIBOBJS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_LIBS = @LUA_LIBS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MARKDOWN_CFLAGS = @MARKDOWN_CFLAGS@ +MARKDOWN_LIBS = @MARKDOWN_LIBS@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +MULTITERM_CFLAGS = @MULTITERM_CFLAGS@ +MULTITERM_LIBS = @MULTITERM_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +RST2HTML = @RST2HTML@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +UPDATECHECKER_CFLAGS = @UPDATECHECKER_CFLAGS@ +UPDATECHECKER_LIBS = @UPDATECHECKER_LIBS@ +USE_NLS = @USE_NLS@ +VALAC = @VALAC@ +VERSION = @VERSION@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ +WEBHELPER_CFLAGS = @WEBHELPER_CFLAGS@ +WEBHELPER_LIBS = @WEBHELPER_LIBS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +geanypluginsdir = @geanypluginsdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugindocdir = $(docdir)/$(plugin) +htmldocdir = $(plugindocdir) +plugindatadir = $(pkgdatadir)/$(plugin) +pluginlibdir = $(pkglibdir)/$(plugin) +examplesdir = $(plugindatadir) +plugin = pohelper +dist_plugindata_DATA = menus.ui +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/vars.docs.mk $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pohelper/data/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign pohelper/data/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + 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/vars.docs.mk: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-dist_plugindataDATA: $(dist_plugindata_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_plugindata_DATA)'; test -n "$(plugindatadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindatadir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindatadir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindatadir)" || exit $$?; \ + done + +uninstall-dist_plugindataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_plugindata_DATA)'; test -n "$(plugindatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(plugindatadir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(plugindatadir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dist_plugindataDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_plugindataDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic 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-dist_plugindataDATA 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-dist_plugindataDATA + + +# 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. +.NOEXPORT: diff -Nru geany-plugins-1.23+dfsg/pohelper/data/menus.ui geany-plugins-1.24+dfsg/pohelper/data/menus.ui --- geany-plugins-1.23+dfsg/pohelper/data/menus.ui 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pohelper/data/menus.ui 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,239 @@ + + + + + + True + False + gtk-go-back + 1 + + + True + False + gtk-go-forward + 1 + + + True + False + gtk-go-back + 1 + + + True + False + gtk-go-forward + 1 + + + True + False + gtk-go-back + 1 + + + True + False + gtk-go-forward + 1 + + + True + False + gtk-go-back + 1 + + + True + False + gtk-go-forward + 1 + + + True + False + gtk-paste + 1 + + + False + True + False + _Translation Helper + True + + + False + + + _Previous String + False + True + False + Go to previous string + True + image1 + False + + + + + _Next String + False + True + False + Go to next string + True + image2 + False + + + + + True + False + + + + + Pre_vious Untranslated + False + True + False + Go to previous untranslated string + True + image3 + False + + + + + Next _Untranslated + False + True + False + Go to next untranslated string + True + image4 + False + + + + + True + False + + + + + Previous Fu_zzy + False + True + False + Go to previous fuzzily translated string + True + image5 + False + + + + + Next _Fuzzy + False + True + False + Go to next fuzzily translated string + True + image6 + False + + + + + True + False + + + + + Previous Untranslated or Fuzz_y + False + True + False + Go to previous untranslated or fuzzy string + True + image7 + False + + + + + Next Untranslated _or Fuzzy + False + True + False + Go to next untranslated or fuzzy string + True + image8 + False + + + + + True + False + + + + + False + True + False + Toggle current translation fuzziness + _Toggle Fuzziness + True + + + + + Paste _Message as Translation + False + True + False + Paste the original untranslated string to the translation + True + image9 + False + + + + + False + True + False + Reflow the current translation string + _Reflow Translation + True + + + + + True + False + + + + + False + True + False + Whether to update the translation headers (author, revision date, ...) upon file save + Update _Headers Upon Save + True + + + + + + diff -Nru geany-plugins-1.23+dfsg/pohelper/Makefile.am geany-plugins-1.24+dfsg/pohelper/Makefile.am --- geany-plugins-1.23+dfsg/pohelper/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pohelper/Makefile.am 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,4 @@ +include $(top_srcdir)/build/vars.auxfiles.mk + +SUBDIRS = data src +plugin = pohelper diff -Nru geany-plugins-1.23+dfsg/pohelper/Makefile.in geany-plugins-1.24+dfsg/pohelper/Makefile.in --- geany-plugins-1.23+dfsg/pohelper/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pohelper/Makefile.in 2014-04-13 17:12:45.000000000 +0000 @@ -0,0 +1,825 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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 \ + *\\[\ \ ]*) \ + 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; \ + 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@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(top_srcdir)/build/vars.auxfiles.mk \ + $(top_srcdir)/build/vars.docs.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(dist_plugindoc_DATA) AUTHORS COPYING \ + ChangeLog NEWS README +subdir = pohelper +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ + $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ + $(top_srcdir)/build/cppcheck.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ + $(top_srcdir)/build/geanydoc.m4 \ + $(top_srcdir)/build/geanyextrasel.m4 \ + $(top_srcdir)/build/geanygendoc.m4 \ + $(top_srcdir)/build/geanyinsertnum.m4 \ + $(top_srcdir)/build/geanylatex.m4 \ + $(top_srcdir)/build/geanylipsum.m4 \ + $(top_srcdir)/build/geanylua.m4 \ + $(top_srcdir)/build/geanymacro.m4 \ + $(top_srcdir)/build/geanyminiscript.m4 \ + $(top_srcdir)/build/geanynumberedbookmarks.m4 \ + $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ + $(top_srcdir)/build/geanysendmail.m4 \ + $(top_srcdir)/build/geanyvc.m4 \ + $(top_srcdir)/build/geniuspaste.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ + $(top_srcdir)/build/pretty-printer.m4 \ + $(top_srcdir)/build/scope.m4 \ + $(top_srcdir)/build/shiftcolumn.m4 \ + $(top_srcdir)/build/spellcheck.m4 \ + $(top_srcdir)/build/status.m4 \ + $(top_srcdir)/build/tableconvert.m4 \ + $(top_srcdir)/build/treebrowser.m4 \ + $(top_srcdir)/build/unittests.m4 \ + $(top_srcdir)/build/updatechecker.m4 \ + $(top_srcdir)/build/webhelper.m4 \ + $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ + $(top_srcdir)/build/cache/glib-gettext.m4 \ + $(top_srcdir)/build/cache/intltool.m4 \ + $(top_srcdir)/build/cache/libtool.m4 \ + $(top_srcdir)/build/cache/ltoptions.m4 \ + $(top_srcdir)/build/cache/ltsugar.m4 \ + $(top_srcdir)/build/cache/ltversion.m4 \ + $(top_srcdir)/build/cache/lt~obsolete.m4 \ + $(top_srcdir)/build/cache/nls.m4 \ + $(top_srcdir)/build/cache/pkg.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +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_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 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__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__installdirs = "$(DESTDIR)$(plugindocdir)" +DATA = $(dist_plugindoc_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +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) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ +COMMANDER_CFLAGS = @COMMANDER_CFLAGS@ +COMMANDER_LIBS = @COMMANDER_LIBS@ +CPP = @CPP@ +CPPCHECK = @CPPCHECK@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ +DEVHELP_LIBS = @DEVHELP_LIBS@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENCHANT_CFLAGS = @ENCHANT_CFLAGS@ +ENCHANT_LIBS = @ENCHANT_LIBS@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GEANYGENDOC_CFLAGS = @GEANYGENDOC_CFLAGS@ +GEANYGENDOC_LIBS = @GEANYGENDOC_LIBS@ +GEANY_CFLAGS = @GEANY_CFLAGS@ +GEANY_LIBS = @GEANY_LIBS@ +GEANY_VERSION = @GEANY_VERSION@ +GENIUSPASTE_CFLAGS = @GENIUSPASTE_CFLAGS@ +GENIUSPASTE_LIBS = @GENIUSPASTE_LIBS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GPGME_CFLAGS = @GPGME_CFLAGS@ +GPGME_CONFIG = @GPGME_CONFIG@ +GPGME_LIBS = @GPGME_LIBS@ +GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ +GREP = @GREP@ +GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ +GTKSPELL_LIBS = @GTKSPELL_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBMARKDOWN_CFLAGS = @LIBMARKDOWN_CFLAGS@ +LIBMARKDOWN_LIBS = @LIBMARKDOWN_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCALEDIR = @LOCALEDIR@ +LTLIBOBJS = @LTLIBOBJS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_LIBS = @LUA_LIBS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MARKDOWN_CFLAGS = @MARKDOWN_CFLAGS@ +MARKDOWN_LIBS = @MARKDOWN_LIBS@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +MULTITERM_CFLAGS = @MULTITERM_CFLAGS@ +MULTITERM_LIBS = @MULTITERM_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +RST2HTML = @RST2HTML@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +UPDATECHECKER_CFLAGS = @UPDATECHECKER_CFLAGS@ +UPDATECHECKER_LIBS = @UPDATECHECKER_LIBS@ +USE_NLS = @USE_NLS@ +VALAC = @VALAC@ +VERSION = @VERSION@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ +WEBHELPER_CFLAGS = @WEBHELPER_CFLAGS@ +WEBHELPER_LIBS = @WEBHELPER_LIBS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +geanypluginsdir = @geanypluginsdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugindocdir = $(docdir)/$(plugin) +htmldocdir = $(plugindocdir) +plugindatadir = $(pkgdatadir)/$(plugin) +pluginlibdir = $(pkglibdir)/$(plugin) +examplesdir = $(plugindatadir) +dist_plugindoc_DATA = \ + README \ + ChangeLog \ + NEWS \ + COPYING \ + AUTHORS \ + $(AUXFILES) + +EXTRA_DIST = \ + wscript_build \ + wscript_configure + +SUBDIRS = data src +plugin = pohelper +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/vars.auxfiles.mk $(top_srcdir)/build/vars.docs.mk $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pohelper/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign pohelper/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + 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/vars.auxfiles.mk $(top_srcdir)/build/vars.docs.mk: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-dist_plugindocDATA: $(dist_plugindoc_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_plugindoc_DATA)'; test -n "$(plugindocdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindocdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindocdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindocdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindocdir)" || exit $$?; \ + done + +uninstall-dist_plugindocDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_plugindoc_DATA)'; test -n "$(plugindocdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(plugindocdir)'; $(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. +$(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//`; \ + 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; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +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 + +GTAGS: + 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 + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile $(DATA) +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(plugindocdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: install-dist_plugindocDATA + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-dist_plugindocDATA + +.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-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-dist_plugindocDATA 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 \ + uninstall-dist_plugindocDATA + + +# 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. +.NOEXPORT: diff -Nru geany-plugins-1.23+dfsg/pohelper/NEWS geany-plugins-1.24+dfsg/pohelper/NEWS --- geany-plugins-1.23+dfsg/pohelper/NEWS 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pohelper/NEWS 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,3 @@ +Translation Helper 0.1 + + * Initial release. diff -Nru geany-plugins-1.23+dfsg/pohelper/README geany-plugins-1.24+dfsg/pohelper/README --- geany-plugins-1.23+dfsg/pohelper/README 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pohelper/README 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,73 @@ +================== +Translation Helper +================== + +.. contents:: + + +About +===== + +Translation Helper is a plugin for Geany that improves the support for +GetText translation files, by providing various features specific to this +format and to translators. + + +Features +-------- + +* Navigation between all, untranslated or fuzzy messages; +* Reformatting of the translation (reflow); +* Toggling the fuzziness of a translation; +* Pasting of the untranslated string to the translation; +* Automatic updating of the translation metadata. + + +Requirements +============ + +This plugin only requires GLib, GTK and Geany to work. If you intent to build +it yourself, you will need to get the development files of these programs and +libraries. You can find these packages at http://www.geany.org/ and +http://www.gtk.org/. + + +Installation +============ + +For detailed instructions, see the INSTALL file of the Geany-Plugins package +this plugin is part of. + + +Usage +===== + +First enbale the plugin the the Plugin Manager of Geany. Once enabled, +the plugin adds a new menu under "Tools -> Translation Helper" giving +access to the various actions it provides. You can of course configure +keybindings for each actions under the Keybindings section of the Geany +preferences. + + +License +======= + +Translation Helper is distributed 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. You should have received a copy +of the GNU General Public License along with WebHelper. If not, see +. + + +Contact +======= + +You can email me at , and I may also be on the +#geany channel on FreeNode, under the `b4n` nickname. + + +Bug reports and feature requests +-------------------------------- + +To report a bug or ask for a new feature, please use the Geany-Plugins tracker +on SourceForge: http://sourceforge.net/tracker/?group_id=222729 diff -Nru geany-plugins-1.23+dfsg/pohelper/src/gph-plugin.c geany-plugins-1.24+dfsg/pohelper/src/gph-plugin.c --- geany-plugins-1.23+dfsg/pohelper/src/gph-plugin.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pohelper/src/gph-plugin.c 2014-04-12 14:28:39.000000000 +0000 @@ -0,0 +1,1252 @@ +/* + * + * Copyright (C) 2013 Colomban Wendling + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#include "config.h" + +#include +#include +#include + +#include +#include +#include +#include + + +GeanyPlugin *geany_plugin; +GeanyData *geany_data; +GeanyFunctions *geany_functions; + + +PLUGIN_VERSION_CHECK (211) /* FIXME: what's the version really required? */ + +PLUGIN_SET_TRANSLATABLE_INFO ( + LOCALEDIR, GETTEXT_PACKAGE, + _("Translation Helper"), + _("Improves support for GetText translation files."), + "0.1", + "Colomban Wendling " +) + + +enum { + GPH_KB_GOTO_PREV, + GPH_KB_GOTO_NEXT, + GPH_KB_GOTO_PREV_UNTRANSLATED, + GPH_KB_GOTO_NEXT_UNTRANSLATED, + GPH_KB_GOTO_PREV_FUZZY, + GPH_KB_GOTO_NEXT_FUZZY, + GPH_KB_GOTO_PREV_UNTRANSLATED_OR_FUZZY, + GPH_KB_GOTO_NEXT_UNTRANSLATED_OR_FUZZY, + GPH_KB_PASTE_UNTRANSLATED, + GPH_KB_REFLOW, + GPH_KB_TOGGLE_FUZZY, + GPH_KB_COUNT +}; + + +static struct Plugin { + gboolean update_headers; + + GtkWidget *menu_item; +} plugin = { + TRUE, + NULL +}; + + +#define doc_is_po(doc) (DOC_VALID (doc) && \ + (doc)->file_type && \ + (doc)->file_type->id == GEANY_FILETYPES_PO) + + +/* gets the smallest valid position between @a and @b */ +#define MIN_POS(a, b) ((a) < 0 ? (b) : (b) < 0 ? (a) : MIN ((a), (b))) +/* gets the highest valid position between @a and @b */ +#define MAX_POS(a, b) (MAX ((a), (b))) + + +/* + * find_style: + * @sci: a #ScintillaObject + * @style: a style ID to search for + * @start: start of the search range + * @end: end of the search range + * + * Search for a style in a #ScintillaObject. Backward search is possible if + * start is > end. Note that this find the first occurrence of @style in the + * search direction, which means that the start of the style will be found when + * searching onwards but the end when searching backwards. Also, if the start + * position is already on the style to search for this position is returned + * rather than one bound. + * + * Returns: The first found position with style @style, or -1 if not found in + * the given range. + */ +static gint +find_style (ScintillaObject *sci, + gint style, + gint start, + gint end) +{ + gint pos; + + if (start > end) { /* search backwards */ + for (pos = start; pos >= end; pos--) { + if (sci_get_style_at (sci, pos) == style) + break; + } + if (pos < end) + return -1; + } else { + for (pos = start; pos < end; pos++) { + if (sci_get_style_at (sci, pos) == style) + break; + } + if (pos >= end) + return -1; + } + + return pos; +} + +/* + * find_message: + * @doc: A #GeanyDocument + * @start: start of the search range + * @end: end of the search range + * + * Finds the start position of the next msgstr in the given range. If start is + * > end, searches backwards. + * + * Returns: The start position of the next msgstr in the given range, or -1 if + * not found. + */ +static gint +find_message (GeanyDocument *doc, + gint start, + gint end) +{ + if (doc_is_po (doc)) { + ScintillaObject *sci = doc->editor->sci; + gint pos = find_style (sci, SCE_PO_MSGSTR, start, end); + + if (pos >= 0) { + pos = find_style (sci, SCE_PO_MSGSTR_TEXT, pos, sci_get_length (sci)); + if (pos >= 0) { + return pos + 1; + } + } + } + + return -1; +} + +/* + * find_untranslated: + * @doc: A #GeanyDocument + * @start: start of the search range + * @end: end of the search range + * + * Searches for the next untranslated message in the given range. If start is + * > end, searches backwards. + * + * Returns: The start position of the next untranslated message in the given + * range, or -1 if not found. + */ +static gint +find_untranslated (GeanyDocument *doc, + gint start, + gint end) +{ + if (doc_is_po (doc)) { + ScintillaObject *sci = doc->editor->sci; + gboolean backwards = start > end; + + while (start >= 0) { + gint pos; + + if (backwards) { + start = find_style (sci, SCE_PO_MSGID, start, end); + } + + pos = find_message (doc, start, end); + if (pos < 0) { + return -1; + } else { + gint i = pos; + + for (i = pos; i < sci_get_length (sci); i++) { + gint style = sci_get_style_at (sci, i); + + if (style == SCE_PO_MSGSTR_TEXT) { + if (sci_get_char_at (sci, i) != '"') { + /* if any character in the text is not a delimiter, there's a + * translation */ + i = -1; + break; + } + } else if (style != SCE_PO_DEFAULT) { + /* if we reached something else than the text and the background, + * we're done searching */ + break; + } + } + if (i >= 0) + return pos; + } + + start = pos; + } + } + + return -1; +} + +static gint +find_prev_untranslated (GeanyDocument *doc) +{ + return find_untranslated (doc, sci_get_current_position (doc->editor->sci), + 0); +} + +static gint +find_next_untranslated (GeanyDocument *doc) +{ + return find_untranslated (doc, sci_get_current_position (doc->editor->sci), + sci_get_length (doc->editor->sci)); +} + +static gint +find_fuzzy (GeanyDocument *doc, + gint start, + gint end) +{ + if (doc_is_po (doc)) { + ScintillaObject *sci = doc->editor->sci; + + if (start > end) { + /* if searching backwards, first go to the previous msgstr not to find + * the current one */ + gint style = sci_get_style_at (sci, start); + + if (style == SCE_PO_MSGSTR || style == SCE_PO_MSGSTR_TEXT) { + start = find_style (sci, SCE_PO_MSGID, start, end); + if (start >= 0) { + start = find_style (sci, SCE_PO_MSGSTR, start, end); + } + } + } + + if (start >= 0) { + struct Sci_TextToFind ttf; + + ttf.chrg.cpMin = start; + ttf.chrg.cpMax = end; + ttf.lpstrText = (gchar *)"fuzzy"; + + while (sci_find_text (sci, SCFIND_WHOLEWORD | SCFIND_MATCHCASE, + &ttf) >= 0) { + gint style = sci_get_style_at (sci, (gint) ttf.chrgText.cpMin); + + if (style == SCE_PO_FUZZY || style == SCE_PO_FLAGS) { + /* OK, now find the start of the translation */ + return find_message (doc, (gint) ttf.chrgText.cpMax, + start > end ? sci_get_length (sci) : end); + } + + ttf.chrg.cpMin = start > end ? ttf.chrgText.cpMin : ttf.chrgText.cpMax; + } + } + } + + return -1; +} + +static gint +find_prev_fuzzy (GeanyDocument *doc) +{ + return find_fuzzy (doc, sci_get_current_position (doc->editor->sci), 0); +} + +static gint +find_next_fuzzy (GeanyDocument *doc) +{ + return find_fuzzy (doc, sci_get_current_position (doc->editor->sci), + sci_get_length (doc->editor->sci)); +} + +/* goto */ + +static void +goto_prev (GeanyDocument *doc) +{ + if (doc_is_po (doc)) { + gint pos = sci_get_current_position (doc->editor->sci); + + pos = find_style (doc->editor->sci, SCE_PO_MSGID, pos, 0); + if (pos >= 0) { + pos = find_message (doc, pos, 0); + if (pos >= 0) { + editor_goto_pos (doc->editor, pos, FALSE); + } + } + } +} + +static void +goto_next (GeanyDocument *doc) +{ + if (doc_is_po (doc)) { + gint pos = find_message (doc, sci_get_current_position (doc->editor->sci), + sci_get_length (doc->editor->sci)); + + if (pos >= 0) { + editor_goto_pos (doc->editor, pos, FALSE); + } + } +} + +static void +goto_prev_untranslated (GeanyDocument *doc) +{ + if (doc_is_po (doc)) { + gint pos = find_prev_untranslated (doc); + + if (pos >= 0) { + editor_goto_pos (doc->editor, pos, FALSE); + } + } +} + +static void +goto_next_untranslated (GeanyDocument *doc) +{ + if (doc_is_po (doc)) { + gint pos = find_next_untranslated (doc); + + if (pos >= 0) { + editor_goto_pos (doc->editor, pos, FALSE); + } + } +} + +static void +goto_prev_fuzzy (GeanyDocument *doc) +{ + if (doc_is_po (doc)) { + gint pos = find_prev_fuzzy (doc); + + if (pos >= 0) { + editor_goto_pos (doc->editor, pos, FALSE); + } + } +} + +static void +goto_next_fuzzy (GeanyDocument *doc) +{ + if (doc_is_po (doc)) { + gint pos = find_next_fuzzy (doc); + + if (pos >= 0) { + editor_goto_pos (doc->editor, pos, FALSE); + } + } +} + +static void +goto_prev_untranslated_or_fuzzy (GeanyDocument *doc) +{ + if (doc_is_po (doc)) { + gint pos1 = find_prev_untranslated (doc); + gint pos2 = find_prev_fuzzy (doc); + gint pos = MAX_POS (pos1, pos2); + + if (pos >= 0) { + editor_goto_pos (doc->editor, pos, FALSE); + } + } +} + +static void +goto_next_untranslated_or_fuzzy (GeanyDocument *doc) +{ + if (doc_is_po (doc)) { + gint pos1 = find_next_untranslated (doc); + gint pos2 = find_next_fuzzy (doc); + gint pos = MIN_POS (pos1, pos2); + + if (pos >= 0) { + editor_goto_pos (doc->editor, pos, FALSE); + } + } +} + +/* basic regex search/replace without captures or back references */ +static gboolean +regex_replace (ScintillaObject *sci, + const gchar *scire, + const gchar *repl) +{ + struct Sci_TextToFind ttf; + + ttf.chrg.cpMin = 0; + ttf.chrg.cpMax = sci_get_length (sci); + ttf.lpstrText = (gchar *) scire; + + if (sci_find_text (sci, SCFIND_REGEXP, &ttf)) { + sci_set_target_start (sci, (gint) ttf.chrgText.cpMin); + sci_set_target_end (sci, (gint) ttf.chrgText.cpMax); + sci_replace_target (sci, repl, FALSE); + + return TRUE; + } + + return FALSE; +} + +/* escapes @str so it is valid to put it inside a message + * escapes '\b', '\f', '\n', '\r', '\t', '\v', '\' and '"' + * unlike g_strescape(), it doesn't escape non-ASCII characters so keeps + * all of UTF-8 */ +static gchar * +escape_string (const gchar *str) +{ + gchar *new = g_malloc (strlen (str) * 2 + 1); + gchar *p; + + for (p = new; *str; str++) { + switch (*str) { + case '\b': *p++ = '\\'; *p++ = 'b'; break; + case '\f': *p++ = '\\'; *p++ = 'f'; break; + case '\n': *p++ = '\\'; *p++ = 'n'; break; + case '\r': *p++ = '\\'; *p++ = 'r'; break; + case '\t': *p++ = '\\'; *p++ = 't'; break; + case '\v': *p++ = '\\'; *p++ = 'v'; break; + case '\\': *p++ = '\\'; *p++ = '\\'; break; + case '"': *p++ = '\\'; *p++ = '"'; break; + default: + *p++ = *str; + } + } + *p = 0; + + return new; +} + +static void +on_document_save (GObject *obj, + GeanyDocument *doc, + gpointer user_data) +{ + if (doc_is_po (doc) && plugin.update_headers) { + gchar *name = escape_string (geany_data->template_prefs->developer); + gchar *mail = escape_string (geany_data->template_prefs->mail); + gchar *date; + gchar *translator; + + date = utils_get_date_time ("\"PO-Revision-Date: %Y-%m-%d %H:%M%z\\n\"", + NULL); + translator = g_strdup_printf ("\"Last-Translator: %s <%s>\\n\"", + name, mail); + + sci_start_undo_action (doc->editor->sci); + regex_replace (doc->editor->sci, "^\"PO-Revision-Date: .*\"$", date); + regex_replace (doc->editor->sci, "^\"Last-Translator: .*\"$", translator); + sci_end_undo_action (doc->editor->sci); + + g_free (date); + g_free (translator); + g_free (name); + g_free (mail); + } +} + +static void +update_menus (GeanyDocument *doc) +{ + if (plugin.menu_item) { + gtk_widget_set_sensitive (plugin.menu_item, doc_is_po (doc)); + } +} + +static void +on_document_activate (GObject *obj, + GeanyDocument *doc, + gpointer user_data) +{ + update_menus (doc); +} + +static void +on_document_filetype_set (GObject *obj, + GeanyDocument *doc, + GeanyFiletype *old_ft, + gpointer user_data) +{ + update_menus (doc); +} + +static void +on_document_close (GObject *obj, + GeanyDocument *doc, + gpointer user_data) +{ + update_menus (NULL); +} + +static void +on_kb_goto_prev (guint key_id) +{ + goto_prev (document_get_current ()); +} + +static void +on_kb_goto_next (guint key_id) +{ + goto_next (document_get_current ()); +} + +static void +on_kb_goto_prev_untranslated (guint key_id) +{ + goto_prev_untranslated (document_get_current ()); +} + +static void +on_kb_goto_next_untranslated (guint key_id) +{ + goto_next_untranslated (document_get_current ()); +} + +static void +on_kb_goto_prev_fuzzy (guint key_id) +{ + goto_prev_fuzzy (document_get_current ()); +} + +static void +on_kb_goto_next_fuzzy (guint key_id) +{ + goto_next_fuzzy (document_get_current ()); +} + +static void +on_kb_goto_prev_untranslated_or_fuzzy (guint key_id) +{ + goto_prev_untranslated_or_fuzzy (document_get_current ()); +} + +static void +on_kb_goto_next_untranslated_or_fuzzy (guint key_id) +{ + goto_next_untranslated_or_fuzzy (document_get_current ()); +} + +/* + * on_kb_paste_untranslated: + * @key_id: unused + * + * Replaces the msgstr at the current position with it corresponding msgid. + */ +static void +on_kb_paste_untranslated (guint key_id) +{ + GeanyDocument *doc = document_get_current (); + + if (doc_is_po (doc)) { + ScintillaObject *sci = doc->editor->sci; + gint pos = sci_get_current_position (sci); + gint style = sci_get_style_at (sci, pos); + + while (pos > 0 && style == SCE_PO_DEFAULT) { + style = sci_get_style_at (sci, --pos); + } + + if (style == SCE_PO_MSGID_TEXT || + style == SCE_PO_MSGSTR || + style == SCE_PO_MSGSTR_TEXT) { + pos = find_style (sci, SCE_PO_MSGID, pos, 0); + if (pos >= 0) + style = SCE_PO_MSGID; + } + + if (style == SCE_PO_MSGID) { + gint start = find_style (sci, SCE_PO_MSGID_TEXT, + pos, sci_get_length (sci)); + + if (start >= 0) { + gchar *msgid; + gint end = start; + + /* find msgid range and copy it */ + for (pos = start + 1; pos < sci_get_length (sci); pos++) { + style = sci_get_style_at (sci, pos); + if (style == SCE_PO_MSGID_TEXT) + end = pos; + else if (style != SCE_PO_DEFAULT) + break; + } + + if (end - start <= 2 /* 2 is because we include the quotes */) { + /* don't allow replacing the header (empty) msgid */ + } else { + msgid = sci_get_contents_range (sci, start, end); + + start = find_style (sci, SCE_PO_MSGSTR_TEXT, end, + sci_get_length (sci)); + if (start >= 0) { + /* find msgstr range and replace it */ + end = start; + sci_set_target_start (sci, start); + for (pos = start; pos < sci_get_length (sci); pos++) { + style = sci_get_style_at (sci, pos); + if (style == SCE_PO_MSGSTR_TEXT) + end = pos; + else if (style != SCE_PO_DEFAULT) + break; + } + sci_set_target_end (sci, end); + sci_replace_target (sci, msgid, FALSE); + scintilla_send_message (sci, SCI_GOTOPOS, (uptr_t) start + 1, 0); + } + g_free (msgid); + } + } + } + } +} + +/* finds the start of the msgstr text at @pos. the returned position is the + * start of the msgstr text style, so it's on the first opening quote. Returns + * -1 if none found */ +static gint +find_msgstr_start_at (GeanyDocument *doc, + gint pos) +{ + if (doc_is_po (doc)) { + ScintillaObject *sci = doc->editor->sci; + gint style = sci_get_style_at (sci, pos); + + /* find the previous non-default style */ + while (pos > 0 && style == SCE_PO_DEFAULT) { + style = sci_get_style_at (sci, --pos); + } + + /* if a msgid or msgstr, go to the msgstr keyword */ + if (style == SCE_PO_MSGID || + style == SCE_PO_MSGID_TEXT || + style == SCE_PO_MSGSTR_TEXT) { + pos = find_style (sci, SCE_PO_MSGSTR, pos, + style == SCE_PO_MSGSTR_TEXT ? 0 : sci_get_length (sci)); + if (pos >= 0) + style = SCE_PO_MSGSTR; + } + + if (style == SCE_PO_MSGSTR) { + return find_style (sci, SCE_PO_MSGSTR_TEXT, pos, sci_get_length (sci)); + } + } + + return -1; +} + +/* like find_msgstr_start_at() but finds the end rather than the start */ +static gint +find_msgstr_end_at (GeanyDocument *doc, + gint pos) +{ + pos = find_msgstr_start_at (doc, pos); + if (pos >= 0) { + ScintillaObject *sci = doc->editor->sci; + gint end = pos; + + for (; pos < sci_get_length (sci); pos++) { + gint style = sci_get_style_at (sci, pos); + + if (style == SCE_PO_MSGSTR_TEXT) + end = pos; + else if (style != SCE_PO_DEFAULT) + break; + } + + return end; + } + + return -1; +} + +static GString * +get_msgstr_text_at (GeanyDocument *doc, + gint pos) +{ + pos = find_msgstr_start_at (doc, pos); + + if (pos >= 0) { + ScintillaObject *sci = doc->editor->sci; + GString *msgstr = g_string_new (NULL); + + while (sci_get_style_at (sci, pos) == SCE_PO_MSGSTR_TEXT) { + pos++; /* skip opening quote */ + while (sci_get_style_at (sci, pos + 1) == SCE_PO_MSGSTR_TEXT) { + g_string_append_c (msgstr, sci_get_char_at (sci, pos)); + pos++; + } + pos++; /* skip closing quote */ + + /* skip until next non-default style */ + while (sci_get_style_at (sci, pos) == SCE_PO_DEFAULT) { + pos++; + } + } + + return msgstr; + } + + return NULL; +} + +/* cuts @str in human-readable chunks for max @len. + * cuts first at \n, then at spaces and punctuation */ +static gchar ** +split_msg (const gchar *str, + gsize len) +{ + GPtrArray *chunks = g_ptr_array_new (); + + while (*str) { + GString *chunk = g_string_sized_new (len); + + while (*str) { + const gchar *nl = strstr (str, "\\n"); + const gchar *p = strpbrk (str, " \t\v\r\n?!,.;:"); + glong chunk_len = g_utf8_strlen (chunk->str, (gssize) chunk->len); + + if (nl) + nl += 2; + + if (p) + p++; + else /* if there is no separator, use the end of the string */ + p = strchr (str, 0); + + if (nl && ((gsize)(chunk_len + g_utf8_strlen (str, nl - str)) <= len || + (nl < p && chunk->len == 0))) { + g_string_append_len (chunk, str, nl - str); + str = nl; + break; + } else if ((gsize)(chunk_len + g_utf8_strlen (str, p - str)) <= len || + chunk->len == 0) { + g_string_append_len (chunk, str, p - str); + str = p; + } else { + /* give up and leave to next chunk */ + break; + } + } + g_ptr_array_add (chunks, g_string_free (chunk, FALSE)); + } + + g_ptr_array_add (chunks, NULL); + + return (gchar **) g_ptr_array_free (chunks, FALSE); +} + +static void +on_kb_reflow (guint key_id) +{ + GeanyDocument *doc = document_get_current (); + + if (doc_is_po (doc)) { + ScintillaObject *sci = doc->editor->sci; + gint pos = sci_get_current_position (sci); + GString *msgstr = get_msgstr_text_at (doc, pos); + + if (msgstr) { + gint start = find_msgstr_start_at (doc, pos); + gint end = find_msgstr_end_at (doc, pos); + glong len = g_utf8_strlen (msgstr->str, (gssize) msgstr->len); + /* FIXME: line_break_column isn't supposedly public */ + gint line_len = geany_data->editor_prefs->line_break_column; + gint msgstr_kw_len; + + /* if line break column doesn't have a reasonable value, don't use it */ + if (line_len < 8) { + line_len = 72; + } + + sci_start_undo_action (sci); + scintilla_send_message (sci, SCI_DELETERANGE, + (uptr_t) start, end + 1 - start); + + msgstr_kw_len = start - sci_get_position_from_line (sci, sci_get_line_from_position (sci, start)); + if (msgstr_kw_len + len + 2 <= line_len) { + /* if all can go in the msgstr line, put it here */ + gchar *text = g_strconcat ("\"", msgstr->str, "\"", NULL); + sci_insert_text (sci, start, text); + g_free (text); + } else { + /* otherwise, put nothing on the msgstr line and split it up through + * next ones */ + gchar **chunks = split_msg (msgstr->str, (gsize)(line_len - 2)); + guint i; + + sci_insert_text (sci, start, "\"\""); /* nothing on the msgstr line */ + start += 2; + for (i = 0; chunks[i]; i++) { + SETPTR (chunks[i], g_strconcat ("\n\"", chunks[i], "\"", NULL)); + sci_insert_text (sci, start, chunks[i]); + start += (gint) strlen (chunks[i]); + } + + g_strfreev (chunks); + } + + scintilla_send_message (sci, SCI_GOTOPOS, (uptr_t) (start + 1), 0); + sci_end_undo_action (sci); + + g_string_free (msgstr, TRUE); + } + } +} + +/* returns the first non-default style on the line, or the default style if + * there is no other on that line */ +static gint +find_first_non_default_style_on_line (ScintillaObject *sci, + gint line) +{ + gint pos = sci_get_position_from_line (sci, line); + gint end = sci_get_line_end_position (sci, line); + gint style; + + do { + style = sci_get_style_at (sci, pos++); + } while (style == SCE_PO_DEFAULT && pos < end); + + return style; +} + +/* checks whether @line is a primary msgid line, e.g. not a plural form */ +static gboolean +line_is_primary_msgid (ScintillaObject *sci, + gint line) +{ + gint pos = (gint) scintilla_send_message (sci, SCI_GETLINEINDENTPOSITION, + (uptr_t) line, 0); + + return (sci_get_char_at (sci, pos++) == 'm' && + sci_get_char_at (sci, pos++) == 's' && + sci_get_char_at (sci, pos++) == 'g' && + sci_get_char_at (sci, pos++) == 'i' && + sci_get_char_at (sci, pos++) == 'd' && + g_ascii_isspace (sci_get_char_at (sci, pos))); +} + +/* parse flags line @line and puts the read flags in @flags + * a flags line looks like: + * #, flag-1, flag-2, flag-2, ... */ +static void +parse_flags_line (ScintillaObject *sci, + gint line, + GPtrArray *flags) +{ + gint start = sci_get_position_from_line (sci, line); + gint end = sci_get_line_end_position (sci, line); + gint pos; + gint ws, we; + gint ch; + + pos = start; + /* skip leading space and markers */ + while (pos <= end && ((ch = sci_get_char_at (sci, pos)) == '#' || + ch == ',' || g_ascii_isspace (ch))) { + pos++; + } + /* and read the flags */ + for (ws = we = pos; pos <= end; pos++) { + ch = sci_get_char_at (sci, pos); + + if (ch == ',' || g_ascii_isspace (ch) || pos >= end) { + if (ws < we) { + g_ptr_array_add (flags, sci_get_contents_range (sci, ws, we + 1)); + } + ws = pos + 1; + } else { + we = pos; + } + } +} + +/* adds or remove @flag from @flags. returns whether the flag was added */ +static gboolean +toggle_flag (GPtrArray *flags, + const gchar *flag) +{ + gboolean add = TRUE; + guint i; + + /* search for the flag and remove it */ + for (i = 0; i < flags->len; i++) { + if (strcmp (g_ptr_array_index (flags, i), flag) == 0) { + g_ptr_array_remove_index (flags, i); + add = FALSE; + break; + } + } + /* if it wasntt there, add it */ + if (add) { + g_ptr_array_add (flags, g_strdup (flag)); + } + + return add; +} + +/* writes a flags line at @pos containgin @flags */ +static void +write_flags (ScintillaObject *sci, + gint pos, + GPtrArray *flags) +{ + if (flags->len > 0) { + guint i; + + sci_start_undo_action (sci); + sci_insert_text (sci, pos, "#"); + pos ++; + for (i = 0; i < flags->len; i++) { + const gchar *flag = g_ptr_array_index (flags, i); + + sci_insert_text (sci, pos, ", "); + pos += 2; + sci_insert_text (sci, pos, flag); + pos += (gint) strlen (flag); + } + sci_insert_text (sci, pos, "\n"); + sci_end_undo_action (sci); + } +} + +static void +delete_line (ScintillaObject *sci, + gint line) +{ + gint pos = sci_get_position_from_line (sci, line); + gint length = sci_get_line_length (sci, line); + + scintilla_send_message (sci, SCI_DELETERANGE, (uptr_t) pos, (sptr_t) length); +} + +static void +on_kb_toggle_fuzziness (guint key_id) +{ + GeanyDocument *doc = document_get_current (); + + if (doc_is_po (doc)) { + ScintillaObject *sci = doc->editor->sci; + gint pos = sci_get_current_position (sci); + gint line = sci_get_line_from_position (sci, pos); + gint style = find_first_non_default_style_on_line (sci, line); + + /* find the msgid for the current line */ + while (line > 0 && + (style == SCE_PO_DEFAULT || + (style == SCE_PO_MSGID && ! line_is_primary_msgid (sci, line)) || + style == SCE_PO_MSGID_TEXT || + style == SCE_PO_MSGSTR || + style == SCE_PO_MSGSTR_TEXT)) { + line--; + style = find_first_non_default_style_on_line (sci, line); + } + while (line < sci_get_line_count (sci) && + (style == SCE_PO_COMMENT || + style == SCE_PO_PROGRAMMER_COMMENT || + style == SCE_PO_REFERENCE || + style == SCE_PO_FLAGS || + style == SCE_PO_FUZZY)) { + line++; + style = find_first_non_default_style_on_line (sci, line); + } + + if (style == SCE_PO_MSGID) { + gint msgid_line = line; + GPtrArray *flags = g_ptr_array_new (); + + sci_start_undo_action (sci); + + if (line > 0) { + /* search for an existing flags line */ + do { + line--; + style = find_first_non_default_style_on_line (sci, line); + } while (line > 0 && + (style == SCE_PO_COMMENT || + style == SCE_PO_PROGRAMMER_COMMENT || + style == SCE_PO_REFERENCE)); + + if (style == SCE_PO_FLAGS || style == SCE_PO_FUZZY) { + /* ok we got a line with flags, parse them and remove them */ + parse_flags_line (sci, line, flags); + delete_line (sci, line); + } else { + /* no flags, add the line */ + line = msgid_line; + } + } + + toggle_flag (flags, "fuzzy"); + write_flags (sci, sci_get_position_from_line (sci, line), flags); + + sci_end_undo_action (sci); + + g_ptr_array_foreach (flags, (GFunc) g_free, NULL); + g_ptr_array_free (flags, TRUE); + } + } +} + +static const struct Action { + guint id; + const gchar *name; + GeanyKeyCallback callback; + const gchar *label; + const gchar *widget; +} G_actions[] = { + { GPH_KB_GOTO_PREV, "goto-prev", + on_kb_goto_prev, + N_("Go to previous string"), "previous_string" }, + { GPH_KB_GOTO_NEXT, "goto-next", + on_kb_goto_next, + N_("Go to next string"), "next_string" }, + { GPH_KB_GOTO_PREV_UNTRANSLATED, "goto-prev-untranslated", + on_kb_goto_prev_untranslated, + N_("Go to previous untranslated string"), "previous_untranslated" }, + { GPH_KB_GOTO_NEXT_UNTRANSLATED, "goto-next-untranslated", + on_kb_goto_next_untranslated, + N_("Go to next untranslated string"), "next_untranslated" }, + { GPH_KB_GOTO_PREV_FUZZY, "goto-prev-fuzzy", + on_kb_goto_prev_fuzzy, + N_("Go to previous fuzzily translated string"), "previous_fuzzy" }, + { GPH_KB_GOTO_NEXT_FUZZY, "goto-next-fuzzy", + on_kb_goto_next_fuzzy, + N_("Go to next fuzzily translated string"), "next_fuzzy" }, + { GPH_KB_GOTO_PREV_UNTRANSLATED_OR_FUZZY, "goto-prev-untranslated-or-fuzzy", + on_kb_goto_prev_untranslated_or_fuzzy, + N_("Go to previous untranslated or fuzzy string"), + "previous_untranslated_or_fuzzy" }, + { GPH_KB_GOTO_NEXT_UNTRANSLATED_OR_FUZZY, "goto-next-untranslated-or-fuzzy", + on_kb_goto_next_untranslated_or_fuzzy, + N_("Go to next untranslated or fuzzy string"), + "next_untranslated_or_fuzzy" }, + { GPH_KB_PASTE_UNTRANSLATED, "paste-untranslated", + on_kb_paste_untranslated, + N_("Paste original untranslated string to translation"), + "paste_message_as_translation" }, + { GPH_KB_REFLOW, "reflow", + on_kb_reflow, + N_("Reflow the current translation string"), "reflow_translation" }, + { GPH_KB_TOGGLE_FUZZY, "toggle-fuzziness", + on_kb_toggle_fuzziness, + N_("Toggle current translation fuzziness"), "toggle_fuzziness" } +}; + +static void +on_widget_kb_activate (GtkMenuItem *widget, + struct Action *action) +{ + action->callback (action->id); +} + +static void +on_update_headers_upon_save_toggled (GtkCheckMenuItem *item, + gpointer data) +{ + plugin.update_headers = gtk_check_menu_item_get_active (item); +} + +static gchar * +get_config_filename (void) +{ + return g_build_filename (geany_data->app->configdir, "plugins", + "pohelper", "pohelper.conf", NULL); +} + +/* loads @filename in @kf and return %FALSE if failed, emitting a warning + * unless the file was simply missing */ +static gboolean +load_keyfile (GKeyFile *kf, + const gchar *filename, + GKeyFileFlags flags) +{ + GError *error = NULL; + + if (! g_key_file_load_from_file (kf, filename, flags, &error)) { + if (error->domain != G_FILE_ERROR || error->code != G_FILE_ERROR_NOENT) { + g_warning (_("Failed to load configuration file: %s"), error->message); + } + g_error_free (error); + + return FALSE; + } + + return TRUE; +} + +/* writes @kf in @filename, possibly creating directories to be able to write + * in @filename */ +static gboolean +write_keyfile (GKeyFile *kf, + const gchar *filename) +{ + gchar *dirname = g_path_get_dirname (filename); + GError *error = NULL; + gint err; + gchar *data; + gsize length; + gboolean success = FALSE; + + data = g_key_file_to_data (kf, &length, NULL); + if ((err = utils_mkdir (dirname, TRUE)) != 0) { + g_critical (_("Failed to create configuration directory \"%s\": %s"), + dirname, g_strerror (err)); + } else if (! g_file_set_contents (filename, data, (gssize) length, &error)) { + g_critical (_("Failed to save configuration file: %s"), error->message); + g_error_free (error); + } else { + success = TRUE; + } + g_free (data); + g_free (dirname); + + return success; +} + +static void +load_config (void) +{ + gchar *filename = get_config_filename (); + GKeyFile *kf = g_key_file_new (); + + if (load_keyfile (kf, filename, G_KEY_FILE_NONE)) { + plugin.update_headers = utils_get_setting_boolean (kf, "general", + "update-headers", + plugin.update_headers); + } + g_key_file_free (kf); + g_free (filename); +} + +static void +save_config (void) +{ + gchar *filename = get_config_filename (); + GKeyFile *kf = g_key_file_new (); + + load_keyfile (kf, filename, G_KEY_FILE_KEEP_COMMENTS); + g_key_file_set_boolean (kf, "general", "update-headers", + plugin.update_headers); + write_keyfile (kf, filename); + + g_key_file_free (kf); + g_free (filename); +} + +void +plugin_init (GeanyData *data) +{ + GeanyKeyGroup *group; + GtkBuilder *builder; + GError *error = NULL; + guint i; + + load_config (); + + builder = gtk_builder_new (); + gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE); + if (! gtk_builder_add_from_file (builder, PKGDATADIR"/pohelper/menus.ui", + &error)) { + g_critical (_("Failed to load UI definition, please check your " + "installation. The error was: %s"), error->message); + g_error_free (error); + g_object_unref (builder); + builder = NULL; + plugin.menu_item = NULL; + } else { + GObject *obj; + + plugin.menu_item = GTK_WIDGET (gtk_builder_get_object (builder, "root_item")); + gtk_menu_shell_append (GTK_MENU_SHELL (geany->main_widgets->tools_menu), + plugin.menu_item); + + obj = gtk_builder_get_object (builder, "update_headers_upon_save"); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (obj), + plugin.update_headers); + g_signal_connect (obj, "toggled", + G_CALLBACK (on_update_headers_upon_save_toggled), NULL); + } + + /* signal handlers */ + plugin_signal_connect (geany_plugin, NULL, "document-activate", TRUE, + G_CALLBACK (on_document_activate), NULL); + plugin_signal_connect (geany_plugin, NULL, "document-filetype-set", TRUE, + G_CALLBACK (on_document_filetype_set), NULL); + plugin_signal_connect (geany_plugin, NULL, "document-close", TRUE, + G_CALLBACK (on_document_close), NULL); + plugin_signal_connect (geany_plugin, NULL, "document-before-save", TRUE, + G_CALLBACK (on_document_save), NULL); + + /* add keybindings */ + group = plugin_set_key_group (geany_plugin, "pohelper", GPH_KB_COUNT, NULL); + + for (i = 0; i < G_N_ELEMENTS (G_actions); i++) { + GtkWidget *widget = NULL; + + if (builder && G_actions[i].widget) { + GObject *obj = gtk_builder_get_object (builder, G_actions[i].widget); + + if (! obj || ! GTK_IS_MENU_ITEM (obj)) { + g_critical (_("Cannot find widget \"%s\" in the UI definition, " + "please check your installation."), G_actions[i].widget); + } else { + widget = GTK_WIDGET (obj); + g_signal_connect (widget, "activate", + G_CALLBACK (on_widget_kb_activate), + (gpointer) &G_actions[i]); + } + } + + keybindings_set_item (group, G_actions[i].id, G_actions[i].callback, 0, 0, + G_actions[i].name, _(G_actions[i].label), widget); + } + + if (builder) { + g_object_unref (builder); + } +} + +void +plugin_cleanup (void) +{ + if (plugin.menu_item) { + gtk_widget_destroy (plugin.menu_item); + } + + save_config (); +} diff -Nru geany-plugins-1.23+dfsg/pohelper/src/Makefile.am geany-plugins-1.24+dfsg/pohelper/src/Makefile.am --- geany-plugins-1.23+dfsg/pohelper/src/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pohelper/src/Makefile.am 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,13 @@ +include $(top_srcdir)/build/vars.build.mk +plugin = pohelper + +geanyplugins_LTLIBRARIES = pohelper.la + + +pohelper_la_SOURCES = gph-plugin.c +pohelper_la_CPPFLAGS = $(AM_CPPFLAGS) \ + -DG_LOG_DOMAIN=\"PoHelper\" +pohelper_la_CFLAGS = $(AM_CFLAGS) +pohelper_la_LIBADD = $(COMMONLIBS) + +include $(top_srcdir)/build/cppcheck.mk diff -Nru geany-plugins-1.23+dfsg/pohelper/src/Makefile.in geany-plugins-1.24+dfsg/pohelper/src/Makefile.in --- geany-plugins-1.23+dfsg/pohelper/src/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pohelper/src/Makefile.in 2014-04-13 17:12:45.000000000 +0000 @@ -0,0 +1,817 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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 \ + *\\[\ \ ]*) \ + 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; \ + 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@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp +subdir = pohelper/src +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ + $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ + $(top_srcdir)/build/cppcheck.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ + $(top_srcdir)/build/geanydoc.m4 \ + $(top_srcdir)/build/geanyextrasel.m4 \ + $(top_srcdir)/build/geanygendoc.m4 \ + $(top_srcdir)/build/geanyinsertnum.m4 \ + $(top_srcdir)/build/geanylatex.m4 \ + $(top_srcdir)/build/geanylipsum.m4 \ + $(top_srcdir)/build/geanylua.m4 \ + $(top_srcdir)/build/geanymacro.m4 \ + $(top_srcdir)/build/geanyminiscript.m4 \ + $(top_srcdir)/build/geanynumberedbookmarks.m4 \ + $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ + $(top_srcdir)/build/geanysendmail.m4 \ + $(top_srcdir)/build/geanyvc.m4 \ + $(top_srcdir)/build/geniuspaste.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ + $(top_srcdir)/build/pretty-printer.m4 \ + $(top_srcdir)/build/scope.m4 \ + $(top_srcdir)/build/shiftcolumn.m4 \ + $(top_srcdir)/build/spellcheck.m4 \ + $(top_srcdir)/build/status.m4 \ + $(top_srcdir)/build/tableconvert.m4 \ + $(top_srcdir)/build/treebrowser.m4 \ + $(top_srcdir)/build/unittests.m4 \ + $(top_srcdir)/build/updatechecker.m4 \ + $(top_srcdir)/build/webhelper.m4 \ + $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ + $(top_srcdir)/build/cache/glib-gettext.m4 \ + $(top_srcdir)/build/cache/intltool.m4 \ + $(top_srcdir)/build/cache/libtool.m4 \ + $(top_srcdir)/build/cache/ltoptions.m4 \ + $(top_srcdir)/build/cache/ltsugar.m4 \ + $(top_srcdir)/build/cache/ltversion.m4 \ + $(top_srcdir)/build/cache/lt~obsolete.m4 \ + $(top_srcdir)/build/cache/nls.m4 \ + $(top_srcdir)/build/cache/pkg.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +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__installdirs = "$(DESTDIR)$(geanypluginsdir)" +LTLIBRARIES = $(geanyplugins_LTLIBRARIES) +am__DEPENDENCIES_1 = +am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +pohelper_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_pohelper_la_OBJECTS = pohelper_la-gph-plugin.lo +pohelper_la_OBJECTS = $(am_pohelper_la_OBJECTS) +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 = +pohelper_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(pohelper_la_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 +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +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_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_CCLD_1 = +SOURCES = $(pohelper_la_SOURCES) +DIST_SOURCES = $(pohelper_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + 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 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ +COMMANDER_CFLAGS = @COMMANDER_CFLAGS@ +COMMANDER_LIBS = @COMMANDER_LIBS@ +CPP = @CPP@ +CPPCHECK = @CPPCHECK@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ +DEVHELP_LIBS = @DEVHELP_LIBS@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENCHANT_CFLAGS = @ENCHANT_CFLAGS@ +ENCHANT_LIBS = @ENCHANT_LIBS@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GEANYGENDOC_CFLAGS = @GEANYGENDOC_CFLAGS@ +GEANYGENDOC_LIBS = @GEANYGENDOC_LIBS@ +GEANY_CFLAGS = @GEANY_CFLAGS@ +GEANY_LIBS = @GEANY_LIBS@ +GEANY_VERSION = @GEANY_VERSION@ +GENIUSPASTE_CFLAGS = @GENIUSPASTE_CFLAGS@ +GENIUSPASTE_LIBS = @GENIUSPASTE_LIBS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GPGME_CFLAGS = @GPGME_CFLAGS@ +GPGME_CONFIG = @GPGME_CONFIG@ +GPGME_LIBS = @GPGME_LIBS@ +GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ +GREP = @GREP@ +GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ +GTKSPELL_LIBS = @GTKSPELL_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBMARKDOWN_CFLAGS = @LIBMARKDOWN_CFLAGS@ +LIBMARKDOWN_LIBS = @LIBMARKDOWN_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCALEDIR = @LOCALEDIR@ +LTLIBOBJS = @LTLIBOBJS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_LIBS = @LUA_LIBS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MARKDOWN_CFLAGS = @MARKDOWN_CFLAGS@ +MARKDOWN_LIBS = @MARKDOWN_LIBS@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +MULTITERM_CFLAGS = @MULTITERM_CFLAGS@ +MULTITERM_LIBS = @MULTITERM_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +RST2HTML = @RST2HTML@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +UPDATECHECKER_CFLAGS = @UPDATECHECKER_CFLAGS@ +UPDATECHECKER_LIBS = @UPDATECHECKER_LIBS@ +USE_NLS = @USE_NLS@ +VALAC = @VALAC@ +VERSION = @VERSION@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ +WEBHELPER_CFLAGS = @WEBHELPER_CFLAGS@ +WEBHELPER_LIBS = @WEBHELPER_LIBS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +geanypluginsdir = @geanypluginsdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AM_CFLAGS = \ + -DLOCALEDIR=\""$(LOCALEDIR)"\" \ + -DPREFIX=\""$(prefix)"\" \ + -DDOCDIR=\""$(docdir)"\" \ + -DGEANYPLUGINS_DATADIR=\""$(datadir)"\" \ + -DPKGDATADIR=\""$(pkgdatadir)"\" \ + -DLIBDIR=\""$(libdir)"\" \ + -DPKGLIBDIR=\""$(pkglibdir)"\" \ + $(GEANY_CFLAGS) \ + $(GP_CFLAGS) + +AM_LDFLAGS = -module -avoid-version +COMMONLIBS = \ + $(GEANY_LIBS) \ + $(INTLLIBS) + +plugin = pohelper +geanyplugins_LTLIBRARIES = pohelper.la +pohelper_la_SOURCES = gph-plugin.c +pohelper_la_CPPFLAGS = $(AM_CPPFLAGS) \ + -DG_LOG_DOMAIN=\"PoHelper\" + +pohelper_la_CFLAGS = $(AM_CFLAGS) +pohelper_la_LIBADD = $(COMMONLIBS) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/vars.build.mk $(top_srcdir)/build/cppcheck.mk $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pohelper/src/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign pohelper/src/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + 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/vars.build.mk $(top_srcdir)/build/cppcheck.mk: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(geanypluginsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(geanypluginsdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(geanypluginsdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(geanypluginsdir)"; \ + } + +uninstall-geanypluginsLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(geanypluginsdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(geanypluginsdir)/$$f"; \ + done + +clean-geanypluginsLTLIBRARIES: + -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) + @list='$(geanyplugins_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}; \ + } + +pohelper.la: $(pohelper_la_OBJECTS) $(pohelper_la_DEPENDENCIES) $(EXTRA_pohelper_la_DEPENDENCIES) + $(AM_V_CCLD)$(pohelper_la_LINK) -rpath $(geanypluginsdir) $(pohelper_la_OBJECTS) $(pohelper_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pohelper_la-gph-plugin.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@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 -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 -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +pohelper_la-gph-plugin.lo: gph-plugin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pohelper_la_CPPFLAGS) $(CPPFLAGS) $(pohelper_la_CFLAGS) $(CFLAGS) -MT pohelper_la-gph-plugin.lo -MD -MP -MF $(DEPDIR)/pohelper_la-gph-plugin.Tpo -c -o pohelper_la-gph-plugin.lo `test -f 'gph-plugin.c' || echo '$(srcdir)/'`gph-plugin.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pohelper_la-gph-plugin.Tpo $(DEPDIR)/pohelper_la-gph-plugin.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gph-plugin.c' object='pohelper_la-gph-plugin.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pohelper_la_CPPFLAGS) $(CPPFLAGS) $(pohelper_la_CFLAGS) $(CFLAGS) -c -o pohelper_la-gph-plugin.lo `test -f 'gph-plugin.c' || echo '$(srcdir)/'`gph-plugin.c + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +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 + +GTAGS: + 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 + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@HAVE_CPPCHECK_FALSE@check-local: +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(geanypluginsdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-geanypluginsLTLIBRARIES clean-generic clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-geanypluginsLTLIBRARIES + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-geanypluginsLTLIBRARIES + +.MAKE: check-am install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ + clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES + + +@HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) + +@HAVE_CPPCHECK_TRUE@check-local: check-cppcheck + +# 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. +.NOEXPORT: diff -Nru geany-plugins-1.23+dfsg/pohelper/wscript_build geany-plugins-1.24+dfsg/pohelper/wscript_build --- geany-plugins-1.23+dfsg/pohelper/wscript_build 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pohelper/wscript_build 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - Translation Helper +# +# Copyright 2010 Enrico Tröger +# Copyright 2013 Colomban Wendling +# +# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + +from build.wafutils import build_plugin, target_is_win32 + + +name = 'PoHelper' + +sources = ['src/gph-plugin.c'] +includes = ['src'] + +build_plugin(bld, name, + sources=sources, + includes=includes) + +# install UI file +prefix = '${G_PREFIX}/' if target_is_win32(bld) else '' +datadir = '${GEANYPLUGINS_DATADIR}/geany-plugins/%s' % (name.lower()) +bld.install_files('%s%s' % (prefix, datadir), 'data/menus.ui') diff -Nru geany-plugins-1.23+dfsg/pohelper/wscript_configure geany-plugins-1.24+dfsg/pohelper/wscript_configure --- geany-plugins-1.23+dfsg/pohelper/wscript_configure 1970-01-01 00:00:00.000000000 +0000 +++ geany-plugins-1.24+dfsg/pohelper/wscript_configure 2013-06-30 11:40:06.000000000 +0000 @@ -0,0 +1 @@ + diff -Nru geany-plugins-1.23+dfsg/pretty-printer/Makefile.in geany-plugins-1.24+dfsg/pretty-printer/Makefile.in --- geany-plugins-1.23+dfsg/pretty-printer/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/pretty-printer/Makefile.in 2014-04-13 17:12:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ # include $(top_srcdir)/build/vars.auxfiles.mk VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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,14 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = pretty-printer -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -73,12 +103,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -90,6 +123,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -105,21 +139,28 @@ 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;; \ @@ -127,9 +168,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 = $(SUBDIRS) @@ -164,6 +225,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -182,6 +245,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -217,6 +282,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -283,6 +351,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -397,22 +475,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; \ @@ -427,57 +508,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 \ @@ -493,12 +529,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; \ @@ -510,15 +541,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 @@ -527,6 +554,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 @@ -687,22 +729,20 @@ 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 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru geany-plugins-1.23+dfsg/pretty-printer/src/ConfigUI.c geany-plugins-1.24+dfsg/pretty-printer/src/ConfigUI.c --- geany-plugins-1.23+dfsg/pretty-printer/src/ConfigUI.c 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/pretty-printer/src/ConfigUI.c 2013-06-30 11:40:06.000000000 +0000 @@ -50,7 +50,7 @@ PrettyPrintingOptions* prettyPrintingOptions; /* Will never be used, just here for example */ -GtkWidget* createPrettyPrinterConfigUI(GtkDialog * dialog) +GtkWidget* createPrettyPrinterConfigUI(GtkDialog * dialog) { PrettyPrintingOptions* ppo; GtkWidget* container; @@ -62,13 +62,13 @@ GtkWidget* emptyOptions; GtkWidget* indentationOptions; GtkWidget* lineReturnOptions; - + /* default printing options */ if (prettyPrintingOptions == NULL) { prettyPrintingOptions = createDefaultPrettyPrintingOptions(); } ppo = prettyPrintingOptions; container = gtk_hbox_new(FALSE, 10); - + leftBox = gtk_vbox_new(FALSE, 6); commentOptions = createThreeOptionsBox(_("Comments"), _("Put on one line"), _("Inline if possible"), _("Alignment"), ppo->oneLineComment, ppo->inlineComment, ppo->alignComment, &commentOneLine, &commentInline, &commentAlign); textOptions = createThreeOptionsBox(_("Text nodes"), _("Put on one line"), _("Inline if possible"), _("Alignment"), ppo->oneLineText, ppo->inlineText, ppo->alignText, &textOneLine, &textInline, &textAlign); @@ -80,7 +80,7 @@ gtk_box_pack_start(GTK_BOX(leftBox), commentOptions, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(leftBox), textOptions, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(leftBox), cdataOptions, FALSE, FALSE, 3); - + rightBox = gtk_vbox_new(FALSE, 6); gtk_box_pack_start(GTK_BOX(rightBox), emptyOptions, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(rightBox), indentationOptions, FALSE, FALSE, 3); @@ -97,26 +97,26 @@ { int breakStyle; PrettyPrintingOptions* ppo = prettyPrintingOptions; - + ppo->oneLineComment = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(commentOneLine)); ppo->inlineComment = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(commentInline)); ppo->alignComment = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(commentAlign)); - + ppo->oneLineText = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(textOneLine)); ppo->inlineText = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(textInline)); ppo->alignText = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(textAlign)); - + ppo->oneLineCdata = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cdataOneLine)); ppo->inlineCdata = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cdataInline)); ppo->alignCdata = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cdataAlign)); - + ppo->emptyNodeStripping = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(emptyNodeStripping)); ppo->emptyNodeStrippingSpace = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(emptyNodeStrippingSpace)); ppo->forceEmptyNodeSplit = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(emptyNodeSplit)); - + ppo->indentLength = gtk_spin_button_get_value(GTK_SPIN_BUTTON(indentationCount)); ppo->indentChar = gtk_combo_box_get_active(GTK_COMBO_BOX(indentationChar))==0 ? '\t' : ' '; - + breakStyle = gtk_combo_box_get_active(GTK_COMBO_BOX(lineBreak)); if (breakStyle == 0) ppo->newLineChars = "\r"; else if (breakStyle == 1) ppo->newLineChars = "\n"; @@ -125,74 +125,74 @@ /*============================================= PRIVATE FUNCTIONS =======================================*/ -/*GtkWidget* createTwoOptionsBox(const char* label, - const char* checkBox1, - const char* checkBox2, - gboolean cb1Active, - gboolean cb2Active, - GtkWidget** option1, +/*GtkWidget* createTwoOptionsBox(const char* label, + const char* checkBox1, + const char* checkBox2, + gboolean cb1Active, + gboolean cb2Active, + GtkWidget** option1, GtkWidget** option2) { GtkWidget* container = gtk_hbox_new(TRUE, 2); GtkWidget* rightBox = gtk_vbox_new(FALSE, 6); GtkWidget* leftBox = gtk_vbox_new(FALSE, 6); - + GtkWidget* lbl = gtk_label_new(label); GtkWidget* chb1 = gtk_check_button_new_with_label(checkBox1); GtkWidget* chb2 = gtk_check_button_new_with_label(checkBox2); - + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chb1), cb1Active); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chb2), cb2Active); - + gtk_box_pack_start(GTK_BOX(container), leftBox, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(container), rightBox, FALSE, FALSE, 3); - + gtk_box_pack_start(GTK_BOX(leftBox), lbl, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(rightBox), chb1, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(rightBox), chb2, FALSE, FALSE, 3); - + *option1 = chb1; *option2 = chb2; - + return container; }*/ -static GtkWidget* createThreeOptionsBox(const char* label, - const char* checkBox1, - const char* checkBox2, - const char* checkBox3, - gboolean cb1Active, - gboolean cb2Active, - gboolean cb3Active, - GtkWidget** option1, - GtkWidget** option2, +static GtkWidget* createThreeOptionsBox(const char* label, + const char* checkBox1, + const char* checkBox2, + const char* checkBox3, + gboolean cb1Active, + gboolean cb2Active, + gboolean cb3Active, + GtkWidget** option1, + GtkWidget** option2, GtkWidget** option3) { GtkWidget* container = gtk_hbox_new(TRUE, 2); GtkWidget* rightBox = gtk_vbox_new(FALSE, 6); GtkWidget* leftBox = gtk_vbox_new(FALSE, 6); - + GtkWidget* lbl = gtk_label_new(label); GtkWidget* chb1 = gtk_check_button_new_with_label(checkBox1); GtkWidget* chb2 = gtk_check_button_new_with_label(checkBox2); GtkWidget* chb3 = gtk_check_button_new_with_label(checkBox3); - + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chb1), cb1Active); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chb2), cb2Active); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chb3), cb3Active); - + gtk_box_pack_start(GTK_BOX(container), leftBox, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(container), rightBox, FALSE, FALSE, 3); - + gtk_box_pack_start(GTK_BOX(leftBox), lbl, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(rightBox), chb1, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(rightBox), chb2, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(rightBox), chb3, FALSE, FALSE, 3); - + *option1 = chb1; *option2 = chb2; *option3 = chb3; - + return container; } @@ -201,28 +201,28 @@ GtkWidget* container = gtk_hbox_new(FALSE, 2); GtkWidget* rightBox = gtk_vbox_new(FALSE, 6); GtkWidget* leftBox = gtk_vbox_new(FALSE, 6); - + GtkWidget* lbl = gtk_label_new(_("Empty nodes")); GtkWidget* chb1 = gtk_check_button_new_with_label(_("Concatenation ( to )")); GtkWidget* chb2 = gtk_check_button_new_with_label(_("Spacing ( to )")); GtkWidget* chb3 = gtk_check_button_new_with_label(_("Expansion ( to )")); - + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chb1), optEmptyNodeStripping); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chb2), optEmptyNodeStrippingSpace); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chb3), optForceEmptyNodeSplit); - + gtk_box_pack_start(GTK_BOX(container), leftBox, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(container), rightBox, FALSE, FALSE, 3); - + gtk_box_pack_start(GTK_BOX(leftBox), lbl, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(rightBox), chb1, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(rightBox), chb2, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(rightBox), chb3, FALSE, FALSE, 3); - + emptyNodeStripping = chb1; emptyNodeStrippingSpace = chb2; emptyNodeSplit = chb3; - + return container; } @@ -231,27 +231,27 @@ GtkWidget* container = gtk_hbox_new(FALSE, 20); GtkWidget* rightBox = gtk_hbox_new(FALSE, 6); GtkWidget* leftBox = gtk_vbox_new(FALSE, 6); - + GtkWidget* lbl = gtk_label_new(_("Indentation")); - GtkWidget* comboChar = gtk_combo_box_new_text(); + GtkWidget* comboChar = gtk_combo_box_text_new(); GtkWidget* spinIndent = gtk_spin_button_new_with_range(0, 100, 1); - - gtk_combo_box_append_text(GTK_COMBO_BOX(comboChar), _("Tab")); - gtk_combo_box_append_text(GTK_COMBO_BOX(comboChar), _("Space")); + + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(comboChar), _("Tab")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(comboChar), _("Space")); gtk_combo_box_set_active(GTK_COMBO_BOX(comboChar), (indentation == ' ') ? 1 : 0); - + gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinIndent), count); - + gtk_box_pack_start(GTK_BOX(leftBox), lbl, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(rightBox), comboChar, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(rightBox), spinIndent, FALSE, FALSE, 3); - + gtk_box_pack_start(GTK_BOX(container), leftBox, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(container), rightBox, FALSE, FALSE, 3); - + indentationChar = comboChar; indentationCount = spinIndent; - + return container; } @@ -260,28 +260,28 @@ GtkWidget* container = gtk_hbox_new(FALSE, 25); GtkWidget* rightBox = gtk_hbox_new(FALSE, 6); GtkWidget* leftBox = gtk_vbox_new(FALSE, 6); - + GtkWidget* lbl = gtk_label_new(_("Line break")); - GtkWidget* comboChar = gtk_combo_box_new_text(); - + GtkWidget* comboChar = gtk_combo_box_text_new(); + int active = 0; - - gtk_combo_box_append_text(GTK_COMBO_BOX(comboChar), "\\r"); - gtk_combo_box_append_text(GTK_COMBO_BOX(comboChar), "\\n"); - gtk_combo_box_append_text(GTK_COMBO_BOX(comboChar), "\\r\\n"); - + + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(comboChar), "\\r"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(comboChar), "\\n"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(comboChar), "\\r\\n"); + if (strlen(lineReturn) == 2) active = 2; else if (lineReturn[0] == '\n') active = 1; - + gtk_combo_box_set_active(GTK_COMBO_BOX(comboChar), active); - + gtk_box_pack_start(GTK_BOX(leftBox), lbl, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(rightBox), comboChar, FALSE, FALSE, 3); - + gtk_box_pack_start(GTK_BOX(container), leftBox, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(container), rightBox, FALSE, FALSE, 3); - + lineBreak = comboChar; - + return container; } diff -Nru geany-plugins-1.23+dfsg/pretty-printer/src/Makefile.in geany-plugins-1.24+dfsg/pretty-printer/src/Makefile.in --- geany-plugins-1.23+dfsg/pretty-printer/src/Makefile.in 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/pretty-printer/src/Makefile.in 2014-04-13 17:12:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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@ @@ -51,17 +78,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/cppcheck.mk \ - $(top_srcdir)/build/vars.build.mk +DIST_COMMON = $(top_srcdir)/build/vars.build.mk \ + $(top_srcdir)/build/cppcheck.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp subdir = pretty-printer/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \ - $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \ - $(top_srcdir)/build/codenav.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/geanypy/m4/ax_python_library.m4 \ + $(top_srcdir)/build/bundled/gpgme.m4 \ + $(top_srcdir)/build/addons.m4 $(top_srcdir)/build/autoclose.m4 \ + $(top_srcdir)/build/cflags.m4 $(top_srcdir)/build/codenav.m4 \ $(top_srcdir)/build/commander.m4 $(top_srcdir)/build/common.m4 \ $(top_srcdir)/build/cppcheck.m4 \ - $(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \ + $(top_srcdir)/build/debugger.m4 \ + $(top_srcdir)/build/defineformat.m4 \ + $(top_srcdir)/build/devhelp.m4 \ $(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \ $(top_srcdir)/build/geanydoc.m4 \ $(top_srcdir)/build/geanyextrasel.m4 \ @@ -74,12 +104,15 @@ $(top_srcdir)/build/geanyminiscript.m4 \ $(top_srcdir)/build/geanynumberedbookmarks.m4 \ $(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \ + $(top_srcdir)/build/geanypy.m4 \ $(top_srcdir)/build/geanysendmail.m4 \ $(top_srcdir)/build/geanyvc.m4 \ $(top_srcdir)/build/geniuspaste.m4 \ - $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \ - $(top_srcdir)/build/markdown.m4 \ + $(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/gtk.m4 \ + $(top_srcdir)/build/i18n.m4 $(top_srcdir)/build/markdown.m4 \ $(top_srcdir)/build/multiterm.m4 \ + $(top_srcdir)/build/pairtaghighlighter.m4 \ + $(top_srcdir)/build/pohelper.m4 \ $(top_srcdir)/build/pretty-printer.m4 \ $(top_srcdir)/build/scope.m4 \ $(top_srcdir)/build/shiftcolumn.m4 \ @@ -91,6 +124,7 @@ $(top_srcdir)/build/updatechecker.m4 \ $(top_srcdir)/build/webhelper.m4 \ $(top_srcdir)/build/xmlsnippets.m4 \ + $(top_srcdir)/build/cache/ax_python_devel.m4 \ $(top_srcdir)/build/cache/glib-gettext.m4 \ $(top_srcdir)/build/cache/intltool.m4 \ $(top_srcdir)/build/cache/libtool.m4 \ @@ -146,10 +180,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 = pretty_printer_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(pretty_printer_la_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 @@ -162,20 +209,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 = $(pretty_printer_la_SOURCES) DIST_SOURCES = $(pretty_printer_la_SOURCES) am__can_run_installinfo = \ @@ -183,6 +226,23 @@ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -191,6 +251,8 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AUTOCLOSE_CFLAGS = @AUTOCLOSE_CFLAGS@ +AUTOCLOSE_LIBS = @AUTOCLOSE_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -209,6 +271,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFINEFORMAT_CFLAGS = @DEFINEFORMAT_CFLAGS@ +DEFINEFORMAT_LIBS = @DEFINEFORMAT_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ @@ -244,6 +308,9 @@ GPGME_CONFIG = @GPGME_CONFIG@ GPGME_LIBS = @GPGME_LIBS@ GP_CFLAGS = @GP_CFLAGS@ +GP_GTK_PACKAGE = @GP_GTK_PACKAGE@ +GP_GTK_VERSION = @GP_GTK_VERSION@ +GP_GTK_VERSION_MAJOR = @GP_GTK_VERSION_MAJOR@ GREP = @GREP@ GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@ GTKSPELL_LIBS = @GTKSPELL_LIBS@ @@ -310,6 +377,16 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTY_LIBS = @PTY_LIBS@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBRARY = @PYTHON_LIBRARY@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RST2HTML = @RST2HTML@ SED = @SED@ @@ -443,6 +520,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-geanypluginsLTLIBRARIES: $(geanyplugins_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(geanyplugins_LTLIBRARIES)'; test -n "$(geanypluginsdir)" || list=; \ @@ -469,12 +547,15 @@ clean-geanypluginsLTLIBRARIES: -test -z "$(geanyplugins_LTLIBRARIES)" || rm -f $(geanyplugins_LTLIBRARIES) - @list='$(geanyplugins_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='$(geanyplugins_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}; \ + } + pretty-printer.la: $(pretty_printer_la_OBJECTS) $(pretty_printer_la_DEPENDENCIES) $(EXTRA_pretty_printer_la_DEPENDENCIES) $(AM_V_CCLD)$(pretty_printer_la_LINK) -rpath $(geanypluginsdir) $(pretty_printer_la_OBJECTS) $(pretty_printer_la_LIBADD) $(LIBS) @@ -493,14 +574,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 $@ $< @@ -536,26 +617,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; \ @@ -567,15 +637,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 @@ -584,6 +650,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 @@ -730,24 +811,27 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-geanypluginsLTLIBRARIES clean-generic 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-geanypluginsLTLIBRARIES 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 \ - uninstall-geanypluginsLTLIBRARIES + 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-geanypluginsLTLIBRARIES \ + 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 uninstall-geanypluginsLTLIBRARIES @HAVE_CPPCHECK_TRUE@check-cppcheck: $(srcdir) -@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ +@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) \ +@HAVE_CPPCHECK_TRUE@ -q --template gcc --error-exitcode=2 \ +@HAVE_CPPCHECK_TRUE@ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ +@HAVE_CPPCHECK_TRUE@ $(srcdir) @HAVE_CPPCHECK_TRUE@check-local: check-cppcheck diff -Nru geany-plugins-1.23+dfsg/README geany-plugins-1.24+dfsg/README --- geany-plugins-1.23+dfsg/README 2013-03-18 04:41:57.000000000 +0000 +++ geany-plugins-1.24+dfsg/README 2014-04-12 14:28:39.000000000 +0000 @@ -5,7 +5,7 @@ Installation ------------ -You can build the plugins using either autotools or waf. +You can build the plugins using either autotools or waf. Building with autotools ^^^^^^^^^^^^^^^^^^^^^^^ @@ -38,12 +38,14 @@ to fail with an error message if you have missing dependencies. --disable-